X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fbundle_manager.h;h=468346e54ca0529eba3e8b591411ea5cb78e02be;hb=9f3a9ef02de17704b5d9cd9b5d3d674788d23a8d;hp=4172330cf1bf37fb5d6b6152b81da94156e50c8d;hpb=aae367b63c9b619db1e40f27dc334c6987219481;p=ardour.git

diff --git a/gtk2_ardour/bundle_manager.h b/gtk2_ardour/bundle_manager.h
index 4172330cf1..468346e54c 100644
--- a/gtk2_ardour/bundle_manager.h
+++ b/gtk2_ardour/bundle_manager.h
@@ -20,12 +20,14 @@
 #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;
@@ -40,9 +42,9 @@ class BundleEditorMatrix : public PortMatrix
 	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,9 +52,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 +75,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
@@ -108,7 +106,7 @@ class BundleManager : public ArdourDialog
 			add (bundle);
 		}
 
-		Gtk::TreeModelColumn<Glib::ustring> name;
+		Gtk::TreeModelColumn<std::string> name;
 		Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::UserBundle> > bundle;
 	};
 
@@ -133,7 +131,6 @@ private:
 	void setup ();
 
 	boost::shared_ptr<ARDOUR::Bundle> _bundle;
-	uint32_t _channel;
 	Gtk::Entry _name;
 	bool _adding;
 };