diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-22 13:33:11 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-22 13:33:11 +0100 |
| commit | c0e04acd1e9875fa67800a7861bd8a370157b49f (patch) | |
| tree | 418dc2124d14c82fade43e3b47043f1ee69e331e /src/lib/examine_content_job.cc | |
| parent | 4cb33e432c7070f59c3ee3fbeb0b5c8755bba3bd (diff) | |
Fix crash on using delay; fix x-thread GUI access caused by FilmState default copy constructor copying its Changed signal's connections; fix up delay setup after film examine.
Diffstat (limited to 'src/lib/examine_content_job.cc')
| -rw-r--r-- | src/lib/examine_content_job.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc index d91fc2136..d12e06069 100644 --- a/src/lib/examine_content_job.cc +++ b/src/lib/examine_content_job.cc @@ -70,7 +70,6 @@ ExamineContentJob::run () _decoder->go (); fs->set_length (_decoder->last_video_frame ()); - fs->set_audio_delay (-_decoder->audio_to_discard ()); _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())); @@ -112,3 +111,10 @@ ExamineContentJob::last_video_frame () const { return _decoder->last_video_frame (); } + +int +ExamineContentJob::audio_to_discard () const +{ + return _decoder->audio_to_discard (); +} + |