X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_options.cc;h=5327e06cfa7b2366bdefb99434b5cf0964a371a9;hb=84aedbb532c46054f200d7312334da7c17776b8e;hp=1463d0f801c21008244409ed1abad59bd27846b2;hpb=6b019a495359909a3d1a778ca10cd7df7cc302cc;p=ardour.git diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index 1463d0f801..5327e06cfa 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -23,13 +23,14 @@ #include "pbd/convert.h" #include "pbd/stacktrace.h" - -#include +#include "pbd/unwind.h" #include "ardour/rc_configuration.h" #include "ardour/session.h" +#include "ardour/transport_master_manager.h" -#include "canvas/wave_view.h" +#include "gtkmm2ext/utils.h" +#include "waveview/wave_view.h" #include "audio_clock.h" #include "ardour_ui.h" @@ -38,33 +39,22 @@ #include "public_editor.h" #include "main_clock.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtk; using namespace Gtkmm2ext; using namespace ARDOUR; using namespace PBD; - -void -ARDOUR_UI::toggle_keep_tearoffs () -{ - ActionManager::toggle_config_state ("Common", "KeepTearoffs", &UIConfiguration::set_keep_tearoffs, &UIConfiguration::get_keep_tearoffs); - - ARDOUR_UI::update_tearoff_visibility(); -} +using namespace ArdourWidgets; 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)); @@ -75,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"); @@ -91,31 +81,25 @@ ARDOUR_UI::toggle_time_master () void ARDOUR_UI::toggle_send_mtc () { - ActionManager::toggle_config_state ("options", "SendMTC", &RCConfiguration::set_send_mtc, &RCConfiguration::get_send_mtc); + ActionManager::toggle_config_state ("Options", "SendMTC", &RCConfiguration::set_send_mtc, &RCConfiguration::get_send_mtc); } void ARDOUR_UI::toggle_send_mmc () { - ActionManager::toggle_config_state ("options", "SendMMC", &RCConfiguration::set_send_mmc, &RCConfiguration::get_send_mmc); + ActionManager::toggle_config_state ("Options", "SendMMC", &RCConfiguration::set_send_mmc, &RCConfiguration::get_send_mmc); } void ARDOUR_UI::toggle_send_midi_clock () { - ActionManager::toggle_config_state ("options", "SendMidiClock", &RCConfiguration::set_send_midi_clock, &RCConfiguration::get_send_midi_clock); + ActionManager::toggle_config_state ("Options", "SendMidiClock", &RCConfiguration::set_send_midi_clock, &RCConfiguration::get_send_midi_clock); } void ARDOUR_UI::toggle_use_mmc () { - ActionManager::toggle_config_state ("options", "UseMMC", &RCConfiguration::set_mmc_control, &RCConfiguration::get_mmc_control); -} - -void -ARDOUR_UI::toggle_send_midi_feedback () -{ - ActionManager::toggle_config_state ("options", "SendMIDIfeedback", &RCConfiguration::set_midi_feedback, &RCConfiguration::get_midi_feedback); + ActionManager::toggle_config_state ("Options", "UseMMC", &RCConfiguration::set_mmc_control, &RCConfiguration::get_mmc_control); } void @@ -143,63 +127,74 @@ ARDOUR_UI::toggle_click () } void -ARDOUR_UI::unset_dual_punch () +ARDOUR_UI::toggle_session_monitoring_in () { - 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 (X_("Transport"), X_("SessionMonitorIn")); + + if (tact->get_active() && _session->config.get_session_monitoring () == MonitorInput) { + return; + } + if (!tact->get_active() && _session->config.get_session_monitoring () != MonitorInput) { + return; + } + + if (tact->get_active()) { + _session->config.set_session_monitoring (MonitorInput); + } else { + _session->config.set_session_monitoring (MonitorAuto); } } void -ARDOUR_UI::toggle_punch () +ARDOUR_UI::toggle_session_monitoring_disk () { - if (ignore_dual_punch) { + Glib::RefPtr tact = ActionManager::get_toggle_action (X_("Transport"), X_("SessionMonitorDisk")); + if (tact->get_active() && _session->config.get_session_monitoring () == MonitorDisk) { + return; + } + if (!tact->get_active() && _session->config.get_session_monitoring () != MonitorDisk) { return; } - Glib::RefPtr action = ActionManager::get_action ("Transport", "TogglePunch"); - - if (action) { + if (tact->get_active()) { + _session->config.set_session_monitoring (MonitorDisk); + } else { + _session->config.set_session_monitoring (MonitorAuto); + } +} - Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(action); +void +ARDOUR_UI::unset_dual_punch () +{ + Glib::RefPtr tact = ActionManager::get_toggle_action ("Transport", "TogglePunch"); + if (tact) { + ignore_dual_punch = true; + tact->set_active (false); + ignore_dual_punch = false; + } +} - if (!tact) { - return; - } +void +ARDOUR_UI::toggle_punch () +{ + if (ignore_dual_punch) { + 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 ()); @@ -217,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 ()); @@ -243,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; - } - - act->set_sensitive (false); + Glib::RefPtr tact = ActionManager::get_toggle_action (X_("Rulers"), "toggle-loop-punch-ruler"); - Glib::RefPtr tact = Glib::RefPtr::cast_dynamic (act); - if (!tact) { - return; - } + tact->set_sensitive (false); if (!tact->get_active()) { tact->set_active (); @@ -276,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 (); } } @@ -311,19 +283,38 @@ 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()) { - sync_button.set_text (_("Internal")); + sync_button.set_text (S_("SyncSource|Int.")); ActionManager::get_action ("Transport", "ToggleAutoPlay")->set_sensitive (true); 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)); - /* XXX need to make auto-play is off as well as insensitive */ + /* 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()); } } else if (p == "follow-edits") { @@ -332,24 +323,37 @@ ARDOUR_UI::parameter_changed (std::string p) } else if (p == "send-mtc") { - ActionManager::map_some_state ("options", "SendMTC", &RCConfiguration::get_send_mtc); + ActionManager::map_some_state ("Options", "SendMTC", &RCConfiguration::get_send_mtc); } else if (p == "send-mmc") { - ActionManager::map_some_state ("options", "SendMMC", &RCConfiguration::get_send_mmc); + ActionManager::map_some_state ("Options", "SendMMC", &RCConfiguration::get_send_mmc); - } else if (p == "keep-tearoffs") { - ActionManager::map_some_state ("Common", "KeepTearoffs", &UIConfiguration::get_keep_tearoffs); } else if (p == "mmc-control") { - ActionManager::map_some_state ("options", "UseMMC", &RCConfiguration::get_mmc_control); - } else if (p == "midi-feedback") { - ActionManager::map_some_state ("options", "SendMIDIfeedback", &RCConfiguration::get_midi_feedback); + ActionManager::map_some_state ("Options", "UseMMC", &RCConfiguration::get_mmc_control); } else if (p == "auto-play") { ActionManager::map_some_state ("Transport", "ToggleAutoPlay", sigc::mem_fun (_session->config, &SessionConfiguration::get_auto_play)); } else if (p == "auto-return") { ActionManager::map_some_state ("Transport", "ToggleAutoReturn", sigc::mem_fun (_session->config, &SessionConfiguration::get_auto_return)); } 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 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)); if (!_session->config.get_punch_out()) { @@ -371,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"); @@ -381,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"); @@ -396,37 +400,75 @@ ARDOUR_UI::parameter_changed (std::string p) stop_clocking (); start_clocking (); } + } else if (p == "use-tooltips") { + /* this doesn't really belong here but it has to go somewhere */ + if (UIConfiguration::instance().get_use_tooltips()) { + Gtkmm2ext::enable_tooltips (); + } else { + Gtkmm2ext::disable_tooltips (); + } } else if (p == "waveform-gradient-depth") { - ArdourCanvas::WaveView::set_global_gradient_depth (UIConfiguration::instance().get_waveform_gradient_depth()); + 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") { + repack_transport_hbox (); + } else if (p == "show-toolbar-selclock") { + repack_transport_hbox (); } else if (p == "show-editor-meter") { - bool show = UIConfiguration::instance().get_show_editor_meter(); - - if (editor_meter) { - if (meter_box.get_parent()) { - transport_tearoff_hbox.remove (meter_box); - transport_tearoff_hbox.remove (editor_meter_peak_display); - } - - if (show) { - transport_tearoff_hbox.pack_start (meter_box, false, false); - transport_tearoff_hbox.pack_start (editor_meter_peak_display, false, false); - meter_box.show(); - editor_meter_peak_display.show(); - } - } + repack_transport_hbox (); + } else if (p == "show-secondary-clock") { + update_clock_visibility (); } else if (p == "waveform-scale") { - ArdourCanvas::WaveView::set_global_logscaled (UIConfiguration::instance().get_waveform_scale() == Logarithmic); + ArdourWaveView::WaveView::set_global_logscaled (UIConfiguration::instance().get_waveform_scale() == Logarithmic); } else if (p == "widget-prelight") { CairoWidget::set_widget_prelight (UIConfiguration::instance().get_widget_prelight()); } else if (p == "waveform-shape") { - ArdourCanvas::WaveView::set_global_shape (UIConfiguration::instance().get_waveform_shape() == Rectified - ? ArdourCanvas::WaveView::Rectified : ArdourCanvas::WaveView::Normal); + ArdourWaveView::WaveView::set_global_shape (UIConfiguration::instance().get_waveform_shape() == Rectified + ? ArdourWaveView::WaveView::Rectified : ArdourWaveView::WaveView::Normal); } else if (p == "show-waveform-clipping") { - ArdourCanvas::WaveView::set_global_show_waveform_clipping (UIConfiguration::instance().get_show_waveform_clipping()); + ArdourWaveView::WaveView::set_global_show_waveform_clipping (UIConfiguration::instance().get_show_waveform_clipping()); } else if (p == "waveform-cache-size") { /* GUI option has units of megabytes; image cache uses units of bytes */ - ArdourCanvas::WaveView::set_image_cache_size (UIConfiguration::instance().get_waveform_cache_size() * 1048576); + ArdourWaveView::WaveView::set_image_cache_size (UIConfiguration::instance().get_waveform_cache_size() * 1048576); + } else if (p == "use-wm-visibility") { + 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 < MAX_LUA_ACTION_SCRIPTS; ++i) { + const int col = i / 2; + if (cols & (1<config.get_layered_record_mode ()); + } else if (p == "flat-buttons") { + bool flat = UIConfiguration::instance().get_flat_buttons(); + if (ArdourButton::flat_buttons () != flat) { + ArdourButton::set_flat_buttons (flat); + /* force a redraw */ + gtk_rc_reset_styles (gtk_settings_get_default()); + } + } 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 @@ -458,8 +500,8 @@ ARDOUR_UI::reset_main_clocks () ENSURE_GUI_THREAD (*this, &ARDOUR_UI::reset_main_clocks) if (_session) { - primary_clock->set (_session->audible_frame(), true); - secondary_clock->set (_session->audible_frame(), true); + primary_clock->set (_session->audible_sample(), true); + secondary_clock->set (_session->audible_sample(), true); } else { primary_clock->set (0, true); secondary_clock->set (0, true); @@ -484,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); @@ -504,4 +546,3 @@ ARDOUR_UI::synchronize_sync_source_and_video_pullup () } } -