X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fbundle_manager.h;h=71b99684d706e1350c7ecae9669313ea9968b1d6;hb=cd0d68a591ee64bb0e85d9a364af9fe6abdeecbe;hp=e946b98b74280c08ca2a715a3096ce492588f241;hpb=92e412661772e6b9c83109b7ee4996f4c040d3f4;p=ardour.git

diff --git a/gtk2_ardour/bundle_manager.h b/gtk2_ardour/bundle_manager.h
index e946b98b74..71b99684d7 100644
--- a/gtk2_ardour/bundle_manager.h
+++ b/gtk2_ardour/bundle_manager.h
@@ -20,9 +20,12 @@
 #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"
 
@@ -39,7 +42,7 @@ 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>, ARDOUR::DataType);
 	bool can_remove_channels (boost::shared_ptr<ARDOUR::Bundle>) const;
@@ -103,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;
 	};