Cope better with the butler thread throwing an exception; give up

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

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index e2bbca98e2fa2ff879dc5c3644f406231025f8fe..21ef60b79d754609ba7256d5d1a8519bfb2a2f7a 100644 (file)
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -51,14 +51,14 @@ using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 
 /** Construct a transcoder.
- *  @param f Film that we are transcoding.
- *  @param j Job that this transcoder is being used in.
+ *  @param film Film that we are transcoding.
+ *  @param job Job that this transcoder is being used in.
  */
-Transcoder::Transcoder (shared_ptr<const Film> film, weak_ptr<Job> j)
+Transcoder::Transcoder (shared_ptr<const Film> film, weak_ptr<Job> job)
        : _film (film)
-       , _job (j)
+       , _job (job)
        , _player (new Player (film, film->playlist ()))
-       , _writer (new Writer (film, j))
+       , _writer (new Writer (film, job))
        , _encoder (new Encoder (film, _writer))
        , _finishing (false)
        , _non_burnt_subtitles (false)
@@ -115,7 +115,6 @@ Transcoder::video (shared_ptr<PlayerVideo> data, DCPTime time)
 void
 Transcoder::audio (shared_ptr<AudioBuffers> data, DCPTime time)
 {
-       cout << "tx receives " << data->frames() << " @ " << to_string(time) << "\n";
        _writer->write (data);
 
        shared_ptr<Job> job = _job.lock ();