Stop ardour exiting in the case where you have a loaded session, then select New...

[ardour.git] / gtk2_ardour / io_selector.h

diff --git a/gtk2_ardour/io_selector.h b/gtk2_ardour/io_selector.h
index 24e99e27ecd3329101cf3584ade1172733402a58..f8822cf1afc061726702d12fbfdd5eafe1b827b2 100644 (file)
--- 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,6 +22,7 @@
 
 #include "ardour_dialog.h"
 #include "port_matrix.h"
+#include "i18n.h"
 
 namespace ARDOUR {
        class PortInsert;
@@ -30,20 +31,19 @@ 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;
        boost::shared_ptr<ARDOUR::IO> const io () { return _io; }
        void setup_ports (int);
@@ -61,9 +61,8 @@ class IOSelector : public PortMatrix
                return _other;
        }
 
-
   private:
-       
+
        int _other;
        int _ours;
        boost::shared_ptr<ARDOUR::IO> _io;
@@ -80,20 +79,21 @@ class IOSelectorWindow : public Gtk::Window
 
   protected:
        void on_map ();
-       void on_realize ();
-       
+       void on_show ();
+
   private:
        IOSelector _selector;
-       
+
        void io_name_changed (void *src);
+       bool wm_delete (GdkEventAny*);
 };
 
 
 class PortInsertUI : public Gtk::VBox
 {
-  public: 
-       PortInsertUI (ARDOUR::Session&, boost::shared_ptr<ARDOUR::PortInsert>);
-       
+  public:
+       PortInsertUI (Gtk::Window*, ARDOUR::Session&, boost::shared_ptr<ARDOUR::PortInsert>);
+
        void redisplay ();
        void finished (IOSelector::Result);
 
@@ -104,25 +104,27 @@ class PortInsertUI : public Gtk::VBox
 
 class PortInsertWindow : public ArdourDialog
 {
-  public: 
+  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;
+
+       bool wm_delete (GdkEventAny*);
 };