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 34096e50f33e0feab05bb4b8e83a8a039e6e81fe..bf5f3af5bbd22775b0a2ef4a9134ae6bfaf2a031 100644 (file)
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 #include "sndfile_content.h"
 #include "sndfile_decoder.h"
 #include "sndfile_examiner.h"
+#include "audio_content.h"
 #include "film.h"
 #include "compose.hpp"
 #include "job.h"
@@ -27,34 +28,49 @@
 #include "safe_stringstream.h"
 #include "raw_convert.h"
 #include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
+#include <iostream>
 
 #include "i18n.h"
 
 using std::string;
 using std::cout;
+using std::vector;
 using boost::shared_ptr;
 
 SndfileContent::SndfileContent (shared_ptr<const Film> film, boost::filesystem::path p)
        : Content (film, p)
-       , SingleStreamAudioContent (film, p)
 {
-
+       audio.reset (new AudioContent (this, film));
 }
 
 SndfileContent::SndfileContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
        : Content (film, node)
-       , SingleStreamAudioContent (film, node, version)
        , _audio_length (node->number_child<Frame> ("AudioLength"))
 {
-
+       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);
-       SingleStreamAudioContent::as_xml (node);
+
+       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 ()));
 }
 
@@ -70,7 +86,7 @@ string
 SndfileContent::technical_summary () const
 {
        return Content::technical_summary() + " - "
-               + AudioContent::technical_summary ()
+               + audio->technical_summary ()
                + " - sndfile";
 }
 
@@ -80,7 +96,7 @@ SndfileContent::valid_file (boost::filesystem::path f)
        /* XXX: more extensions */
        string ext = f.extension().string();
        transform (ext.begin(), ext.end(), ext.begin(), ::tolower);
-       return (ext == ".wav" || ext == ".aif" || ext == ".aiff");
+       return (ext == ".wav" || ext == ".w64" || ext == ".flac" || ext == ".aif" || ext == ".aiff");
 }
 
 void
@@ -88,24 +104,24 @@ 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);
-}
-
-void
-SndfileContent::take_from_audio_examiner (shared_ptr<AudioExaminer> examiner)
-{
-       SingleStreamAudioContent::take_from_audio_examiner (examiner);
-
-       boost::mutex::scoped_lock lm (_mutex);
-       _audio_length = examiner->audio_length ();
+       shared_ptr<AudioExaminer> ex (new SndfileExaminer (shared_from_this ()));
+
+       {
+               boost::mutex::scoped_lock lm (_mutex);
+               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 = ex->audio_length ();
+       }
+
+       signal_changed (AudioContentProperty::STREAMS);
 }
 
 DCPTime
 SndfileContent::full_length () const
 {
-       shared_ptr<const Film> film = _film.lock ();
-       DCPOMATIC_ASSERT (film);
-       FrameRateChange const frc = film->active_frame_rate_change (position ());
-       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_length() / frc.speed_up, audio->stream()->frame_rate ());
 }