diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-05-10 15:06:19 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | 3db1df492e1009ee28641cdc593a139df156e8d7 (patch) | |
| tree | 7d86e74117a701515f381ee707d7699acab7b2dc /src/lib/dcp_content.cc | |
| parent | 4fe27489ad67267081d048b45a4df9ee37541fde (diff) | |
Store audio length in AudioStream.
Diffstat (limited to 'src/lib/dcp_content.cc')
| -rw-r--r-- | src/lib/dcp_content.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index dbd9bca8d..83374fc30 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -78,7 +78,11 @@ DCPContent::DCPContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, in audio->set_stream ( AudioStreamPtr ( - new AudioStream (node->number_child<int> ("AudioFrameRate"), AudioMapping (node->node_child ("AudioMapping"), version)) + new AudioStream ( + node->number_child<int> ("AudioFrameRate"), + node->number_child<Frame> ("AudioLength"), + AudioMapping (node->node_child ("AudioMapping"), version) + ) ) ); @@ -121,7 +125,7 @@ DCPContent::examine (shared_ptr<Job> job) { boost::mutex::scoped_lock lm (_mutex); - AudioStreamPtr as (new AudioStream (examiner->audio_frame_rate(), examiner->audio_channels ())); + AudioStreamPtr as (new AudioStream (examiner->audio_frame_rate(), examiner->audio_length(), examiner->audio_channels())); audio->set_stream (as); AudioMapping m = as->mapping (); film()->make_audio_mapping_default (m); @@ -174,6 +178,7 @@ DCPContent::as_xml (xmlpp::Node* node) const if (audio) { audio->as_xml (node); node->add_child("AudioFrameRate")->add_child_text (raw_convert<string> (audio->stream()->frame_rate())); + node->add_child("AudioLength")->add_child_text (raw_convert<string> (audio->stream()->length())); audio->stream()->mapping().as_xml (node->add_child("AudioMapping")); } |