summaryrefslogtreecommitdiff
path: root/gtk2_ardour/audio_clock.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2010-12-01 20:49:22 +0000
committerCarl Hetherington <carl@carlh.net>2010-12-01 20:49:22 +0000
commita5ea47ff0db48e9b5549f309eb6951138b063de4 (patch)
treeeb99033b2e9ed7736628a028d1d22743f9a48661 /gtk2_ardour/audio_clock.cc
parent044a2cca8feca24f08726e20b97daca127919c1c (diff)
Re-expose timecode offset in the session option editor.
git-svn-id: svn://localhost/ardour2/branches/3.0@8146 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/audio_clock.cc')
-rw-r--r--gtk2_ardour/audio_clock.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index d80e7e5b30..1c36391bb6 100644
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -216,8 +216,6 @@ AudioClock::AudioClock (const string& clock_name, bool transient, const string&
clock_base.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::SCROLL_MASK);
clock_base.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &AudioClock::field_button_release_event), Timecode_Hours));
- Session::TimecodeOffsetChanged.connect (_session_connections, invalidator (*this), boost::bind (&AudioClock::timecode_offset_changed, this), gui_context());
-
if (editable) {
setup_events ();
}
@@ -475,8 +473,12 @@ AudioClock::set (nframes_t when, bool force, nframes_t offset, char which)
}
void
-AudioClock::timecode_offset_changed ()
+AudioClock::session_configuration_changed (std::string p)
{
+ if (p != "timecode-offset" && p != "timecode-offset-negative") {
+ return;
+ }
+
nframes_t current;
switch (_mode) {
@@ -697,6 +699,8 @@ AudioClock::set_session (Session *s)
if (_session) {
+ _session->config.ParameterChanged.connect (_session_connections, invalidator (*this), boost::bind (&AudioClock::session_configuration_changed, this, _1), gui_context());
+
XMLProperty* prop;
XMLNode* node = _session->extra_xml (X_("ClockModes"));
AudioClock::Mode amode;