diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-17 16:08:43 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-17 16:08:43 +0100 |
| commit | a193afb89de3e335612e07a3fbec3e4095f14f98 (patch) | |
| tree | d794f6f94dfe5506086729fe5ccd55e4f782bfa9 /src/lib | |
| parent | c13757391e75cdde7a9cef947c921b7a9ad08003 (diff) | |
Remove Film::make_player().
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/film.cc | 6 | ||||
| -rw-r--r-- | src/lib/film.h | 1 | ||||
| -rw-r--r-- | src/lib/transcoder.cc | 2 |
3 files changed, 1 insertions, 8 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index d650fa3d3..a0caade8e 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -895,12 +895,6 @@ Film::cpls () const return out; } -shared_ptr<Player> -Film::make_player () const -{ - return shared_ptr<Player> (new Player (shared_from_this ())); -} - void Film::set_signed (bool s) { diff --git a/src/lib/film.h b/src/lib/film.h index fb75504a2..ac25323b9 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -101,7 +101,6 @@ public: std::vector<CPLSummary> cpls () const; - boost::shared_ptr<Player> make_player () const; boost::shared_ptr<Playlist> playlist () const; int audio_frame_rate () const; diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc index 8aed20574..091da50f4 100644 --- a/src/lib/transcoder.cc +++ b/src/lib/transcoder.cc @@ -48,7 +48,7 @@ using boost::dynamic_pointer_cast; */ Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j) : _film (f) - , _player (f->make_player ()) + , _player (new Player (f)) , _writer (new Writer (f, j)) , _encoder (new Encoder (f, j, _writer)) , _finishing (false) |