X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_options.cc;h=5327e06cfa7b2366bdefb99434b5cf0964a371a9;hb=cd3c72bffe950bdaad46b4d4162e1904e0ca58c0;hp=f624e660eea41521ed4251e2ee2502f8a424fbc8;hpb=30b087ab3d28f1585987fa3f6ae006562ae192e3;p=ardour.git diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index f624e660ee..5327e06cfa 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -27,6 +27,7 @@ #include "ardour/rc_configuration.h" #include "ardour/session.h" +#include "ardour/transport_master_manager.h" #include "gtkmm2ext/utils.h" #include "waveview/wave_view.h" @@ -50,14 +51,10 @@ void ARDOUR_UI::toggle_external_sync() { if (_session) { - if (_session->config.get_video_pullup() != 0.0f) { - if (Config->get_sync_source() == Engine) { - MessageDialog msg ( - _("It is not possible to use JACK as the the sync source\n\ -when the pull up/down setting is non-zero.")); - msg.run (); - return; - } + if (_session->config.get_video_pullup() != 0.0f && (TransportMasterManager::instance().current()->type() == Engine)) { + MessageDialog msg (_("It is not possible to use JACK as the the sync source\n when the pull up/down setting is non-zero.")); + msg.run (); + return; } ActionManager::toggle_config_state_foo ("Transport", "ToggleExternalSync", sigc::mem_fun (_session->config, &SessionConfiguration::set_external_sync), sigc::mem_fun (_session->config, &SessionConfiguration::get_external_sync)); @@ -68,7 +65,7 @@ when the pull up/down setting is non-zero.")); * This is a UI limitation, imposed by audio-clock and * status displays which combine RC-config & session-properties. * - * Notficy RCOptionEditor by emitting a signal if the active + * Notify RCOptionEditor by emitting a signal if the active * status changed: */ Config->ParameterChanged("sync-source"); @@ -132,14 +129,7 @@ ARDOUR_UI::toggle_click () void ARDOUR_UI::toggle_session_monitoring_in () { - Glib::RefPtr act = ActionManager::get_action (X_("Transport"), X_("SessionMonitorIn")); - if (!act) { - return; - } - Glib::RefPtr tact = Glib::RefPtr::cast_dynamic (act); - if (!tact) { - return; - } + Glib::RefPtr tact = ActionManager::get_toggle_action (X_("Transport"), X_("SessionMonitorIn")); if (tact->get_active() && _session->config.get_session_monitoring () == MonitorInput) { return; @@ -158,14 +148,7 @@ ARDOUR_UI::toggle_session_monitoring_in () void ARDOUR_UI::toggle_session_monitoring_disk () { - Glib::RefPtr act = ActionManager::get_action (X_("Transport"), X_("SessionMonitorDisk")); - if (!act) { - return; - } - Glib::RefPtr tact = Glib::RefPtr::cast_dynamic (act); - if (!tact) { - return; - } + Glib::RefPtr tact = ActionManager::get_toggle_action (X_("Transport"), X_("SessionMonitorDisk")); if (tact->get_active() && _session->config.get_session_monitoring () == MonitorDisk) { return; } @@ -183,15 +166,11 @@ ARDOUR_UI::toggle_session_monitoring_disk () void ARDOUR_UI::unset_dual_punch () { - Glib::RefPtr action = ActionManager::get_action ("Transport", "TogglePunch"); - - if (action) { - Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(action); - if (tact) { - ignore_dual_punch = true; - tact->set_active (false); - ignore_dual_punch = false; - } + Glib::RefPtr tact = ActionManager::get_toggle_action ("Transport", "TogglePunch"); + if (tact) { + ignore_dual_punch = true; + tact->set_active (false); + ignore_dual_punch = false; } } @@ -202,42 +181,20 @@ ARDOUR_UI::toggle_punch () return; } - Glib::RefPtr action = ActionManager::get_action ("Transport", "TogglePunch"); - - if (action) { - - Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(action); - - if (!tact) { - return; - } - - /* drive the other two actions from this one */ + Glib::RefPtr tact = ActionManager::get_toggle_action ("Transport", "TogglePunch"); - Glib::RefPtr in_action = ActionManager::get_action ("Transport", "TogglePunchIn"); - Glib::RefPtr out_action = ActionManager::get_action ("Transport", "TogglePunchOut"); + /* drive the other two actions from this one */ + Glib::RefPtr in_action = ActionManager::get_toggle_action ("Transport", "TogglePunchIn"); + Glib::RefPtr out_action = ActionManager::get_toggle_action ("Transport", "TogglePunchOut"); - if (in_action && out_action) { - Glib::RefPtr tiact = Glib::RefPtr::cast_dynamic(in_action); - Glib::RefPtr toact = Glib::RefPtr::cast_dynamic(out_action); - tiact->set_active (tact->get_active()); - toact->set_active (tact->get_active()); - } - } + in_action->set_active (tact->get_active()); + out_action->set_active (tact->get_active()); } void ARDOUR_UI::toggle_punch_in () { - Glib::RefPtr act = ActionManager::get_action (X_("Transport"), X_("TogglePunchIn")); - if (!act) { - return; - } - - Glib::RefPtr tact = Glib::RefPtr::cast_dynamic (act); - if (!tact) { - return; - } + Glib::RefPtr tact = ActionManager::get_toggle_action (X_("Transport"), X_("TogglePunchIn")); if (tact->get_active() != _session->config.get_punch_in()) { _session->config.set_punch_in (tact->get_active ()); @@ -255,15 +212,7 @@ ARDOUR_UI::toggle_punch_in () void ARDOUR_UI::toggle_punch_out () { - Glib::RefPtr act = ActionManager::get_action (X_("Transport"), X_("TogglePunchOut")); - if (!act) { - return; - } - - Glib::RefPtr tact = Glib::RefPtr::cast_dynamic (act); - if (!tact) { - return; - } + Glib::RefPtr tact = ActionManager::get_toggle_action (X_("Transport"), X_("TogglePunchOut")); if (tact->get_active() != _session->config.get_punch_out()) { _session->config.set_punch_out (tact->get_active ()); @@ -281,17 +230,9 @@ ARDOUR_UI::toggle_punch_out () void ARDOUR_UI::show_loop_punch_ruler_and_disallow_hide () { - Glib::RefPtr act = ActionManager::get_action (X_("Rulers"), "toggle-loop-punch-ruler"); - if (!act) { - return; - } + Glib::RefPtr tact = ActionManager::get_toggle_action (X_("Rulers"), "toggle-loop-punch-ruler"); - act->set_sensitive (false); - - Glib::RefPtr tact = Glib::RefPtr::cast_dynamic (act); - if (!tact) { - return; - } + tact->set_sensitive (false); if (!tact->get_active()) { tact->set_active (); @@ -314,25 +255,18 @@ ARDOUR_UI::reenable_hide_loop_punch_ruler_if_appropriate () void ARDOUR_UI::toggle_video_sync() { - Glib::RefPtr act = ActionManager::get_action ("Transport", "ToggleVideoSync"); - if (act) { - Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); - _session->config.set_use_video_sync (tact->get_active()); - } + Glib::RefPtr tact = ActionManager::get_toggle_action ("Transport", "ToggleVideoSync"); + _session->config.set_use_video_sync (tact->get_active()); } void ARDOUR_UI::toggle_editing_space() { - Glib::RefPtr act = ActionManager::get_action ("Common", "ToggleMaximalEditor"); - - if (act) { - Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); - if (tact->get_active()) { - maximise_editing_space (); - } else { - restore_editing_space (); - } + Glib::RefPtr tact = ActionManager::get_toggle_action ("Common", "ToggleMaximalEditor"); + if (tact->get_active()) { + maximise_editing_space (); + } else { + restore_editing_space (); } } @@ -349,6 +283,8 @@ ARDOUR_UI::parameter_changed (std::string p) { if (p == "external-sync") { + /* session parameter */ + ActionManager::map_some_state ("Transport", "ToggleExternalSync", sigc::mem_fun (_session->config, &SessionConfiguration::get_external_sync)); if (!_session->config.get_external_sync()) { @@ -357,19 +293,29 @@ ARDOUR_UI::parameter_changed (std::string p) ActionManager::get_action ("Transport", "ToggleAutoReturn")->set_sensitive (true); ActionManager::get_action ("Transport", "ToggleFollowEdits")->set_sensitive (true); } else { - sync_button.set_text (sync_source_to_string (Config->get_sync_source(), true)); - if (_session && _session->locations()->auto_loop_location()) { - // disable looping with external sync. - // This is not necessary because session-transport ignores the loop-state, - // but makes it clear to the user that it's disabled. - _session->request_play_loop (false, false); - } /* XXX we need to make sure that auto-play is off as well as insensitive */ ActionManager::get_action ("Transport", "ToggleAutoPlay")->set_sensitive (false); - ActionManager::get_action ("Transport", "ToggleAutoReturn")->set_sensitive (false); ActionManager::get_action ("Transport", "ToggleFollowEdits")->set_sensitive (false); + if (!_session->synced_to_engine()) { + /* JACK transport allows auto-return */ + ActionManager::get_action ("Transport", "ToggleAutoReturn")->set_sensitive (false); + } + } + + } else if (p == "sync-source") { + + /* app parameter (RC config) */ + + if (_session) { + if (!_session->config.get_external_sync()) { + sync_button.set_text (S_("SyncSource|Int.")); + } else { + sync_button.set_text (TransportMasterManager::instance().current()->display_name()); + } + } else { + /* changing sync source without a session is unlikely/impossible , except during startup */ + sync_button.set_text (TransportMasterManager::instance().current()->display_name()); } - set_loop_sensitivity (); } else if (p == "follow-edits") { @@ -392,27 +338,21 @@ ARDOUR_UI::parameter_changed (std::string p) } else if (p == "auto-input") { ActionManager::map_some_state ("Transport", "ToggleAutoInput", sigc::mem_fun (_session->config, &SessionConfiguration::get_auto_input)); } else if (p == "session-monitoring") { - Glib::RefPtr iact = ActionManager::get_action (X_("Transport"), X_("SessionMonitorIn")); - Glib::RefPtr dact = ActionManager::get_action (X_("Transport"), X_("SessionMonitorDisk")); - if (iact && dact) { - Glib::RefPtr tdact = Glib::RefPtr::cast_dynamic(dact); - Glib::RefPtr tiact = Glib::RefPtr::cast_dynamic(iact); - if (tdact && tiact) { - switch (_session->config.get_session_monitoring ()) { - case MonitorDisk: - tdact->set_active (true); - tiact->set_active (false); - break; - case MonitorInput: - tiact->set_active (true); - tdact->set_active (false); - break; - default: - tdact->set_active (false); - tiact->set_active (false); - break; - } - } + Glib::RefPtr tiact = ActionManager::get_toggle_action (X_("Transport"), X_("SessionMonitorIn")); + Glib::RefPtr tdact = ActionManager::get_toggle_action (X_("Transport"), X_("SessionMonitorDisk")); + switch (_session->config.get_session_monitoring ()) { + case MonitorDisk: + tdact->set_active (true); + tiact->set_active (false); + break; + case MonitorInput: + tiact->set_active (true); + tdact->set_active (false); + break; + default: + tdact->set_active (false); + tiact->set_active (false); + break; } } else if (p == "punch-out") { ActionManager::map_some_state ("Transport", "TogglePunchOut", sigc::mem_fun (_session->config, &SessionConfiguration::get_punch_out)); @@ -426,13 +366,6 @@ ARDOUR_UI::parameter_changed (std::string p) } } else if (p == "clicking") { ActionManager::map_some_state ("Transport", "ToggleClick", &RCConfiguration::get_clicking); - } else if (p == "click-record-only") { - // TODO set a flag, blink or gray-out metronome button while rolling, only - if (Config->get_click_record_only()) { - click_button.set_name ("generic button"); // XXX - } else { - click_button.set_name ("transport button"); - } } else if (p == "use-video-sync") { ActionManager::map_some_state ("Transport", "ToggleVideoSync", sigc::mem_fun (_session->config, &SessionConfiguration::get_use_video_sync)); } else if (p == "sync-source") { @@ -442,8 +375,8 @@ ARDOUR_UI::parameter_changed (std::string p) } else if (p == "show-track-meters") { if (editor) editor->toggle_meter_updating(); - } else if (p == "primary-clock-delta-edit-cursor") { - if (UIConfiguration::instance().get_primary_clock_delta_edit_cursor()) { + } else if (p == "primary-clock-delta-mode") { + if (UIConfiguration::instance().get_primary_clock_delta_mode() != NoDelta) { primary_clock->set_is_duration (true); primary_clock->set_editable (false); primary_clock->set_widget_name ("transport delta"); @@ -452,8 +385,8 @@ ARDOUR_UI::parameter_changed (std::string p) primary_clock->set_editable (true); primary_clock->set_widget_name ("transport"); } - } else if (p == "secondary-clock-delta-edit-cursor") { - if (UIConfiguration::instance().get_secondary_clock_delta_edit_cursor()) { + } else if (p == "secondary-clock-delta-mode") { + if (UIConfiguration::instance().get_secondary_clock_delta_mode() != NoDelta) { secondary_clock->set_is_duration (true); secondary_clock->set_editable (false); secondary_clock->set_widget_name ("secondary delta"); @@ -478,6 +411,10 @@ ARDOUR_UI::parameter_changed (std::string p) ArdourWaveView::WaveView::set_global_gradient_depth (UIConfiguration::instance().get_waveform_gradient_depth()); } else if (p == "show-mini-timeline") { repack_transport_hbox (); + } else if (p == "show-dsp-load-info") { + repack_transport_hbox (); + } else if (p == "show-disk-space-info") { + repack_transport_hbox (); } else if (p == "show-toolbar-recpunch") { repack_transport_hbox (); } else if (p == "show-toolbar-monitoring") { @@ -504,7 +441,7 @@ ARDOUR_UI::parameter_changed (std::string p) VisibilityTracker::set_use_window_manager_visibility (UIConfiguration::instance().get_use_wm_visibility()); } else if (p == "action-table-columns") { const uint32_t cols = UIConfiguration::instance().get_action_table_columns (); - for (int i = 0; i < 9; ++i) { + for (int i = 0; i < MAX_LUA_ACTION_SCRIPTS; ++i) { const int col = i / 2; if (cols & (1<config.get_layered_record_mode ()); - } else if (p == "show-waveform-clipping") { - ArdourWaveView::WaveView::set_global_show_waveform_clipping (UIConfiguration::instance().get_show_waveform_clipping()); - } else if (p == "waveform-gradient-depth") { - ArdourWaveView::WaveView::set_global_gradient_depth (UIConfiguration::instance().get_waveform_gradient_depth()); } else if (p == "flat-buttons") { bool flat = UIConfiguration::instance().get_flat_buttons(); if (ArdourButton::flat_buttons () != flat) { @@ -525,12 +458,17 @@ ARDOUR_UI::parameter_changed (std::string p) /* force a redraw */ gtk_rc_reset_styles (gtk_settings_get_default()); } - } else if (p == "click-gain") { - float gain_db = accurate_coefficient_to_dB (Config->get_click_gain()); - char tmp[32]; - snprintf(tmp, 31, "%+.1f", gain_db); - set_tip (click_button, string_compose (_("Enable/Disable metronome\n\nRight-click to access preferences\nMouse-wheel to modify level\nSignal Level: %1 dBFS"), tmp)); + } else if (p == "boxy-buttons") { + bool boxy = UIConfiguration::instance().get_boxy_buttons(); + if (ArdourButton::boxy_buttons () != boxy) { + ArdourButton::set_boxy_buttons (boxy); + /* force a redraw */ + gtk_rc_reset_styles (gtk_settings_get_default()); + } + } else if ( (p == "snap-to-region-sync") || (p == "snap-to-region-start") || (p == "snap-to-region-end") ) { + if (editor) editor->mark_region_boundary_cache_dirty(); } + } void @@ -588,7 +526,7 @@ ARDOUR_UI::synchronize_sync_source_and_video_pullup () act->set_sensitive (true); } else { /* can't sync to JACK if video pullup != 0.0 */ - if (Config->get_sync_source() == Engine) { + if (TransportMasterManager::instance().current()->type() == Engine) { act->set_sensitive (false); } else { act->set_sensitive (true); @@ -608,4 +546,3 @@ ARDOUR_UI::synchronize_sync_source_and_video_pullup () } } -