Merge with 2.0-ongoing R2988

[ardour.git] / gtk2_ardour / io_selector.h

diff --git a/gtk2_ardour/io_selector.h b/gtk2_ardour/io_selector.h
index 993d4aa1ad0da73f3e9df1638a2af6cb1ea2995b..92a112dc1dc466f1be044294a2008565f227d1ba 100644 (file)
--- a/gtk2_ardour/io_selector.h
+++ b/gtk2_ardour/io_selector.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2002 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
@@ -15,127 +15,39 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_ui_io_selector_h__
 #define __ardour_ui_io_selector_h__
 
-#if __GNUC__ >= 3
-#include <ext/slist>
-using __gnu_cxx::slist;
-#else
-#include <slist.h>
-#endif
-
-#include <string>
-
-#include <glibmm/thread.h>
-
-#include <gtkmm/box.h>
-#include <gtkmm/frame.h>
-#include <gtkmm/button.h>
-#include <gtkmm/scrolledwindow.h>
-#include <gtkmm/notebook.h>
-#include <gtkmm/treeview.h>
-#include <gtkmm/liststore.h>
-
-#include <ardour_dialog.h>
+#include "ardour_dialog.h"
+#include "port_matrix.h"
 
-
-namespace ARDOUR {
-       class IO;
-       class Session;
-       class PortInsert;
-       class Port;
-       class Redirect;
-}
-
-class IOSelector : public Gtk::VBox {
+class IOSelector : public PortMatrix {
   public:
-       IOSelector (ARDOUR::Session&, boost::shared_ptr<ARDOUR::IO>, bool for_input);
-       ~IOSelector ();
-
-       void redisplay ();
+       IOSelector (ARDOUR::Session&, boost::shared_ptr<ARDOUR::IO>, bool);
+
+       void set_state (int, std::string const &, bool);
+       bool get_state (int, std::string const &) const;
+       uint32_t n_rows () const;
+       uint32_t maximum_rows () const;
+       uint32_t minimum_rows () const;
+       std::string row_name (int) const;
+       void add_row ();
+       void remove_row (int);
+       std::string row_descriptor () const;
 
-       enum Result {
-               Cancelled,
-               Accepted
-       };
-
-       sigc::signal<void,Result> Finished;
-
-  protected:
-       ARDOUR::Session& session;
-       
   private:
-       boost::shared_ptr<ARDOUR::IO> io;
-       bool for_input;
-       ARDOUR::Port *selected_port;
-
-       Gtk::VBox main_box;
-       Gtk::HBox port_and_selector_box;
-
-       /* column model */
-
-       struct PortDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
-
-           PortDisplayModelColumns() { 
-                   add (displayed_name);
-                   add (full_name);
-           }
-
-           Gtk::TreeModelColumn<Glib::ustring>       displayed_name;
-           Gtk::TreeModelColumn<Glib::ustring>       full_name;
-       };
-
-       PortDisplayModelColumns port_display_columns;
-
-       /* client/port selection */
-
-       Gtk::Notebook notebook;
-       Gtk::Frame selector_frame;
-       Gtk::VBox selector_box;
-       Gtk::HBox selector_button_box;
-
-       /* ports */
-
-       Gtk::VBox port_box;
-       Gtk::HBox port_button_box;
-       Gtk::VBox port_and_button_box;
-       Gtk::Frame port_frame;
-       Gtk::Button add_port_button;
-       Gtk::Button remove_port_button;
-       Gtk::Button clear_connections_button;
-       Gtk::ScrolledWindow port_display_scroller;
-
-       Glib::Mutex port_display_lock;
-       slist<Gtk::TreeView *> port_displays;
-       void display_ports ();
-
-       void rescan ();
-       void clear_connections ();
-
-       bool port_selection_changed(GdkEventButton *, Gtk::TreeView*);
-
-       void ports_changed (ARDOUR::IOChange, void *);
-       void name_changed (void*);
-
-       void add_port ();
-       void remove_port ();
-       gint remove_port_when_idle (ARDOUR::Port *);
-
-       gint port_column_button_release (GdkEventButton *, Gtk::TreeView*);
-       gint connection_button_release (GdkEventButton *, Gtk::TreeView*);
        
-       void select_treeview(Gtk::TreeView*);
-       void select_next_treeview ();
+       void ports_changed (ARDOUR::IOChange, void*);
+       
+       boost::shared_ptr<ARDOUR::IO> _io;
 };
 
 class IOSelectorWindow : public ArdourDialog
 {
   public:
-       IOSelectorWindow (ARDOUR::Session&, boost::shared_ptr<ARDOUR::IO>, bool for_input, bool can_cancel=false);
+       IOSelectorWindow (ARDOUR::Session&, boost::shared_ptr<ARDOUR::IO>, bool for_input, bool can_cancel = false);
        ~IOSelectorWindow ();
 
        IOSelector& selector() { return _selector; }
@@ -151,7 +63,6 @@ class IOSelectorWindow : public ArdourDialog
        Gtk::Button ok_button;
        Gtk::Button cancel_button;
        Gtk::Button rescan_button;
-       Gtk::HBox button_box;
 
        void rescan ();
        void cancel ();
@@ -168,23 +79,20 @@ class PortInsertUI : public Gtk::VBox
        void finished (IOSelector::Result);
 
   private:
-       
-       Gtk::HBox  hbox;
+       Gtk::HBox hbox;
        IOSelector input_selector;
        IOSelector output_selector;
-       
 };
 
 class PortInsertWindow : public ArdourDialog
 {
   public: 
-       PortInsertWindow (ARDOUR::Session&, boost::shared_ptr<ARDOUR::PortInsert>, bool can_cancel=false);
+       PortInsertWindow (ARDOUR::Session&, boost::shared_ptr<ARDOUR::PortInsert>, bool can_cancel = false);
        
   protected:
        void on_map ();
        
   private:
-       
        PortInsertUI _portinsertui;
        Gtk::VBox vbox;
        
@@ -192,14 +100,14 @@ class PortInsertWindow : public ArdourDialog
        Gtk::Button cancel_button;
        Gtk::Button rescan_button;
        Gtk::Frame button_frame;
-       Gtk::HBox button_box;
        
        void rescan ();
        void cancel ();
        void accept ();
 
-       void plugin_going_away (ARDOUR::Redirect*);
+       void plugin_going_away ();
+       sigc::connection going_away_connection;
 };
 
 
-#endif /* __ardour_ui_io_selector_h__ */
+#endif