Some allowances for video/audio/subtitle possibly being null.

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

diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index ed7e67c3c5198bfa624772124ca03b9967364b8e..bf5f3af5bbd22775b0a2ef4a9134ae6bfaf2a031 100644 (file)
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -48,21 +48,29 @@ SndfileContent::SndfileContent (shared_ptr<const Film> film, cxml::ConstNodePtr
        : 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, film, node);
+
+       if (audio) {
+               audio->set_stream (
+                       AudioStreamPtr (
+                               new AudioStream (node->number_child<int> ("AudioFrameRate"), 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"));
+
+       if (audio) {
+               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 ()));
 }
 
@@ -96,21 +104,16 @@ SndfileContent::examine (shared_ptr<Job> job)
 {
        job->set_progress_unknown ();
        Content::examine (job);
-       shared_ptr<AudioExaminer> dec (new SndfileExaminer (shared_from_this ()));
-       take_from_audio_examiner (dec);
-}
+       shared_ptr<AudioExaminer> ex (new SndfileExaminer (shared_from_this ()));
 
-void
-SndfileContent::take_from_audio_examiner (shared_ptr<AudioExaminer> examiner)
-{
        {
                boost::mutex::scoped_lock lm (_mutex);
-               AudioStreamPtr as (new AudioStream (examiner->audio_frame_rate(), examiner->audio_channels ()));
+               AudioStreamPtr as (new AudioStream (ex->audio_frame_rate(), ex->audio_channels ()));
                audio->set_stream (as);
                AudioMapping m = as->mapping ();
                film()->make_audio_mapping_default (m);
                as->set_mapping (m);
-               _audio_length = examiner->audio_length ();
+               _audio_length = ex->audio_length ();
        }
 
        signal_changed (AudioContentProperty::STREAMS);
@@ -119,6 +122,6 @@ SndfileContent::take_from_audio_examiner (shared_ptr<AudioExaminer> examiner)
 DCPTime
 SndfileContent::full_length () const
 {
-       FrameRateChange const frc (audio->audio_video_frame_rate(), film->video_frame_rate());
+       FrameRateChange const frc (active_video_frame_rate(), film()->video_frame_rate());
        return DCPTime::from_frames (audio_length() / frc.speed_up, audio->stream()->frame_rate ());
 }