Fix crash on using delay; fix x-thread GUI access caused by FilmState default copy...

[dcpomatic.git] / src / lib / examine_content_job.cc

diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc
index 44a9f4ce9c9a13148f24c8459cc76aecb12c06f7..d12e060691e61a08d876e764aedc1907761d895a 100644 (file)
--- a/src/lib/examine_content_job.cc
+++ b/src/lib/examine_content_job.cc
@@ -28,6 +28,7 @@
 #include "decoder.h"
 #include "imagemagick_encoder.h"
 #include "transcoder.h"
+#include "log.h"
 
 using namespace std;
 using namespace boost;
@@ -45,6 +46,10 @@ ExamineContentJob::~ExamineContentJob ()
 string
 ExamineContentJob::name () const
 {
+       if (_fs->name().empty ()) {
+               return "Examine content";
+       }
+       
        return String::compose ("Examine content of %1", _fs->name());
 }
 
@@ -63,7 +68,11 @@ ExamineContentJob::run ()
 
        _decoder = decoder_factory (fs, o, this, _log, true, true);
        _decoder->go ();
-       fs->set_length (last_video_frame ());
+
+       fs->set_length (_decoder->last_video_frame ());
+
+       _log->log (String::compose ("Video length is %1 frames", _decoder->last_video_frame()));
+       _log->log (String::compose ("%1ms of audio to discard", _decoder->audio_to_discard()));
 
        ascend ();
 
@@ -81,8 +90,6 @@ ExamineContentJob::run ()
                shared_ptr<ImageMagickEncoder> e (new ImageMagickEncoder (fs, o, _log));
                Transcoder w (fs, o, this, _log, e);
                w.go ();
-               set_progress (1);
-               set_state (FINISHED_OK);
                
        } catch (std::exception& e) {
 
@@ -90,6 +97,7 @@ ExamineContentJob::run ()
                set_progress (1);
                set_error (e.what ());
                set_state (FINISHED_ERROR);
+               return;
                
        }
 
@@ -103,3 +111,10 @@ ExamineContentJob::last_video_frame () const
 {
        return _decoder->last_video_frame ();
 }
+
+int
+ExamineContentJob::audio_to_discard () const
+{
+       return _decoder->audio_to_discard ();
+}
+