summaryrefslogtreecommitdiff
path: root/gtk2_ardour/io_selector.cc
diff options
context:
space:
mode:
authorDoug McLain <doug@nostar.net>2005-12-14 17:21:53 +0000
committerDoug McLain <doug@nostar.net>2005-12-14 17:21:53 +0000
commit0fb17c72d910e1739fd2464fe405de824951f806 (patch)
treedd03c4cc74e144fffc98eccd52fd776a77605730 /gtk2_ardour/io_selector.cc
parent498fa9e8f9afd802c62c93b320231265b906a128 (diff)
segfault fixes and some functionality for the IOSelector
git-svn-id: svn://localhost/trunk/ardour2@191 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/io_selector.cc')
-rw-r--r--gtk2_ardour/io_selector.cc13
1 files changed, 9 insertions, 4 deletions
diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc
index 9aec5be319..405394454e 100644
--- a/gtk2_ardour/io_selector.cc
+++ b/gtk2_ardour/io_selector.cc
@@ -83,8 +83,8 @@ IOSelectorWindow::IOSelectorWindow (Session& sess, IO& ior, bool input, bool can
button_box.pack_start (ok_button);
- vbox.pack_start (_selector);
- vbox.pack_start (button_box, false, false);
+ get_vbox()->pack_start (_selector);
+ get_vbox()->pack_start (button_box, false, false);
ok_button.signal_clicked().connect (mem_fun(*this, &IOSelectorWindow::accept));
cancel_button.signal_clicked().connect (mem_fun(*this, &IOSelectorWindow::cancel));
@@ -92,7 +92,6 @@ IOSelectorWindow::IOSelectorWindow (Session& sess, IO& ior, bool input, bool can
set_title (title);
set_position (WIN_POS_MOUSE);
- add (vbox);
signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window *> (this)));
}
@@ -406,6 +405,12 @@ IOSelector::display_ports ()
ScrolledWindow *scroller;
string really_short_name;
+ if (for_input) {
+ port = io.input (n);
+ } else {
+ port = io.output (n);
+ }
+
/* we know there is '/' because we put it there */
really_short_name = port->short_name();
@@ -476,7 +481,7 @@ IOSelector::display_ports ()
/* handle button events on the column header and within the treeview itself */
- col->get_widget()->signal_button_release_event().connect (bind (mem_fun(*this, &IOSelector::port_column_button_release), tview));
+ //col->get_widget()->signal_button_release_event().connect (bind (mem_fun(*this, &IOSelector::port_column_button_release), tview));
tview->signal_button_release_event().connect (bind (mem_fun(*this, &IOSelector::connection_button_release), tview));
}