summaryrefslogtreecommitdiff
path: root/src/lib/util.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-07-04 22:29:47 +0100
committerCarl Hetherington <cth@carlh.net>2013-07-04 22:29:47 +0100
commitaabf54736d7401437af7f066c51fee91be64e809 (patch)
tree5e3b5f6993a157fcbe75a6f37a12a603e1d9fb25 /src/lib/util.h
parent6d7b419d42aa8a5df91836dee3c4b3b7a8849bf8 (diff)
Pad silence for things that already have at least some audio.
Diffstat (limited to 'src/lib/util.h')
-rw-r--r--src/lib/util.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/util.h b/src/lib/util.h
index 0d745e50c..c9e5bef16 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -50,6 +50,7 @@ extern "C" {
#define MAX_AUDIO_CHANNELS 6
class Scaler;
+class Film;
extern std::string seconds_to_hms (int);
extern std::string seconds_to_approximate_hms (int);
@@ -287,14 +288,17 @@ private:
class AudioMapping
{
public:
- AudioMapping (int);
+ AudioMapping (boost::shared_ptr<const Film>);
boost::optional<libdcp::Channel> source_to_dcp (int c) const;
boost::optional<int> dcp_to_source (libdcp::Channel c) const;
+
+ int minimum_dcp_channels () const;
int dcp_channels () const;
private:
int _source_channels;
+ int _minimum_channels;
};
extern int64_t video_frames_to_audio_frames (SourceFrame v, float audio_sample_rate, float frames_per_second);