summaryrefslogtreecommitdiff
path: root/libs/ardour/session_transport.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 /libs/ardour/session_transport.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 'libs/ardour/session_transport.cc')
-rw-r--r--libs/ardour/session_transport.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index bc4ef8decc..946d3ea890 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -1281,6 +1281,10 @@ Session::switch_to_sync_source (SyncSource src)
return;
}
+ if (config.get_video_pullup() != 0.0f) {
+ return;
+ }
+
new_slave = new JACK_Slave (_engine.jack());
break;