summaryrefslogtreecommitdiff
path: root/src/lib/audio_decoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-01-03 23:18:47 +0000
committerCarl Hetherington <cth@carlh.net>2014-01-03 23:18:47 +0000
commitd7b23d44dec9d6357619e8e009e564e475215470 (patch)
tree0ac5251fbbe5c55da24499eb5c7b4194f90365bf /src/lib/audio_decoder.h
parentf0e95aa5b7ada81a1c40f06facab2e94e45ab26c (diff)
Various attempted fixes to audio sync.
Diffstat (limited to 'src/lib/audio_decoder.h')
-rw-r--r--src/lib/audio_decoder.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 12f8505f6..bb3aafccd 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -48,13 +48,12 @@ public:
protected:
- virtual ContentTime first_audio () const = 0;
- void audio (boost::shared_ptr<const AudioBuffers>);
+ void audio (boost::shared_ptr<const AudioBuffers>, ContentTime);
void flush ();
boost::shared_ptr<const AudioContent> _audio_content;
boost::shared_ptr<Resampler> _resampler;
- AudioFrame _audio_position;
+ boost::optional<AudioFrame> _audio_position;
};
#endif