X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fio_selector.h;h=32946fb1b7718c4687eddd126ef0e005d104ee1b;hb=d936bdb3a8e55d26a238376d4b99f56ebeb582b1;hp=02a09a519660370909c24cd136b925032c85dfe8;hpb=3023d53d7d3f6dd726bcd07b0ebec8d7cfc2948d;p=ardour.git

diff --git a/gtk2_ardour/io_selector.h b/gtk2_ardour/io_selector.h
index 02a09a5196..32946fb1b7 100644
--- a/gtk2_ardour/io_selector.h
+++ b/gtk2_ardour/io_selector.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2002-2007 Paul Davis 
+    Copyright (C) 2002-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -22,7 +22,6 @@
 
 #include "ardour_dialog.h"
 #include "port_matrix.h"
-#include "i18n.h"
 
 namespace ARDOUR {
 	class PortInsert;
@@ -31,19 +30,14 @@ namespace ARDOUR {
 class IOSelector : public PortMatrix
 {
   public:
-	IOSelector (Gtk::Window*, ARDOUR::Session&, boost::shared_ptr<ARDOUR::IO>);
+	IOSelector (Gtk::Window*, ARDOUR::Session *, boost::shared_ptr<ARDOUR::IO>);
 
 	void set_state (ARDOUR::BundleChannel c[2], bool);
 	PortMatrixNode::State get_state (ARDOUR::BundleChannel c[2]) const;
 
-	std::string disassociation_verb () const {
-		return _("Disconnect");
-	}
+	std::string disassociation_verb () const;
+	std::string channel_noun () const;
 
-	std::string channel_noun () const {
-		return _("port");
-	}
-	
 	uint32_t n_io_ports () const;
 	boost::shared_ptr<ARDOUR::IO> const io () { return _io; }
 	void setup_ports (int);
@@ -63,66 +57,81 @@ class IOSelector : public PortMatrix
 
   private:
 
+	void setup_type ();
+	void io_changed ();
+	void io_changed_proxy ();
+	
 	int _other;
 	int _ours;
 	boost::shared_ptr<ARDOUR::IO> _io;
 	boost::shared_ptr<PortGroup> _port_group;
 	bool _find_inputs_for_io_outputs;
+	PBD::ScopedConnection _io_connection;
 };
 
 class IOSelectorWindow : public Gtk::Window
 {
   public:
-	IOSelectorWindow (ARDOUR::Session&, boost::shared_ptr<ARDOUR::IO>, bool can_cancel = false);
+	IOSelectorWindow (ARDOUR::Session *, boost::shared_ptr<ARDOUR::IO>, bool can_cancel = false);
 
 	IOSelector& selector() { return _selector; }
 
   protected:
 	void on_map ();
 	void on_show ();
-	
+
   private:
 	IOSelector _selector;
-	
+
 	void io_name_changed (void *src);
 	bool wm_delete (GdkEventAny*);
 };
 
 
-class PortInsertUI : public Gtk::VBox
+class PortInsertUI : public Gtk::HBox
 {
-  public: 
-	PortInsertUI (Gtk::Window*, ARDOUR::Session&, boost::shared_ptr<ARDOUR::PortInsert>);
-	
+  public:
+	PortInsertUI (Gtk::Window*, ARDOUR::Session *, boost::shared_ptr<ARDOUR::PortInsert>);
+
 	void redisplay ();
 	void finished (IOSelector::Result);
 
   private:
+        boost::shared_ptr<ARDOUR::PortInsert> _pi;
+        
+        Gtk::ToggleButton latency_button;
 	IOSelector input_selector;
 	IOSelector output_selector;
+        Gtk::Label latency_display;
+        Gtk::Frame latency_frame;
+        Gtk::HBox  latency_hbox;
+        sigc::connection latency_timeout;
+
+        bool check_latency_measurement ();
+        void latency_button_toggled ();
 };
 
 class PortInsertWindow : public ArdourDialog
 {
-  public: 
-	PortInsertWindow (ARDOUR::Session&, boost::shared_ptr<ARDOUR::PortInsert>, bool can_cancel = false);
-	
+  public:
+	PortInsertWindow (ARDOUR::Session *, boost::shared_ptr<ARDOUR::PortInsert>, bool can_cancel = false);
+
   protected:
 	void on_map ();
-	
+
   private:
 	PortInsertUI _portinsertui;
 	Gtk::VBox vbox;
-	
+
 	Gtk::Button ok_button;
 	Gtk::Button cancel_button;
 	Gtk::Frame button_frame;
-	
+
 	void cancel ();
 	void accept ();
 
 	void plugin_going_away ();
-	sigc::connection going_away_connection;
+	PBD::ScopedConnection going_away_connection;
 
 	bool wm_delete (GdkEventAny*);
 };