Fix awful thinko causing Playlist::active_frame_rate_change to return the wrong thing...

diff --git a/ChangeLog b/ChangeLog
index e6bc2126cfc0dab5a0d238802da64ac2f48ec0d0..d0f8d7b3d97b65d82e062d8fd4d0ce2ce1edb9b1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-18  Carl Hetherington  <cth@carlh.net>
+
+       * Fix thinko causing incorrect audio sample rates in some cases.
+
 2014-06-15  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.69.28 released.

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 247c4837bba86b7d780e10766c78fd58e1a7c98b..dc87fbfabb31702a2c18f4c4bd5469f15e6b71e7 100644 (file)
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -404,7 +404,7 @@ Playlist::active_frame_rate_change (Time t, int dcp_video_frame_rate) const
        for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
                shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (*i);
                if (!vc) {
-                       break;
+                       continue;
                }
 
                if (vc->position() >= t && t < vc->end()) {