change names of actions groups that include "jack"

diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc
index 3b0133b5355fb6e691c6d50151f401ae4ca4a018..cefaeeb4cf9a00b4ec625b349c9615f179aff553 100644 (file)
--- a/gtk2_ardour/actions.cc
+++ b/gtk2_ardour/actions.cc
@@ -58,8 +58,8 @@ vector<RefPtr<Gtk::Action> > ActionManager::playlist_selection_sensitive_actions
 vector<RefPtr<Gtk::Action> > ActionManager::mouse_edit_point_requires_canvas_actions;
 
 vector<RefPtr<Gtk::Action> > ActionManager::range_sensitive_actions;
-vector<RefPtr<Gtk::Action> > ActionManager::jack_sensitive_actions;
-vector<RefPtr<Gtk::Action> > ActionManager::jack_opposite_sensitive_actions;
+vector<RefPtr<Gtk::Action> > ActionManager::engine_sensitive_actions;
+vector<RefPtr<Gtk::Action> > ActionManager::engine_opposite_sensitive_actions;
 vector<RefPtr<Gtk::Action> > ActionManager::transport_sensitive_actions;
 vector<RefPtr<Gtk::Action> > ActionManager::edit_point_in_region_sensitive_actions;
 

diff --git a/gtk2_ardour/actions.h b/gtk2_ardour/actions.h
index 20c0532636c0641aa22800f0fbfe42af89eb8beb..f3fba51de54d7790e8a593cce9279465302cd869 100644 (file)
--- a/gtk2_ardour/actions.h
+++ b/gtk2_ardour/actions.h
@@ -46,8 +46,8 @@ namespace ActionManager {
 
        extern std::vector<Glib::RefPtr<Gtk::Action> > range_sensitive_actions;
        extern std::vector<Glib::RefPtr<Gtk::Action> > transport_sensitive_actions;
-       extern std::vector<Glib::RefPtr<Gtk::Action> > jack_sensitive_actions;
-       extern std::vector<Glib::RefPtr<Gtk::Action> > jack_opposite_sensitive_actions;
+       extern std::vector<Glib::RefPtr<Gtk::Action> > engine_sensitive_actions;
+       extern std::vector<Glib::RefPtr<Gtk::Action> > engine_opposite_sensitive_actions;
        extern std::vector<Glib::RefPtr<Gtk::Action> > edit_point_in_region_sensitive_actions;
 
        extern void map_some_state (const char* group, const char* action, bool (ARDOUR::RCConfiguration::*get)() const);

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 81a5b2c580e7a96f625b4979b2f0d89709006acc..9eae8b42684f02cb7ac4e8358d7cfc02d2709679 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -408,8 +408,8 @@ void
 ARDOUR_UI::engine_stopped ()
 {
        ENSURE_GUI_THREAD (*this, &ARDOUR_UI::engine_stopped)
-       ActionManager::set_sensitive (ActionManager::jack_sensitive_actions, false);
-       ActionManager::set_sensitive (ActionManager::jack_opposite_sensitive_actions, true);
+       ActionManager::set_sensitive (ActionManager::engine_sensitive_actions, false);
+       ActionManager::set_sensitive (ActionManager::engine_opposite_sensitive_actions, true);
 }
 
 void
@@ -420,8 +420,8 @@ ARDOUR_UI::engine_running ()
                first_time_engine_run = false;
        }
        
-       ActionManager::set_sensitive (ActionManager::jack_sensitive_actions, true);
-       ActionManager::set_sensitive (ActionManager::jack_opposite_sensitive_actions, false);
+       ActionManager::set_sensitive (ActionManager::engine_sensitive_actions, true);
+       ActionManager::set_sensitive (ActionManager::engine_opposite_sensitive_actions, false);
 
        Glib::RefPtr<Action> action;
        const char* action_name = 0;
@@ -485,8 +485,8 @@ ARDOUR_UI::engine_halted (const char* reason, bool free_reason)
                return;
        }
 
-       ActionManager::set_sensitive (ActionManager::jack_sensitive_actions, false);
-       ActionManager::set_sensitive (ActionManager::jack_opposite_sensitive_actions, true);
+       ActionManager::set_sensitive (ActionManager::engine_sensitive_actions, false);
+       ActionManager::set_sensitive (ActionManager::engine_opposite_sensitive_actions, true);
 
        update_sample_rate (0);
 

diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 6c050578ec0e9521fd91824cf4a85756527429bc..82d32315c5d86e14583923c0899f4444be16efbc 100644 (file)
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -183,38 +183,38 @@ ARDOUR_UI::install_actions ()
        ActionManager::write_sensitive_actions.push_back (act);
        ActionManager::session_sensitive_actions.push_back (act);
 
-       /* JACK actions for controlling ... JACK */
+       /* AudioEngine actions */
 
-       Glib::RefPtr<ActionGroup> jack_actions = ActionGroup::create (X_("JACK"));
-       ActionManager::register_action (jack_actions, X_("JACK"), _("JACK"));
-       ActionManager::register_action (jack_actions, X_("Latency"), _("Latency"));
+       Glib::RefPtr<ActionGroup> engine_actions = ActionGroup::create (X_("Audio"));
+       ActionManager::register_action (engine_actions, X_("JACK"), _("JACK"));
+       ActionManager::register_action (engine_actions, X_("Latency"), _("Latency"));
 
