X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_decoder.h;h=d81a1c7c804eaef70e0444bc19c06c86c16ebcb1;hb=f10e025eba54b0ab4dbe1b3611071b160ca89208;hp=50e361e8f19f80cb181bc8a55d3e80f1aa73da8c;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;p=dcpomatic.git diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h index 50e361e8f..d81a1c7c8 100644 --- a/src/lib/audio_decoder.h +++ b/src/lib/audio_decoder.h @@ -47,12 +47,12 @@ class AudioDecoder : public boost::enable_shared_from_this, public public: AudioDecoder (Decoder* parent, boost::shared_ptr content, bool fast); - ContentTime position (boost::shared_ptr film) const; - void emit (boost::shared_ptr film, AudioStreamPtr stream, boost::shared_ptr, ContentTime); + boost::optional position (boost::shared_ptr film) const; + void emit (boost::shared_ptr film, AudioStreamPtr stream, boost::shared_ptr, dcpomatic::ContentTime); void seek (); void flush (); - ContentTime stream_position (boost::shared_ptr film, AudioStreamPtr stream) const; + dcpomatic::ContentTime stream_position (boost::shared_ptr film, AudioStreamPtr stream) const; /** @return Number of frames of data that were accepted */ boost::signals2::signal Data;