summaryrefslogtreecommitdiff
path: root/src/lib/audio_content.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-05-23 17:18:49 +0100
committerCarl Hetherington <cth@carlh.net>2013-05-23 17:18:49 +0100
commit64a2f1bb6a7b972607fa363631ef7a47444e8217 (patch)
tree020c028a93f113e372e70f485857ce04dea5db3d /src/lib/audio_content.h
parent8c6fe8e1e8c8f6d5932606f2a5b6e1b87681ae38 (diff)
Various bits and pieces.
Diffstat (limited to 'src/lib/audio_content.h')
-rw-r--r--src/lib/audio_content.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index e767fd326..0c5287eaf 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -42,9 +42,9 @@ public:
class AudioContent : public virtual Content
{
public:
- AudioContent (Time);
- AudioContent (boost::filesystem::path);
- AudioContent (boost::shared_ptr<const cxml::Node>);
+ AudioContent (boost::shared_ptr<const Film>, Time);
+ AudioContent (boost::shared_ptr<const Film>, boost::filesystem::path);
+ AudioContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
AudioContent (AudioContent const &);
void as_xml (xmlpp::Node *) const;
@@ -52,7 +52,7 @@ public:
virtual int audio_channels () const = 0;
virtual ContentAudioFrame audio_length () const = 0;
virtual int content_audio_frame_rate () const = 0;
- virtual int output_audio_frame_rate (boost::shared_ptr<const Film>) const = 0;
+ virtual int output_audio_frame_rate () const = 0;
virtual AudioMapping audio_mapping () const = 0;
void set_audio_gain (float);