summaryrefslogtreecommitdiff
path: root/src/lib/audio_decoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-11-17 22:06:12 +0000
committerCarl Hetherington <cth@carlh.net>2012-11-17 22:06:12 +0000
commitcafa76a2b52449ce3c9eecfd0ea53b7318814951 (patch)
tree81fe66f74256a54eb50f398790f2eea010bb3113 /src/lib/audio_decoder.h
parent40532d61ea4909b3f8b12dd7024de217dbdfec6d (diff)
Another attempt to do external audio moderately nicely.
Diffstat (limited to 'src/lib/audio_decoder.h')
-rw-r--r--src/lib/audio_decoder.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 6e89f6144..e9fbd6f62 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -29,19 +29,19 @@ class AudioDecoder : public AudioSource, public virtual Decoder
public:
AudioDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *);
- virtual void set_audio_stream (boost::optional<AudioStream>);
+ virtual void set_audio_stream (boost::shared_ptr<AudioStream>);
- boost::optional<AudioStream> audio_stream () const {
+ boost::shared_ptr<AudioStream> audio_stream () const {
return _audio_stream;
}
- std::vector<AudioStream> audio_streams () const {
+ std::vector<boost::shared_ptr<AudioStream> > audio_streams () const {
return _audio_streams;
}
protected:
- boost::optional<AudioStream> _audio_stream;
- std::vector<AudioStream> _audio_streams;
+ boost::shared_ptr<AudioStream> _audio_stream;
+ std::vector<boost::shared_ptr<AudioStream> > _audio_streams;
};
#endif