X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_options.cc;h=1463d0f801c21008244409ed1abad59bd27846b2;hb=95df99e6d4cf6d1f8d71183299d31835e6708eb8;hp=55314037e37265ab8b6c72d3c643dca6674d23ec;hpb=19bb2b33a89a1291451f0740739a36daebe00bae;p=ardour.git diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index 55314037e3..1463d0f801 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -29,10 +29,6 @@ #include "ardour/rc_configuration.h" #include "ardour/session.h" -#ifdef HAVE_LIBLO -#include "ardour/osc.h" -#endif - #include "canvas/wave_view.h" #include "audio_clock.h" @@ -52,7 +48,7 @@ using namespace PBD; void ARDOUR_UI::toggle_keep_tearoffs () { - ActionManager::toggle_config_state ("Common", "KeepTearoffs", &RCConfiguration::set_keep_tearoffs, &RCConfiguration::get_keep_tearoffs); + ActionManager::toggle_config_state ("Common", "KeepTearoffs", &UIConfiguration::set_keep_tearoffs, &UIConfiguration::get_keep_tearoffs); ARDOUR_UI::update_tearoff_visibility(); } @@ -62,7 +58,7 @@ ARDOUR_UI::toggle_external_sync() { if (_session) { if (_session->config.get_video_pullup() != 0.0f) { - if (Config->get_sync_source() == JACK) { + 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.")); @@ -330,9 +326,9 @@ ARDOUR_UI::parameter_changed (std::string p) 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") { @@ -342,18 +338,8 @@ ARDOUR_UI::parameter_changed (std::string p) ActionManager::map_some_state ("options", "SendMMC", &RCConfiguration::get_send_mmc); - } else if (p == "use-osc") { - -#ifdef HAVE_LIBLO - if (Config->get_use_osc()) { - osc->start (); - } else { - osc->stop (); - } -#endif - } else if (p == "keep-tearoffs") { - ActionManager::map_some_state ("Common", "KeepTearoffs", &RCConfiguration::get_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") { @@ -378,20 +364,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"); @@ -401,7 +382,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"); @@ -411,19 +392,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(); - if (editor_meter && show) { - meter_box.show(); - editor_meter_peak_display.show(); - } else if (editor_meter && !show) { - meter_box.hide(); - editor_meter_peak_display.hide(); + 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(); + } } + } 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); } } @@ -432,6 +434,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; } } @@ -467,7 +484,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() == JACK) { + if (Config->get_sync_source() == Engine) { act->set_sensitive (false); } else { act->set_sensitive (true);