Clean up confusion wrt showing the bundle manager. Fixes #2930.

git-svn-id: svn://localhost/ardour2/branches/3.0@6230 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index e997262a01507eee00b26b95a376b1de816f1648..afb6647f129b0ab8f3fc6d3a811eb492b12124ef 100644 (file)
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -427,7 +427,6 @@
                <menuitem action='ToggleThemeManager'/>
                <menuitem action='ToggleBigClock'/>
                <menuitem action='toggle-rhythm-ferret'/>
-               <menuitem action='toggle-bundle-manager'/>
                <menuitem action='toggle-audio-connection-manager'/>
                <menuitem action='toggle-midi-connection-manager'/>
                <menuitem action='toggle-log-window'/>

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 0ade4e15631678c94658da53b7265ef0e08b5312..9034f4820a1bbd3747210fee03e9063b120c9f20 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -4688,16 +4688,6 @@ Editor::show_rhythm_ferret ()
        rhythm_ferret->present ();
 }
 
-void
-Editor::show_bundle_manager ()
-{
-       if (_bundle_manager == 0) {
-               _bundle_manager = new BundleManager (*session);
-       }
-
-       _bundle_manager->show ();
-}
-
 void
 Editor::show_global_port_matrix (ARDOUR::DataType t)
 {

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 34e810e345daafd88c383a33b720eb355c53106f..684637740c15a7c7b46ba67adbd54b49c5c4764c 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -412,7 +412,6 @@ class Editor : public PublicEditor
        void toggle_meter_updating();
 
        void show_rhythm_ferret();
-       void show_bundle_manager ();
        void show_global_port_matrix (ARDOUR::DataType);
 
        void goto_visual_state (uint32_t);

diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 25239ef35670782949dd03b59252bbf37c10aafb..898edf604126acc2b365793f00e9e81e8e4386d6 100644 (file)
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -566,8 +566,6 @@ Editor::register_actions ()
        ActionManager::region_selection_sensitive_actions.push_back (act);
        act = ActionManager::register_action (editor_actions, "toggle-rhythm-ferret", _("Rhythm Ferret"), mem_fun(*this, &Editor::show_rhythm_ferret));
        ActionManager::session_sensitive_actions.push_back (act);
-       act = ActionManager::register_action (editor_actions, "toggle-bundle-manager", _("Bundle Manager"), mem_fun (*this, &Editor::show_bundle_manager));
-       ActionManager::session_sensitive_actions.push_back (act);
        act = ActionManager::register_action (editor_actions, "toggle-audio-connection-manager", _("Audio Connection Manager"), bind (mem_fun (*this, &Editor::show_global_port_matrix), ARDOUR::DataType::AUDIO));
        ActionManager::session_sensitive_actions.push_back (act);
        act = ActionManager::register_action (editor_actions, "toggle-midi-connection-manager", _("MIDI Connection Manager"), bind (mem_fun (*this, &Editor::show_global_port_matrix), ARDOUR::DataType::MIDI));