first compiling, mostly working version of group controls changes

[ardour.git] / gtk2_ardour / ardour_ui_options.cc

diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc
index f0ec519775ead8dd10baa5d20564d8910b5e72f4..028467095b2450867d494cb4d8b9b2a933cc50ad 100644 (file)
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -48,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();
 }
@@ -315,12 +315,20 @@ 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);
@@ -328,7 +336,7 @@ ARDOUR_UI::parameter_changed (std::string p)
 
        } else if (p == "follow-edits") {
 
-               ActionManager::map_some_state ("Transport", "ToggleFollowEdits", &RCConfiguration::get_follow_edits);
+               ActionManager::map_some_state ("Transport", "ToggleFollowEdits", &UIConfiguration::get_follow_edits);
 
        } else if (p == "send-mtc") {
 
@@ -339,7 +347,7 @@ ARDOUR_UI::parameter_changed (std::string p)
                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);
+               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") {
@@ -370,9 +378,9 @@ ARDOUR_UI::parameter_changed (std::string p)
                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");
@@ -382,7 +390,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,9 +405,9 @@ ARDOUR_UI::parameter_changed (std::string p)
                        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()) {
@@ -412,15 +420,20 @@ ARDOUR_UI::parameter_changed (std::string p)
                                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 (Config->get_waveform_scale() == Logarithmic);
+               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 (Config->get_waveform_shape() == Rectified
+               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 (ARDOUR_UI::config()->get_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);
        }
 }