diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-03-01 11:36:17 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-04-19 23:04:32 +0100 |
| commit | dc78a40b0c7ce4569874fd1e77a86df907937d50 (patch) | |
| tree | 3167c3a9f047d3b5af1c5aefc7b8640f4adbf4d9 /src/lib/player.h | |
| parent | 20fb703d5298c0376f1fe7c724cdc9625172e4d0 (diff) | |
Restore upmixer_a_test and fix resampler flushing.
Diffstat (limited to 'src/lib/player.h')
| -rw-r--r-- | src/lib/player.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/player.h b/src/lib/player.h index c10f7adaa..dd7c5dfa1 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -106,10 +106,12 @@ private: void audio (boost::weak_ptr<Piece>, AudioStreamPtr, ContentAudio); void image_subtitle (boost::weak_ptr<Piece>, ContentImageSubtitle); void text_subtitle (boost::weak_ptr<Piece>, ContentTextSubtitle); - boost::shared_ptr<Resampler> resampler (boost::shared_ptr<const AudioContent> content, AudioStreamPtr stream, bool create); + boost::shared_ptr<Resampler> resampler (boost::shared_ptr<const AudioContent> content, AudioStreamPtr stream); DCPTime one_video_frame () const; void fill_video (DCPTimePeriod period); void fill_audio (DCPTimePeriod period); + void audio_flush (boost::shared_ptr<Piece>, AudioStreamPtr stream); + void audio_transform (boost::shared_ptr<AudioContent> content, AudioStreamPtr stream, ContentAudio content_audio, DCPTime time); boost::shared_ptr<const Film> _film; boost::shared_ptr<const Playlist> _playlist; |
