X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_options.cc;h=7e098cab3859bc542ccce9d9c6b71bdac9954815;hb=234b06a18cf3e8c07bc44fb4f8c1218e17fb65f1;hp=e1435f7a8dae4dc65e479a11ebe6d9237b123bf2;hpb=8f930477be9e2c88859a8ea30b213fba3f7fc443;p=ardour.git diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index e1435f7a8d..7e098cab38 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -45,14 +45,6 @@ using namespace Gtkmm2ext; using namespace ARDOUR; using namespace PBD; -void -ARDOUR_UI::toggle_keep_tearoffs () -{ - ActionManager::toggle_config_state ("Common", "KeepTearoffs", &RCConfiguration::set_keep_tearoffs, &RCConfiguration::get_keep_tearoffs); - - ARDOUR_UI::update_tearoff_visibility(); -} - void ARDOUR_UI::toggle_external_sync() { @@ -91,31 +83,31 @@ 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); + 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", "SendMIDIfeedback", &RCConfiguration::set_midi_feedback, &RCConfiguration::get_midi_feedback); } void @@ -315,35 +307,41 @@ ARDOUR_UI::parameter_changed (std::string p) if (!_session->config.get_external_sync()) { sync_button.set_text (_("Internal")); + auto_loop_button.set_sensitive (true); 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 */ + 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); + } + auto_loop_button.set_sensitive (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); } - } else if (p == "always-play-range") { + } else if (p == "follow-edits") { - ActionManager::map_some_state ("Transport", "ToggleFollowEdits", &RCConfiguration::get_always_play_range); + ActionManager::map_some_state ("Transport", "ToggleFollowEdits", &UIConfiguration::get_follow_edits); } 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", &RCConfiguration::get_keep_tearoffs); } else if (p == "mmc-control") { - ActionManager::map_some_state ("options", "UseMMC", &RCConfiguration::get_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", "SendMIDIfeedback", &RCConfiguration::get_midi_feedback); } 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") { @@ -364,20 +362,15 @@ ARDOUR_UI::parameter_changed (std::string p) ActionManager::map_some_state ("Transport", "ToggleClick", &RCConfiguration::get_clicking); } 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 == "video-pullup" || p == "timecode-format") { - - synchronize_sync_source_and_video_pullup (); - reset_main_clocks (); - editor->queue_visual_videotimeline_update(); - } else if (p == "sync-source") { synchronize_sync_source_and_video_pullup (); + set_fps_timeout_connection (); } else if (p == "show-track-meters") { - editor->toggle_meter_updating(); + if (editor) editor->toggle_meter_updating(); } else if (p == "primary-clock-delta-edit-cursor") { - if (Config->get_primary_clock_delta_edit_cursor()) { + if (UIConfiguration::instance().get_primary_clock_delta_edit_cursor()) { primary_clock->set_is_duration (true); primary_clock->set_editable (false); primary_clock->set_widget_name ("transport delta"); @@ -387,7 +380,7 @@ ARDOUR_UI::parameter_changed (std::string p) primary_clock->set_widget_name ("transport"); } } else if (p == "secondary-clock-delta-edit-cursor") { - if (Config->get_secondary_clock_delta_edit_cursor()) { + if (UIConfiguration::instance().get_secondary_clock_delta_edit_cursor()) { secondary_clock->set_is_duration (true); secondary_clock->set_editable (false); secondary_clock->set_widget_name ("secondary delta"); @@ -397,26 +390,40 @@ ARDOUR_UI::parameter_changed (std::string p) secondary_clock->set_widget_name ("secondary"); } } else if (p == "super-rapid-clock-update") { - stop_clocking (); - start_clocking (); + if (_session) { + stop_clocking (); + start_clocking (); + } } else if (p == "waveform-gradient-depth") { - ArdourCanvas::WaveView::set_global_gradient_depth (config()->get_waveform_gradient_depth()); + ArdourCanvas::WaveView::set_global_gradient_depth (UIConfiguration::instance().get_waveform_gradient_depth()); } else if (p == "show-editor-meter") { - bool show = Config->get_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); + transport_hbox.remove (meter_box); + transport_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); + transport_hbox.pack_start (meter_box, false, false); + transport_hbox.pack_start (editor_meter_peak_display, false, false); meter_box.show(); editor_meter_peak_display.show(); - } + } } + } else if (p == "waveform-scale") { + ArdourCanvas::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); + } else if (p == "show-waveform-clipping") { + ArdourCanvas::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); } } @@ -425,6 +432,21 @@ ARDOUR_UI::session_parameter_changed (std::string p) { if (p == "native-file-data-format" || p == "native-file-header-format") { update_format (); + } else if (p == "timecode-format") { + set_fps_timeout_connection (); + } else if (p == "video-pullup" || p == "timecode-format") { + set_fps_timeout_connection (); + + synchronize_sync_source_and_video_pullup (); + reset_main_clocks (); + editor->queue_visual_videotimeline_update(); + } else if (p == "track-name-number") { + /* DisplaySuspender triggers _route->redisplay() when going out of scope + * which eventually calls reset_controls_layout_width() and re-sets the + * track-header width. + * see also RouteTimeAxisView::update_track_number_visibility() + */ + DisplaySuspender ds; } }