projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ensure that all waveviews have ALL their colors set accurately before first render
[ardour.git] / gtk2_ardour / ardour_ui_ed.cc
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 002b7dd3ed2a3d783739a47f42dfdf50d3cdf3d9..454c657e6e90479f86c7342cc210136e14b7818c 100644 (file)
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -139,7 +139,7 @@ ARDOUR_UI::install_actions ()
                                              sigc::mem_fun (*this, &ARDOUR_UI::remove_video));
        act->set_sensitive (false);
        act = ActionManager::register_action (main_actions, X_("ExportVideo"), _("Export To Video File"),
-                                             sigc::mem_fun (*editor, &PublicEditor::export_video));
+                       hide_return (sigc::bind (sigc::mem_fun(*editor, &PublicEditor::export_video), false)));
        ActionManager::session_sensitive_actions.push_back (act);
 
        act = ActionManager::register_action (main_actions, X_("Snapshot"), _("Snapshot..."), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::snapshot_session), false));
@@ -183,39 +183,6 @@ ARDOUR_UI::install_actions ()
        ActionManager::write_sensitive_actions.push_back (act);
        ActionManager::session_sensitive_actions.push_back (act);
 
-       /* AudioEngine actions */
-
-       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 (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 (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 latency_group;
-
-       act = ActionManager::register_radio_action (engine_actions, 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, 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, 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, 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, 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, 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, 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, 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, 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 */
 
        common_actions = ActionGroup::create (X_("Common"));
@@ -224,6 +191,7 @@ ARDOUR_UI::install_actions ()
        /* windows visibility actions */
 
        ActionManager::register_toggle_action (common_actions, X_("ToggleMaximalEditor"), _("Maximise Editor Space"), sigc::mem_fun (*this, &ARDOUR_UI::toggle_editing_space));
+       ActionManager::register_toggle_action (common_actions, X_("ToggleMaximalMixer"), _("Maximise Mixer Space"), sigc::mem_fun (*this, &ARDOUR_UI::toggle_mixer_space));
        act = ActionManager::register_toggle_action (common_actions, X_("KeepTearoffs"), _("Show Toolbars"), mem_fun (*this, &ARDOUR_UI::toggle_keep_tearoffs));
        ActionManager::session_sensitive_actions.push_back (act);
 
@@ -421,7 +389,6 @@ ARDOUR_UI::install_actions ()
 
        ActionManager::add_action_group (shuttle_actions);
        ActionManager::add_action_group (option_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);
@@ -429,60 +396,6 @@ ARDOUR_UI::install_actions ()
        ActionManager::add_action_group (midi_actions);
 }
 
-void
-ARDOUR_UI::set_jack_buffer_size (pframes_t nframes)
-{
-       Glib::RefPtr<Action> action;
-       const char* action_name = 0;
-
-       switch (nframes) {
-       case 32:
-               action_name = X_("JACKLatency32");
-               break;
-       case 64:
-               action_name = X_("JACKLatency64");
-               break;
-       case 128:
-               action_name = X_("JACKLatency128");
-               break;
-       case 256:
-               action_name = X_("JACKLatency256");
-               break;
-       case 512:
-               action_name = X_("JACKLatency512");
-               break;
-       case 1024:
-               action_name = X_("JACKLatency1024");
-               break;
-       case 2048:
-               action_name = X_("JACKLatency2048");
-               break;
-       case 4096:
-               action_name = X_("JACKLatency4096");
-               break;
-       case 8192:
-               action_name = X_("JACKLatency8192");
-               break;
-       default:
-               /* XXX can we do anything useful ? */
-               break;
-       }
-
-       if (action_name) {
-
-               action = ActionManager::get_action (X_("JACK"), action_name);
-
-               if (action) {
-                       Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic (action);
-
-                       if (ract && ract->get_active()) {
-                               engine->request_buffer_size (nframes);
-                               update_sample_rate (0);
-                       }
-               }
-       }
-}
-
 void
 ARDOUR_UI::build_menu_bar ()
 {
@@ -561,7 +474,7 @@ ARDOUR_UI::build_menu_bar ()
        _status_bar_visibility.add (&disk_space_label,      X_("Disk"),      _("Disk Space"), disk_space);
        _status_bar_visibility.add (&cpu_load_label,        X_("DSP"),       _("DSP"), true);
        _status_bar_visibility.add (&buffer_load_label,     X_("Buffers"),   _("Buffers"), true);
-       _status_bar_visibility.add (&sample_rate_label,     X_("JACK"),      _("JACK Sampling Rate and Latency"), true);
+       _status_bar_visibility.add (&sample_rate_label,     X_("Audio"),     _("Audio"), true);
        _status_bar_visibility.add (&timecode_format_label, X_("TCFormat"),  _("Timecode Format"), true);
        _status_bar_visibility.add (&format_label,          X_("Format"),    _("File Format"), true);
 
@@ -647,7 +560,7 @@ ARDOUR_UI::save_ardour_state ()
        window_node->add_child_nocopy (*tearoff_node);
 
        Config->add_extra_xml (*window_node);
-       Config->add_extra_xml (_audio_midi_setup->get_state());
+       Config->add_extra_xml (audio_midi_setup->get_state());
 
        Config->save_state();
 
Unnamed repository; edit this file 'description' to name the repository.