correctly manage video sync state (2.0 branch)

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@1845 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 77a3f175c545809fb22d3400fe1daaa1948143f3..66b38e72d33af8f8001652caadda47c723d091f2 100644 (file)
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -2857,7 +2857,6 @@ Session::source_by_path_and_channel (const Glib::ustring& path, uint16_t chn)
        Glib::Mutex::Lock lm (audio_source_lock);
 
        for (AudioSourceList::iterator i = audio_sources.begin(); i != audio_sources.end(); ++i) {
-               cerr << "comparing " << path << " with " << i->second->name() << endl;
                boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource>(i->second);
 
                if (afs && afs->path() == path && chn == afs->channel()) {

diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index b4998663951d99a37d219a8e279cccec1cf89ee4..937fd78daf69854ad771932f5639b79f4bd9c203 100644 (file)
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -3157,11 +3157,7 @@ Session::config_changed (const char* parameter_name)
 
        } else if (PARAM_IS ("use-video-sync")) {
 
-               if (transport_stopped()) {
-                       if (Config->get_use_video_sync()) {
-                               waiting_for_sync_offset = true;
-                       }
-               }
+               waiting_for_sync_offset = Config->get_use_video_sync();
 
        } else if (PARAM_IS ("mmc-control")) {