diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-12-09 14:55:47 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-12-09 14:55:47 +0000 |
| commit | 01d0c14f03698d25af51f7d1a1b3112958da1cf3 (patch) | |
| tree | acd60313b4decc3c6a5088e879ee9e08d9981a38 /src/lib | |
| parent | b30d41f0dd8d7e1efb8f5557cf503c35a7d309b2 (diff) | |
Remove unused variable.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/encoder.cc | 3 | ||||
| -rw-r--r-- | src/lib/encoder.h | 3 | ||||
| -rw-r--r-- | src/lib/transcoder.cc | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index 451a5a31a..00d6e6399 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -56,9 +56,8 @@ using dcp::Data; int const Encoder::_history_size = 25; /** @param f Film that we are encoding */ -Encoder::Encoder (shared_ptr<const Film> film, weak_ptr<Job> j, shared_ptr<Writer> writer) +Encoder::Encoder (shared_ptr<const Film> film, shared_ptr<Writer> writer) : _film (film) - , _job (j) , _position (0) , _terminate_enqueue (false) , _terminate_encoding (false) diff --git a/src/lib/encoder.h b/src/lib/encoder.h index 3d0597cfa..d5b1455d7 100644 --- a/src/lib/encoder.h +++ b/src/lib/encoder.h @@ -53,7 +53,7 @@ class PlayerVideo; class Encoder : public boost::noncopyable, public ExceptionStore { public: - Encoder (boost::shared_ptr<const Film>, boost::weak_ptr<Job>, boost::shared_ptr<Writer>); + Encoder (boost::shared_ptr<const Film>, boost::shared_ptr<Writer>); virtual ~Encoder (); /** Called to indicate that a processing run is about to begin */ @@ -81,7 +81,6 @@ private: /** Film that we are encoding */ boost::shared_ptr<const Film> _film; - boost::weak_ptr<Job> _job; /** Mutex for _time_history and _video_frames_enqueued */ mutable boost::mutex _state_mutex; diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc index 7eb3883ff..c018c9243 100644 --- a/src/lib/transcoder.cc +++ b/src/lib/transcoder.cc @@ -54,7 +54,7 @@ Transcoder::Transcoder (shared_ptr<const Film> film, shared_ptr<Job> j) : _film (film) , _player (new Player (film, film->playlist ())) , _writer (new Writer (film, j)) - , _encoder (new Encoder (film, j, _writer)) + , _encoder (new Encoder (film, _writer)) , _finishing (false) { |