Vkeybd: add a mod-wheel

[ardour.git] / gtk2_ardour / bundle_manager.h

diff --git a/gtk2_ardour/bundle_manager.h b/gtk2_ardour/bundle_manager.h
index 3beb77e9525c61889ca20c7da4d3dc41a71344ba..7ba3c7df9fd76a64ec82520f4af81ca55844102c 100644 (file)
--- a/gtk2_ardour/bundle_manager.h
+++ b/gtk2_ardour/bundle_manager.h
@@ -1,31 +1,34 @@
 /*
-    Copyright (C) 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
+ * Copyright (C) 2007-2012 Carl Hetherington <carl@carlh.net>
+ * Copyright (C) 2008-2010 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2009-2014 David Robillard <d@drobilla.net>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #ifndef __ardour_ui_bundle_manager_h__
 #define __ardour_ui_bundle_manager_h__
 
-#include <gtkmm/treeview.h>
-#include <gtkmm/liststore.h>
 #include <gtkmm/entry.h>
+#include <gtkmm/liststore.h>
+#include <gtkmm/treeview.h>
+
+#include "ardour/user_bundle.h"
+
 #include "ardour_dialog.h"
 #include "port_matrix.h"
-#include "i18n.h"
 
 namespace ARDOUR {
        class Session;
@@ -34,15 +37,15 @@ namespace ARDOUR {
 
 class BundleEditorMatrix : public PortMatrix
 {
-  public:
+public:
        BundleEditorMatrix (Gtk::Window *, ARDOUR::Session *, boost::shared_ptr<ARDOUR::Bundle>);
 
        void set_state (ARDOUR::BundleChannel c[2], bool s);
        PortMatrixNode::State get_state (ARDOUR::BundleChannel c[2]) const;
 
-       bool can_add_channel (boost::shared_ptr<ARDOUR::Bundle>) const;
+       bool can_add_channels (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,11 +53,9 @@ 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:
+private:
        enum {
                OTHER = 0,
                OURS = 1
@@ -66,31 +67,29 @@ class BundleEditorMatrix : public PortMatrix
 
 class BundleEditor : public ArdourDialog
 {
-  public:
+public:
        BundleEditor (ARDOUR::Session *, boost::shared_ptr<ARDOUR::UserBundle>);
 
-  protected:
+protected:
        void on_map ();
 
-  private:
+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
 {
-  public:
+public:
        BundleManager (ARDOUR::Session *);
 
-  private:
+private:
 
        void new_clicked ();
        void edit_clicked ();
@@ -108,16 +107,16 @@ class BundleManager : public ArdourDialog
                        add (bundle);
                }
 
-               Gtk::TreeModelColumn<Glib::ustring> name;
+               Gtk::TreeModelColumn<std::string> name;
                Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::UserBundle> > bundle;
        };
 
        Gtk::TreeView _tree_view;
        Glib::RefPtr<Gtk::ListStore> _list_model;
        ModelColumns _list_model_columns;
-       ARDOUR::Session* _session;
        Gtk::Button edit_button;
        Gtk::Button delete_button;
+       PBD::ScopedConnectionList bundle_connections;
 };
 
 class NameChannelDialog : public ArdourDialog
@@ -133,7 +132,6 @@ private:
        void setup ();
 
        boost::shared_ptr<ARDOUR::Bundle> _bundle;
-       uint32_t _channel;
        Gtk::Entry _name;
        bool _adding;
 };