X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_options.cc;h=0c59a6621343ec601256785bff69e7207f617ddb;hb=601a34521c2ce1d0167ed2f3c66f2fa6eeeb6b8e;hp=a8be3ccd0cfb63b56c7579840fc38651344370e3;hpb=c993e2d37bf9f3269bbbe5e47ee391805354206d;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc
index a8be3ccd0c..0c59a66213 100644
--- 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();
 }
@@ -328,7 +328,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 +339,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 +370,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 (ARDOUR_UI::config()->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 +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 (ARDOUR_UI::config()->get_secondary_clock_delta_edit_cursor()) {
 			secondary_clock->set_is_duration (true);
 			secondary_clock->set_editable (false);
 			secondary_clock->set_widget_name ("secondary delta");
@@ -392,12 +392,14 @@ 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());
 	} else if (p == "show-editor-meter") {
-		bool show = Config->get_show_editor_meter();
+		bool show = ARDOUR_UI::config()->get_show_editor_meter();
 
 		if (editor_meter) {
 			if (meter_box.get_parent()) {
@@ -413,12 +415,19 @@ ARDOUR_UI::parameter_changed (std::string p)
 			} 
 		}
 	} else if (p == "waveform-scale") {
-		ArdourCanvas::WaveView::set_global_logscaled (Config->get_waveform_scale() == Logarithmic);
+		ArdourCanvas::WaveView::set_global_logscaled (ARDOUR_UI::config()->get_waveform_scale() == Logarithmic);
+	} else if (p == "widget-prelight") {
+		CairoWidget::set_widget_prelight( config()->get_widget_prelight() );
 	} else if (p == "waveform-shape") {
-		ArdourCanvas::WaveView::set_global_shape (Config->get_waveform_shape() == Rectified
+		ArdourCanvas::WaveView::set_global_shape (ARDOUR_UI::config()->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());
+	} else if (p == "font-scale") {
+		ui_scale = config()->get_font_scale () / 102400.;
+	} else if (p == "waveform-cache-size") {
+		/* GUI option has units of megabytes; image cache uses units of bytes */
+		ArdourCanvas::WaveView::set_image_cache_size (ARDOUR_UI::config()->get_waveform_cache_size() * 1048576);
 	}
 }