Clear out any command line session name on closing a session so that the same session...

[ardour.git] / gtk2_ardour / io_selector.h

diff --git a/gtk2_ardour/io_selector.h b/gtk2_ardour/io_selector.h
index d6b00254be66378a4d97755ca2b7b94cb4b2a192..83050e2a5caca65cb7d388235363707d9688bcff 100644 (file)
--- a/gtk2_ardour/io_selector.h
+++ b/gtk2_ardour/io_selector.h
@@ -22,6 +22,7 @@
 
 #include "ardour_dialog.h"
 #include "port_matrix.h"
+#include "i18n.h"
 
 namespace ARDOUR {
        class PortInsert;
@@ -30,18 +31,17 @@ namespace ARDOUR {
 class IOSelector : public PortMatrix
 {
   public:
-       IOSelector (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;
 
-       void add_channel (boost::shared_ptr<ARDOUR::Bundle>);
-       bool can_remove_channels (int d) const {
-               return d == _ours;
+       std::string disassociation_verb () const {
+               return _("Disconnect");
        }
-       void remove_channel (ARDOUR::BundleChannel);
-       bool can_rename_channels (int d) const {
-               return false;
+
+       std::string channel_noun () const {
+               return _("port");
        }
        
        uint32_t n_io_ports () const;
@@ -61,9 +61,8 @@ class IOSelector : public PortMatrix
                return _other;
        }
 
-
   private:
-       
+
        int _other;
        int _ours;
        boost::shared_ptr<ARDOUR::IO> _io;
@@ -71,7 +70,7 @@ class IOSelector : public PortMatrix
        bool _find_inputs_for_io_outputs;
 };
 
-class IOSelectorWindow : public ArdourDialog
+class IOSelectorWindow : public Gtk::Window
 {
   public:
        IOSelectorWindow (ARDOUR::Session&, boost::shared_ptr<ARDOUR::IO>, bool can_cancel = false);
@@ -80,23 +79,11 @@ class IOSelectorWindow : public ArdourDialog
 
   protected:
        void on_map ();
+       void on_show ();
        
   private:
        IOSelector _selector;
-
-       /* overall operation buttons */
-
-       Gtk::Button add_button;
-       Gtk::Button disconnect_button;
-       Gtk::Button ok_button;
-       Gtk::Button cancel_button;
-       Gtk::Button rescan_button;
-
-       void cancel ();
-       void accept ();
-       void rescan ();
        
-       void ports_changed ();
        void io_name_changed (void *src);
 };
 
@@ -104,7 +91,7 @@ class IOSelectorWindow : public ArdourDialog
 class PortInsertUI : public Gtk::VBox
 {
   public: 
-       PortInsertUI (ARDOUR::Session&, boost::shared_ptr<ARDOUR::PortInsert>);
+       PortInsertUI (Gtk::Window*, ARDOUR::Session&, boost::shared_ptr<ARDOUR::PortInsert>);
        
        void redisplay ();
        void finished (IOSelector::Result);
@@ -128,7 +115,6 @@ class PortInsertWindow : public ArdourDialog
        
        Gtk::Button ok_button;
        Gtk::Button cancel_button;
-       Gtk::Button rescan_button;
        Gtk::Frame button_frame;
        
        void cancel ();