diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-16 12:11:17 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-16 12:11:17 +0100 |
| commit | 05ef423e0fa4c1730c70770ff9528ee45f70e064 (patch) | |
| tree | a0ef5129e73e93e7ac59c6c76d782cd4d9d4ec85 /src/lib | |
| parent | 4421884e04945a5251f37e892386a5f1d32d8881 (diff) | |
Rename Film::player to reflect the fact that it creates a new Player on each call.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/film.cc | 2 | ||||
| -rw-r--r-- | src/lib/film.h | 2 | ||||
| -rw-r--r-- | src/lib/transcoder.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index d216e303f..eb86775e0 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -706,7 +706,7 @@ Film::have_dcp () const } shared_ptr<Player> -Film::player () const +Film::make_player () const { return shared_ptr<Player> (new Player (shared_from_this (), _playlist)); } diff --git a/src/lib/film.h b/src/lib/film.h index bf89c6f2c..24c43419a 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -98,7 +98,7 @@ public: bool have_dcp () const; - boost::shared_ptr<Player> player () const; + boost::shared_ptr<Player> make_player () const; boost::shared_ptr<Playlist> playlist () const; OutputAudioFrame dcp_audio_frame_rate () const; diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc index f4a52639a..7022965bd 100644 --- a/src/lib/transcoder.cc +++ b/src/lib/transcoder.cc @@ -64,7 +64,7 @@ audio_proxy (weak_ptr<Encoder> encoder, shared_ptr<const AudioBuffers> audio) */ Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j) : _job (j) - , _player (f->player ()) + , _player (f->make_player ()) , _encoder (new Encoder (f, j)) { _player->Video.connect (bind (video_proxy, _encoder, _1, _2)); |