X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fio_selector.h;h=bba42e919d82e710321e765ffd3ced849a2ec92e;hb=a366fba7d0933a8f2d97d95fefcbcdc9692d2117;hp=83050e2a5caca65cb7d388235363707d9688bcff;hpb=7c49119be05c2a0fc324f6a13e91720ac66a5957;p=ardour.git

diff --git a/gtk2_ardour/io_selector.h b/gtk2_ardour/io_selector.h
index 83050e2a5c..bba42e919d 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
@@ -17,33 +17,25 @@
 
 */
 
-#ifndef __ardour_ui_io_selector_h__
-#define __ardour_ui_io_selector_h__
+#ifndef __gtkardour_io_selector_h__
+#define __gtkardour_io_selector_h__
 
-#include "ardour_dialog.h"
 #include "port_matrix.h"
-#include "i18n.h"
-
-namespace ARDOUR {
-	class PortInsert;
-}
+#include "ardour_window.h"
 
 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;
+
+        ARDOUR::Session* session() const { return _session; }
 
-	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 +55,34 @@ 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
+class IOSelectorWindow : public ArdourWindow
 {
   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);
-};
-
-
-class PortInsertUI : public Gtk::VBox
-{
-  public: 
-	PortInsertUI (Gtk::Window*, ARDOUR::Session&, boost::shared_ptr<ARDOUR::PortInsert>);
-	
-	void redisplay ();
-	void finished (IOSelector::Result);
 
   private:
-	IOSelector input_selector;
-	IOSelector output_selector;
-};
+	IOSelector _selector;
 
-class PortInsertWindow : public ArdourDialog
-{
-  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;
+	void io_name_changed (void *src);
+	bool wm_delete (GdkEventAny*);
 };
 
-
-#endif
+#endif /* __gtkardour_io_selector_h__ */