Fix some bugs I introduced with the last commit.

[ardour.git] / gtk2_ardour / bundle_manager.h

diff --git a/gtk2_ardour/bundle_manager.h b/gtk2_ardour/bundle_manager.h
index c2c30d47bbcdb32201977de8693271fd055de951..ff42ad7fb8d539fafb202d32c1fd9d1e05fef139 100644 (file)
--- 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"
 
@@ -41,7 +44,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;
@@ -72,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
@@ -105,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;
        };