Remove some unused code.

[ardour.git] / gtk2_ardour / mixer_ui.h

diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index ba72ba2cba7b31cab15ab81c5b94b2349bf26baf..915b084dfa7234e052b015a4d7f3b295e2c46886 100644 (file)
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -31,6 +31,7 @@
 #include <gtkmm/paned.h>
 #include <gtkmm/menu.h>
 #include <gtkmm/treeview.h>
+#include <gtkmm/liststore.h>
 
 #include "pbd/stateful.h"
 #include "pbd/signals.h"
@@ -44,7 +45,6 @@
 namespace ARDOUR {
        class Route;
        class RouteGroup;
-       class AudioDiskstream;
 };
 
 class MixerStrip;
@@ -176,7 +176,6 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
        void show_all_audiotracks();
        void hide_all_audiotracks ();
 
-       Gtk::Menu* route_group_context_menu;
        bool in_group_row_change;
 
        void group_selected (gint row, gint col, GdkEvent *ev);
@@ -184,13 +183,13 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
        void group_display_active_clicked();
        void new_route_group ();
        void remove_selected_route_group ();
-       void build_route_group_context_menu ();
        void activate_all_route_groups ();
        void disable_all_route_groups ();
        void add_route_group (ARDOUR::RouteGroup *);
        void route_groups_changed ();
-       void route_group_name_edit (const Glib::ustring&, const Glib::ustring&);
+       void route_group_name_edit (const std::string&, const std::string&);
        void route_group_row_change (const Gtk::TreeModel::Path& path,const Gtk::TreeModel::iterator& iter);
+       void route_group_row_deleted (Gtk::TreeModel::Path const &);
 
        Gtk::Menu *track_menu;
        void track_column_click (gint);
@@ -212,7 +211,7 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
                    add (strip);
            }
            Gtk::TreeModelColumn<bool>           visible;
-           Gtk::TreeModelColumn<Glib::ustring>  text;
+           Gtk::TreeModelColumn<std::string>  text;
            Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Route> > route;
            Gtk::TreeModelColumn<MixerStrip*>    strip;
        };
@@ -224,7 +223,7 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
                    add (group);
            }
            Gtk::TreeModelColumn<bool>                                  visible;
-           Gtk::TreeModelColumn<Glib::ustring>                 text;
+           Gtk::TreeModelColumn<std::string>                   text;
            Gtk::TreeModelColumn<ARDOUR::RouteGroup*>   group;
        };
 
@@ -254,9 +253,17 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
        void parameter_changed (std::string const &);
        void set_route_group_activation (ARDOUR::RouteGroup *, bool);
 
+       void setup_track_display ();
+       void new_track_or_bus ();
+
        static const int32_t default_width = 478;
        static const int32_t default_height = 765;
 
+       /** true if we are rebuilding the route group list, or clearing
+           it during a session teardown.
+       */
+       bool _in_group_rebuild_or_clear;
+
        friend class MixerGroupTabs;
 };