X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fio_selector.cc;h=7ff12612e60c30dee554a382f311fa766ef8c6e8;hb=767984b486086e3682e521179c2fb8364b3bba76;hp=866d1f7134e2f9ff026eee9133032b88b091dd4c;hpb=568bbb96ef3cfa9094d5067b80d8a455d2520f50;p=ardour.git

diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc
index 866d1f7134..7ff12612e6 100644
--- a/gtk2_ardour/io_selector.cc
+++ b/gtk2_ardour/io_selector.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <map>
@@ -294,8 +293,6 @@ IOSelector::rescan ()
 
 	current_page = notebook.get_current_page ();
 
-	cerr << "clear notebook\n";
-
 	pages.clear ();
 
 	/* get relevant current JACK ports */
@@ -303,7 +300,6 @@ IOSelector::rescan ()
 	ports = session.engine().get_ports ("", JACK_DEFAULT_AUDIO_TYPE, for_input ? JackPortIsOutput : JackPortIsInput);
 
 	if (ports == 0) {
-		cerr << "no ports\n";
 		return;
 	}
 
@@ -369,8 +365,6 @@ IOSelector::rescan ()
 		pages.push_back (TabElem (*client_box, *tab_label));
 	}
 
-	cerr << "notebook should have " << portmap.size() << " pages\n";
-
 	notebook.set_current_page (current_page);
 	page_selection_connection = notebook.signal_show().connect (bind (mem_fun (notebook, &Notebook::set_current_page), current_page));
 	selector_box.show_all ();
@@ -422,7 +416,7 @@ IOSelector::display_ports ()
 			
 			really_short_name = port->short_name();
 			really_short_name = really_short_name.substr (really_short_name.find ('/') + 1);
-			
+
 			tview = manage (new TreeView());
 			RefPtr<ListStore> port_model = ListStore::create (port_display_columns);
 			
@@ -433,16 +427,15 @@ IOSelector::display_ports ()
 			tview->set_model (port_model);
 			tview->append_column (really_short_name, port_display_columns.displayed_name);
 			tview->get_selection()->set_mode (SELECTION_SINGLE);
-			tview->set_data ("port", port);
+			tview->set_data (X_("port"), port);
 			tview->set_headers_visible (true);
-			tview->set_name ("IOSelectorPortList");
+			tview->set_name (X_("IOSelectorPortList"));
 			
 			port_box.pack_start (*tview);
 			port_displays.insert (port_displays.end(), tview);
 			
 			/* now fill the clist with the current connections */
 			
-			
 			const char **connections = port->get_connections ();
 			
 			if (connections) {
@@ -451,7 +444,7 @@ IOSelector::display_ports ()
 					row[port_display_columns.displayed_name] = connections[c];
 					row[port_display_columns.full_name] = connections[c];
 				}
-			}
+			} 
 			
 			if (for_input) {
 				
@@ -619,7 +612,7 @@ IOSelector::connection_button_release (GdkEventButton *ev, TreeView *treeview)
 
 		/* path is valid */
 		ustring connected_port_name = (*iter)[port_display_columns.full_name];
-		Port *port = reinterpret_cast<Port *> (treeview->get_data (_("port")));
+		Port *port = reinterpret_cast<Port *> (treeview->get_data (X_("port")));
 		
 		if (for_input) {
 			Port *p = session.engine().get_port_by_name (connected_port_name);
@@ -668,7 +661,7 @@ IOSelector::select_treeview (TreeView* tview)
 	*/
 
 	Glib::Mutex::Lock lm  (port_display_lock);
- 	Port* port = reinterpret_cast<Port *> (tview->get_data (_("port")));
+ 	Port* port = reinterpret_cast<Port *> (tview->get_data (X_("port")));
 
 	selected_port = port;