X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=gtk2_ardour%2Fardour_ui_options.cc;h=3f2b1edc684df1a793c9d955f64b9325faeed8a4;hb=098b0f8a8b904313bc2e9e3147cc3c05fd83f3e6;hp=ca18c5f555fe73518b761aa3fc6b48f0f55556a1;hpb=aab787f686e6287a06ba94ed8c87b524c4690f0f;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc
index ca18c5f555..3f2b1edc68 100644
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -27,6 +27,7 @@
 
 #include "ardour/rc_configuration.h"
 #include "ardour/session.h"
+#include "ardour/transport_master_manager.h"
 
 #include "gtkmm2ext/utils.h"
 #include "waveview/wave_view.h"
@@ -50,14 +51,10 @@ 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));
@@ -68,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");
@@ -349,6 +346,8 @@ 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()) {
@@ -357,19 +356,27 @@ ARDOUR_UI::parameter_changed (std::string p)
 			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));
-			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);
-			}
 			/* 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 == "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") {
 
 		ActionManager::map_some_state ("Transport", "ToggleFollowEdits", &UIConfiguration::get_follow_edits);
@@ -470,6 +477,10 @@ ARDOUR_UI::parameter_changed (std::string p)
 		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") {
@@ -496,7 +507,7 @@ ARDOUR_UI::parameter_changed (std::string p)
 		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 < 9; ++i) {
+		for (int i = 0; i < MAX_LUA_ACTION_SCRIPTS; ++i) {
 			const int col = i / 2;
 			if (cols & (1<<col)) {
 				action_script_call_btn[i].show();
@@ -513,7 +524,17 @@ ARDOUR_UI::parameter_changed (std::string p)
 			/* 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
@@ -571,7 +592,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);
@@ -591,4 +612,3 @@ ARDOUR_UI::synchronize_sync_source_and_video_pullup ()
 	}
 
 }
-