Remove unnecessary Film variable in ContentPart.

[dcpomatic.git] / src / lib / sndfile_content.cc

diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index a51a7be1d1969a3b1bbb494ef4038c80e5e8f577..aa31f52c0aafe4cb09d16d4e97d05f536ef020d3 100644 (file)
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -41,29 +41,40 @@ using boost::shared_ptr;
 SndfileContent::SndfileContent (shared_ptr<const Film> film, boost::filesystem::path p)
        : Content (film, p)
 {
-       audio.reset (new AudioContent (this, film));
+       audio.reset (new AudioContent (this));
 }
 
 SndfileContent::SndfileContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
        : Content (film, node)
-       , _audio_length (node->number_child<Frame> ("AudioLength"))
 {
-       audio.reset (new AudioContent (this, film, node));
-       audio->set_stream (
-               AudioStreamPtr (
-                       new AudioStream (node->number_child<int> ("AudioFrameRate"), AudioMapping (node->node_child ("AudioMapping"), version)))
-               );
+       audio = AudioContent::from_xml (this, node);
+
+       if (audio) {
+               audio->set_stream (
+                       AudioStreamPtr (
+                               new AudioStream (
+                                       node->number_child<int> ("AudioFrameRate"),
+                                       node->number_child<Frame> ("AudioLength"),
+                                       AudioMapping (node->node_child ("AudioMapping"), version)
+                                       )
+                               )
+                       );
+       }
 }
 
 void
 SndfileContent::as_xml (xmlpp::Node* node) const
 {
        node->add_child("Type")->add_child_text ("Sndfile");
+
        Content::as_xml (node);
-       audio->as_xml (node);
-       node->add_child("AudioFrameRate")->add_child_text (raw_convert<string> (audio->stream()->frame_rate ()));
-       audio->stream()->mapping().as_xml (node->add_child("AudioMapping"));
-       node->add_child("AudioLength")->add_child_text (raw_convert<string> (audio_length ()));
+
+       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"));
+       }
 }
 
 
@@ -100,12 +111,11 @@ SndfileContent::examine (shared_ptr<Job> job)
 
        {
                boost::mutex::scoped_lock lm (_mutex);
-               AudioStreamPtr as (new AudioStream (ex->audio_frame_rate(), ex->audio_channels ()));
+               AudioStreamPtr as (new AudioStream (ex->audio_frame_rate(), ex->audio_length(), ex->audio_channels ()));
                audio->set_stream (as);
                AudioMapping m = as->mapping ();
                film()->make_audio_mapping_default (m);
                as->set_mapping (m);
-               _audio_length = ex->audio_length ();
        }
 
        signal_changed (AudioContentProperty::STREAMS);
@@ -114,6 +124,6 @@ SndfileContent::examine (shared_ptr<Job> job)
 DCPTime
 SndfileContent::full_length () const
 {
-       FrameRateChange const frc (audio->audio_video_frame_rate(), film->video_frame_rate());
-       return DCPTime::from_frames (audio_length() / frc.speed_up, audio->stream()->frame_rate ());
+       FrameRateChange const frc (active_video_frame_rate(), film()->video_frame_rate());
+       return DCPTime::from_frames (audio->stream()->length() / frc.speed_up, audio->stream()->frame_rate ());
 }