Build fixes for OS X.

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

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 4d3f29e83010b13ef39100f1f5f6c9cc3bb327c4..48cf402d77bac4f36ababbac36adff4fb880d5e9 100644 (file)
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -56,7 +56,7 @@ Transcoder::Transcoder (shared_ptr<Film> f, DecodeOptions o, Job* j, shared_ptr<
        assert (_encoder);
 
        shared_ptr<AudioStream> st = f->audio_stream();
-       if (st) {
+       if (st && st->sample_rate ()) {
                _matcher.reset (new Matcher (f->log(), st->sample_rate(), f->source_frame_rate()));
        }
        _delay_line.reset (new DelayLine (f->log(), f->audio_delay() / 1000.0f));
@@ -103,31 +103,26 @@ void
 Transcoder::go ()
 {
        _encoder->process_begin ();
-       try {
-               bool done[2] = { false, false };
-               
-               while (1) {
-                       if (!done[0]) {
-                               done[0] = _decoders.video->pass ();
-                               if (_job) {
-                                       _decoders.video->set_progress (_job);
-                               }
-                       }
-
-                       if (!done[1] && _decoders.audio && dynamic_pointer_cast<Decoder> (_decoders.audio) != dynamic_pointer_cast<Decoder> (_decoders.video)) {
-                               done[1] = _decoders.audio->pass ();
-                       } else {
-                               done[1] = true;
-                       }
 
-                       if (done[0] && done[1]) {
-                               break;
+       bool done[2] = { false, false };
+       
+       while (1) {
+               if (!done[0]) {
+                       done[0] = _decoders.video->pass ();
+                       if (_job) {
+                               _decoders.video->set_progress (_job);
                        }
                }
                
-       } catch (...) {
-               _encoder->process_end ();
-               throw;
+               if (!done[1] && _decoders.audio && dynamic_pointer_cast<Decoder> (_decoders.audio) != dynamic_pointer_cast<Decoder> (_decoders.video)) {
+                       done[1] = _decoders.audio->pass ();
+               } else {
+                       done[1] = true;
+               }
+               
+               if (done[0] && done[1]) {
+                       break;
+               }
        }
        
        _delay_line->process_end ();