smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-21 22:26:29 +01:00
Code Issues Projects Releases Wiki Activity

removing button for synch mode

Browse source 
[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 459984]
This commit is contained in:
Valeriy Kamyshniy 2014-05-13 06:43:12 -05:00
parent dd8a0e631d
commit f99d057421
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/ardour_ui.h
View file

@ -448,7 +448,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
ArdourButton follow_edits_button; ArdourButton follow_edits_button;
ArdourButton auto_input_button; ArdourButton auto_input_button;
ArdourButton click_button; ArdourButton click_button;
ArdourButton sync_button; // NO NEED TO HAVE IT: ArdourButton sync_button;
ArdourButton auditioning_alert_button; ArdourButton auditioning_alert_button;
ArdourButton solo_alert_button; ArdourButton solo_alert_button;

14
gtk2_ardour/ardour_ui2.cc
View file

@ -262,7 +262,7 @@ ARDOUR_UI::setup_transport ()
/* these have to provide a clear indication of active state */ /* these have to provide a clear indication of active state */
click_button.set_name ("transport button"); click_button.set_name ("transport button");
sync_button.set_name ("transport active option button"); // NO NEED TO HAVE IT: sync_button.set_name ("transport active option button");
stop_button.set_active (true); stop_button.set_active (true);
@ -295,7 +295,7 @@ ARDOUR_UI::setup_transport ()
act = ActionManager::get_action (X_("MIDI"), X_("panic")); act = ActionManager::get_action (X_("MIDI"), X_("panic"));
midi_panic_button.set_related_action (act); midi_panic_button.set_related_action (act);
act = ActionManager::get_action (X_("Transport"), X_("ToggleExternalSync")); act = ActionManager::get_action (X_("Transport"), X_("ToggleExternalSync"));
sync_button.set_related_action (act); // NO NEED TO HAVE IT: sync_button.set_related_action (act);
/* clocks, etc. */ /* clocks, etc. */
@ -418,7 +418,7 @@ ARDOUR_UI::setup_transport ()
VBox* auto_box = manage (new VBox); VBox* auto_box = manage (new VBox);
auto_box->set_homogeneous (true); auto_box->set_homogeneous (true);
auto_box->set_spacing (2); auto_box->set_spacing (2);
auto_box->pack_start (sync_button, false, false); // NO NEED TO HAVE IT: auto_box->pack_start (sync_button, false, false);
if (!ARDOUR::Profile->get_trx()) { if (!ARDOUR::Profile->get_trx()) {
auto_box->pack_start (follow_edits_button, false, false); auto_box->pack_start (follow_edits_button, false, false);
auto_box->pack_start (auto_return_button, false, false); auto_box->pack_start (auto_return_button, false, false);
@ -548,7 +548,7 @@ ARDOUR_UI::sync_blink (bool onoff)
{ {
if (_session == 0 || !_session->config.get_external_sync()) { if (_session == 0 || !_session->config.get_external_sync()) {
/* internal sync */ /* internal sync */
sync_button.set_active (false); // NO NEED TO HAVE IT: sync_button.set_active (false);
return; return;
} }
@ -556,13 +556,13 @@ ARDOUR_UI::sync_blink (bool onoff)
/* not locked, so blink on and off according to the onoff argument */ /* not locked, so blink on and off according to the onoff argument */
if (onoff) { if (onoff) {
sync_button.set_active (true); // NO NEED TO HAVE IT: sync_button.set_active (true);
} else { } else {
sync_button.set_active (false); // NO NEED TO HAVE IT: sync_button.set_active (false);
} }
} else { } else {
/* locked */ /* locked */
sync_button.set_active (true); // NO NEED TO HAVE IT: sync_button.set_active (true);
} }
} }

8
gtk2_ardour/ardour_ui_options.cc
View file

@ -314,12 +314,12 @@ ARDOUR_UI::parameter_changed (std::string p)
ActionManager::map_some_state ("Transport", "ToggleExternalSync", sigc::mem_fun (_session->config, &SessionConfiguration::get_external_sync)); ActionManager::map_some_state ("Transport", "ToggleExternalSync", sigc::mem_fun (_session->config, &SessionConfiguration::get_external_sync));
if (!_session->config.get_external_sync()) { if (!_session->config.get_external_sync()) {
sync_button.set_text (_("Internal")); // NO NEED TO HAVE IT: sync_button.set_text (_("Internal"));
ActionManager::get_action ("Transport", "ToggleAutoPlay")->set_sensitive (true); ActionManager::get_action ("Transport", "ToggleAutoPlay")->set_sensitive (true);
ActionManager::get_action ("Transport", "ToggleAutoReturn")->set_sensitive (true); ActionManager::get_action ("Transport", "ToggleAutoReturn")->set_sensitive (true);
ActionManager::get_action ("Transport", "ToggleFollowEdits")->set_sensitive (true); ActionManager::get_action ("Transport", "ToggleFollowEdits")->set_sensitive (true);
} else { } else {
sync_button.set_text (sync_source_to_string (Config->get_sync_source(), true)); // NO NEED TO HAVE IT: 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 */ /* XXX need to make auto-play is off as well as insensitive */
ActionManager::get_action ("Transport", "ToggleAutoPlay")->set_sensitive (false); ActionManager::get_action ("Transport", "ToggleAutoPlay")->set_sensitive (false);
ActionManager::get_action ("Transport", "ToggleAutoReturn")->set_sensitive (false); ActionManager::get_action ("Transport", "ToggleAutoReturn")->set_sensitive (false);
@ -474,9 +474,9 @@ ARDOUR_UI::synchronize_sync_source_and_video_pullup ()
just_label: just_label:
if (act->get_sensitive ()) { if (act->get_sensitive ()) {
set_tip (sync_button, _("Enable/Disable external positional sync")); // NO NEED TO HAVE IT: set_tip (sync_button, _("Enable/Disable external positional sync"));
} else { } else {
set_tip (sync_button, _("Sync to JACK is not possible: video pull up/down is set")); // NO NEED TO HAVE IT: set_tip (sync_button, _("Sync to JACK is not possible: video pull up/down is set"));
} }
} }