Tidy up region drag move code a bit.

[ardour.git] / gtk2_ardour / bundle_manager.h

diff --git a/gtk2_ardour/bundle_manager.h b/gtk2_ardour/bundle_manager.h
index d064e40bf65125b7dd0b3fa5d9793e5a42d002e6..e946b98b74280c08ca2a715a3096ce492588f241 100644 (file)
--- a/gtk2_ardour/bundle_manager.h
+++ b/gtk2_ardour/bundle_manager.h
@@ -25,7 +25,6 @@
 #include <gtkmm/entry.h>
 #include "ardour_dialog.h"
 #include "port_matrix.h"
-#include "i18n.h"
 
 namespace ARDOUR {
        class Session;
@@ -42,7 +41,7 @@ class BundleEditorMatrix : public PortMatrix
 
        bool can_add_channel (boost::shared_ptr<ARDOUR::Bundle>) const;
 
-       void add_channel (boost::shared_ptr<ARDOUR::Bundle>);
+       void add_channel (boost::shared_ptr<ARDOUR::Bundle>, ARDOUR::DataType);
        bool can_remove_channels (boost::shared_ptr<ARDOUR::Bundle>) const;
        void remove_channel (ARDOUR::BundleChannel);
        bool can_rename_channels (boost::shared_ptr<ARDOUR::Bundle>) const;
@@ -50,9 +49,7 @@ class BundleEditorMatrix : public PortMatrix
        void setup_ports (int);
        bool list_is_global (int) const;
 
-       std::string disassociation_verb () const {
-               return _("Disassociate");
-       }
+       std::string disassociation_verb () const;
 
   private:
        enum {
@@ -75,14 +72,12 @@ class BundleEditor : public ArdourDialog
   private:
        void name_changed ();
        void input_or_output_changed ();
-       void type_changed ();
        void on_show ();
 
        BundleEditorMatrix _matrix;
        boost::shared_ptr<ARDOUR::UserBundle> _bundle;
        Gtk::Entry _name;
        Gtk::ComboBoxText _input_or_output;
-       Gtk::ComboBoxText _type;
 };
 
 class BundleManager : public ArdourDialog
@@ -117,6 +112,7 @@ class BundleManager : public ArdourDialog
        ModelColumns _list_model_columns;
        Gtk::Button edit_button;
        Gtk::Button delete_button;
+       PBD::ScopedConnectionList bundle_connections;
 };
 
 class NameChannelDialog : public ArdourDialog