Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 46611bbedf2a7ae87ccc55898ac7c9a148d81f73..142996b100e881ff6cdbc1e48f1b7a89a471c3af 100644 (file)
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -153,7 +153,7 @@ VideoDecoder::emit (shared_ptr<const Film> film, shared_ptr<const ImageProxy> im
 void
 VideoDecoder::seek ()
 {
-       _position = ContentTime();
+       _position = boost::none;
        _last_emitted_frame.reset ();
        _last_emitted_eyes.reset ();
 }

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 98a8e7b7a259a9960f277b4c708217b0c911ebb1..820783b2e16d35120fdbfec952ad93aa1e41a24a 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -58,7 +58,6 @@ public:
        void seek ();
        void emit (boost::shared_ptr<const Film> film, boost::shared_ptr<const ImageProxy>, Frame frame);
 
-       /** @return true if the emitted data was accepted, false if not */
        boost::signals2::signal<void (ContentVideo)> Data;
 
 private:

diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index 892bc9e4c0909978f4c47be157cda4867badadde..e1e97dbc4b3e315090e8ccde89c23e6f70cb4c9d 100644 (file)
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -65,7 +65,6 @@ ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int
        film->examine_and_add_content (content);
        BOOST_REQUIRE (!wait_for_jobs());
        film->write_metadata ();
-       shared_ptr<Log> log (new NullLog);
        shared_ptr<Player> player (new Player (film, film->playlist()));
 
        BOOST_REQUIRE (content->video_frame_rate());

diff --git a/test/test.cc b/test/test.cc
index a9d3ed1c797e132dc317ea47dddae8038123045b..bf27c0cf162a674a16af305f6d052e635b900f38 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -35,6 +35,8 @@
 #include "lib/dcp_content_type.h"
 #include "lib/log_entry.h"
 #include "lib/compose.hpp"
+#include "lib/file_log.h"
+#include "lib/dcpomatic_log.h"
 #include "test.h"
 #include <dcp/dcp.h>
 #include <dcp/cpl.h>
@@ -113,6 +115,8 @@ struct TestConfig
                if (env_private) {
                        private_data = env_private;
                }
+
+               dcpomatic_log.reset (new FileLog("build/test/log"));
        }
 
        ~TestConfig ()