summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_content.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-05-20 17:18:35 +0100
committerCarl Hetherington <cth@carlh.net>2013-05-20 17:18:35 +0100
commit2de990b0155fcb5c3dac821ef8c2659e903d2f6e (patch)
tree11cb6b7cc0f30c58dfd1e62f8a76f906d6b216b4 /src/lib/ffmpeg_content.cc
parent0c66eaeac227d6aeb63a7a36e202ef87081dc222 (diff)
Various incomplete hacks on regions / audio mapping.
Diffstat (limited to 'src/lib/ffmpeg_content.cc')
-rw-r--r--src/lib/ffmpeg_content.cc12
1 files changed, 0 insertions, 12 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index d730f3ecb..e898c02d0 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -266,7 +266,6 @@ operator== (FFmpegAudioStream const & a, FFmpegAudioStream const & b)
}
FFmpegAudioStream::FFmpegAudioStream (shared_ptr<const cxml::Node> node)
- : mapping (node->node_child ("Mapping"))
{
name = node->string_child ("Name");
id = node->number_child<int> ("Id");
@@ -281,7 +280,6 @@ FFmpegAudioStream::as_xml (xmlpp::Node* root) const
root->add_child("Id")->add_child_text (lexical_cast<string> (id));
root->add_child("FrameRate")->add_child_text (lexical_cast<string> (frame_rate));
root->add_child("Channels")->add_child_text (lexical_cast<string> (channels));
- mapping.as_xml (root->add_child("Mapping"));
}
/** Construct a SubtitleStream from a value returned from to_string().
@@ -313,13 +311,3 @@ FFmpegContent::length (shared_ptr<const Film> film) const
FrameRateConversion frc (video_frame_rate (), film->dcp_video_frame_rate ());
return video_length() * frc.factor() * TIME_HZ / film->dcp_video_frame_rate ();
}
-
-AudioMapping
-FFmpegContent::audio_mapping () const
-{
- if (!_audio_stream) {
- return AudioMapping ();
- }
-
- return _audio_stream->mapping;
-}