-       act = ActionManager::register_action (jack_actions, X_("JACKReconnect"), _("Reconnect"), sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::reconnect_to_jack));
-       ActionManager::jack_opposite_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (engine_actions, X_("JACKReconnect"), _("Reconnect"), sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::reconnect_to_jack));
+       ActionManager::engine_opposite_sensitive_actions.push_back (act);
 
-       act = ActionManager::register_action (jack_actions, X_("JACKDisconnect"), _("Disconnect"), sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::disconnect_from_jack));
-       ActionManager::jack_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (engine_actions, X_("JACKDisconnect"), _("Disconnect"), sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::disconnect_from_jack));
+       ActionManager::engine_sensitive_actions.push_back (act);
 
        RadioAction::Group jack_latency_group;
 
-       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency32"), X_("32"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 32));
-       ActionManager::jack_sensitive_actions.push_back (act);
-       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency64"), X_("64"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 64));
-       ActionManager::jack_sensitive_actions.push_back (act);
-       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency128"), X_("128"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 128));
-       ActionManager::jack_sensitive_actions.push_back (act);
-       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency256"), X_("256"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 256));
-       ActionManager::jack_sensitive_actions.push_back (act);
-       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency512"), X_("512"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 512));
-       ActionManager::jack_sensitive_actions.push_back (act);
-       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency1024"), X_("1024"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 1024));
-       ActionManager::jack_sensitive_actions.push_back (act);
-       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency2048"), X_("2048"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 2048));
-       ActionManager::jack_sensitive_actions.push_back (act);
-       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency4096"), X_("4096"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 4096));
-       ActionManager::jack_sensitive_actions.push_back (act);
-       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency8192"), X_("8192"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 8192));
-       ActionManager::jack_sensitive_actions.push_back (act);
+       act = ActionManager::register_radio_action (engine_actions, jack_latency_group, X_("JACKLatency32"), X_("32"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 32));
+       ActionManager::engine_sensitive_actions.push_back (act);
+       act = ActionManager::register_radio_action (engine_actions, jack_latency_group, X_("JACKLatency64"), X_("64"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 64));
+       ActionManager::engine_sensitive_actions.push_back (act);
+       act = ActionManager::register_radio_action (engine_actions, jack_latency_group, X_("JACKLatency128"), X_("128"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 128));
+       ActionManager::engine_sensitive_actions.push_back (act);
+       act = ActionManager::register_radio_action (engine_actions, jack_latency_group, X_("JACKLatency256"), X_("256"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 256));
+       ActionManager::engine_sensitive_actions.push_back (act);
+       act = ActionManager::register_radio_action (engine_actions, jack_latency_group, X_("JACKLatency512"), X_("512"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 512));
+       ActionManager::engine_sensitive_actions.push_back (act);
+       act = ActionManager::register_radio_action (engine_actions, jack_latency_group, X_("JACKLatency1024"), X_("1024"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 1024));
+       ActionManager::engine_sensitive_actions.push_back (act);
+       act = ActionManager::register_radio_action (engine_actions, jack_latency_group, X_("JACKLatency2048"), X_("2048"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 2048));
+       ActionManager::engine_sensitive_actions.push_back (act);
+       act = ActionManager::register_radio_action (engine_actions, jack_latency_group, X_("JACKLatency4096"), X_("4096"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 4096));
+       ActionManager::engine_sensitive_actions.push_back (act);
+       act = ActionManager::register_radio_action (engine_actions, jack_latency_group, X_("JACKLatency8192"), X_("8192"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 8192));
+       ActionManager::engine_sensitive_actions.push_back (act);
 
        /* these actions are intended to be shared across all windows */
 
@@ -421,7 +421,7 @@ ARDOUR_UI::install_actions ()
 
        ActionManager::add_action_group (shuttle_actions);
        ActionManager::add_action_group (option_actions);
-       ActionManager::add_action_group (jack_actions);
+       ActionManager::add_action_group (engine_actions);
        ActionManager::add_action_group (transport_actions);
        ActionManager::add_action_group (main_actions);
        ActionManager::add_action_group (main_menu_actions);

diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index 1c5c47c41e7a913dab1f2f4b76df76c1ed25e797..d475e2860503bc012f1aff905262fc2dfb607c58 100644 (file)
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -2202,10 +2202,10 @@ ProcessorBox::register_actions ()
 
        act = ActionManager::register_action (popup_act_grp, X_("newinsert"), _("New Insert"),
                        sigc::ptr_fun (ProcessorBox::rb_choose_insert));
-       ActionManager::jack_sensitive_actions.push_back (act);
+       ActionManager::engine_sensitive_actions.push_back (act);
        act = ActionManager::register_action (popup_act_grp, X_("newsend"), _("New External Send ..."),
                        sigc::ptr_fun (ProcessorBox::rb_choose_send));
-       ActionManager::jack_sensitive_actions.push_back (act);
+       ActionManager::engine_sensitive_actions.push_back (act);
 
        ActionManager::register_action (popup_act_grp, X_("newaux"), _("New Aux Send ..."));