summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-07-07 21:00:47 +0000
committerDavid Robillard <d@drobilla.net>2012-07-07 21:00:47 +0000
commit39b42e376611cfe42e230640a404dce26266e8c9 (patch)
tree980c074458506c1db7c1ddb999719e8ee1b036bd /libs
parentf110126fcab5419d5004ad497f2e6f39a2f18969 (diff)
Fix Jack transport master after session load.
Transport master was not being taken because when the configuration variable is set, AudioEngine::set_session() has not been called yet so AudioEngine::reset_timebase() did nothing (the transport stuff at the beginning of Session::when_engine_running() is questionable for the same reasons). I am not sure if this is correct, but I have failed to more thoroughly figure out the issue. At least Ardour actually sets Jack transport information now. However, there are some discrepancies between Ardour time and Jack time, as reported by Session::jack_timebase_callback(). Perhaps related, the transport master menu item does not restore correctly. Previous to this commit, the only way to make a loaded session take transport master was to "set" this out of sync item (which did nothing), then unset it, then set it again, which would finally actually cause the configuration change. git-svn-id: svn://localhost/ardour2/branches/3.0@12992 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/session.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index fab877cf0b..47f39d96b7 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -574,6 +574,7 @@ Session::when_engine_running ()
BootMessage (_("Connect to engine"));
_engine.set_session (this);
+ _engine.reset_timebase ();
}
void