summaryrefslogtreecommitdiff
path: root/gtk2_ardour/ardour_ui2.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2010-08-31 01:49:33 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2010-08-31 01:49:33 +0000
commitf13b700944c73fb629f6ac99ecb42f60018e9e9b (patch)
tree9fbdbc7622b66f2a667d675a2c9f633f6a7a6749 /gtk2_ardour/ardour_ui2.cc
parentb9dca83832afe48f8f3f94e702c571a3f57aef7a (diff)
mostly fix 3409 by making it impossible to sync to JACK if video pull up/down is non-zero. missing: can still alter video pull up/down after syncing to JACK, will likely wait till post-3.0
git-svn-id: svn://localhost/ardour2/branches/3.0@7721 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui2.cc')
-rw-r--r--gtk2_ardour/ardour_ui2.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 65f165aa6e..9b975a7461 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -131,7 +131,6 @@ ARDOUR_UI::setup_tooltips ()
set_tip (punch_in_button, _("Start recording at auto-punch start"));
set_tip (punch_out_button, _("Stop recording at auto-punch end"));
set_tip (click_button, _("Enable/Disable audio click"));
- set_tip (sync_button, _("Enable/Disable external positional sync"));
set_tip (time_master_button, string_compose (_("Does %1 control the time?"), PROGRAM_NAME));
set_tip (shuttle_box, _("Shuttle speed control"));
set_tip (shuttle_units_button, _("Select semitones or %%-age for speed display"));
@@ -141,6 +140,8 @@ ARDOUR_UI::setup_tooltips ()
set_tip (primary_clock, _("Primary Clock"));
set_tip (secondary_clock, _("Secondary Clock"));
+ synchronize_sync_source_and_video_pullup ();
+
editor->setup_tooltips ();
}