summaryrefslogtreecommitdiff
path: root/src/lib/audio_content.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-11-21 01:59:04 +0000
committerCarl Hetherington <cth@carlh.net>2018-11-21 01:59:04 +0000
commit254b3044d72de6b033d7c584f5abd2b9aa70aad5 (patch)
tree8a5c83c1b2dea690672663dedb2f3aa50f4473dc /src/lib/audio_content.h
parentc31b9542c58ae1cbfae7ec3ba4911359fd010ba2 (diff)
Take Film pointer out of Content.
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 eec67b201..051fc8db8 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -52,7 +52,7 @@ public:
AudioMapping mapping () const;
void set_mapping (AudioMapping);
- int resampled_frame_rate () const;
+ int resampled_frame_rate (boost::shared_ptr<const Film> film) const;
bool has_rate_above_48k () const;
std::vector<std::string> channel_names () const;
@@ -69,7 +69,7 @@ public:
return _delay;
}
- std::string processing_description () const;
+ std::string processing_description (boost::shared_ptr<const Film> film) const;
std::vector<AudioStreamPtr> streams () const {
boost::mutex::scoped_lock lm (_mutex);
@@ -81,9 +81,9 @@ public:
void set_streams (std::vector<AudioStreamPtr> streams);
AudioStreamPtr stream () const;
- void add_properties (std::list<UserProperty> &) const;
+ void add_properties (boost::shared_ptr<const Film> film, std::list<UserProperty> &) const;
- void modify_position (DCPTime& pos) const;
+ void modify_position (boost::shared_ptr<const Film> film, DCPTime& pos) const;
void modify_trim_start (ContentTime& pos) const;
static boost::shared_ptr<AudioContent> from_xml (Content* parent, cxml::ConstNodePtr, int version);