summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_content.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-05-20 16:21:55 +0100
committerCarl Hetherington <cth@carlh.net>2013-05-20 16:21:55 +0100
commit0c66eaeac227d6aeb63a7a36e202ef87081dc222 (patch)
treefe59970e8ca5d6bfc7859fa6f901b1f1ed04eb33 /src/lib/ffmpeg_content.h
parent56aa7eef1572e48c96ff198ee52a5a5fe17a6bf0 (diff)
Some basics of AudioMapping.
Diffstat (limited to 'src/lib/ffmpeg_content.h')
-rw-r--r--src/lib/ffmpeg_content.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 540df041f..d26c73125 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -1,3 +1,5 @@
+/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
+
/*
Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
@@ -32,6 +34,7 @@ public:
, id (i)
, frame_rate (f)
, channels (c)
+ , mapping (c)
{}
FFmpegAudioStream (boost::shared_ptr<const cxml::Node>);
@@ -42,6 +45,7 @@ public:
int id;
int frame_rate;
int channels;
+ AudioMapping mapping;
};
extern bool operator== (FFmpegAudioStream const & a, FFmpegAudioStream const & b);
@@ -96,6 +100,7 @@ public:
ContentAudioFrame audio_length () const;
int content_audio_frame_rate () const;
int output_audio_frame_rate (boost::shared_ptr<const Film>) const;
+ AudioMapping audio_mapping () const;
std::vector<FFmpegSubtitleStream> subtitle_streams () const {
boost::mutex::scoped_lock lm (_mutex);