More noncopyable.

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

diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index 210ca15779980d6970d79eebf61d801ca973cdb7..2dd7d8f67648b5b97a067cb9ea17484aa64d3614 100644 (file)
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -31,9 +31,9 @@ using std::cout;
 using boost::shared_ptr;
 using boost::lexical_cast;
 
-SndfileContent::SndfileContent (boost::filesystem::path f)
-       : Content (f)
-       , AudioContent (f)
+SndfileContent::SndfileContent (shared_ptr<const Film> f, boost::filesystem::path p)
+       : Content (f, p)
+       , AudioContent (f, p)
        , _audio_channels (0)
        , _audio_length (0)
        , _audio_frame_rate (0)
@@ -41,13 +41,14 @@ SndfileContent::SndfileContent (boost::filesystem::path f)
 
 }
 
-SndfileContent::SndfileContent (shared_ptr<const cxml::Node> node)
-       : Content (node)
-       , AudioContent (node)
+SndfileContent::SndfileContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node)
+       : Content (f, node)
+       , AudioContent (f, node)
 {
        _audio_channels = node->number_child<int> ("AudioChannels");
-       _audio_length = node->number_child<ContentAudioFrame> ("AudioLength");
+       _audio_length = node->number_child<AudioContent::Frame> ("AudioLength");
        _audio_frame_rate = node->number_child<int> ("AudioFrameRate");
+       _audio_mapping = AudioMapping (node->node_child ("AudioMapping"));
 }
 
 string
@@ -84,17 +85,14 @@ SndfileContent::valid_file (boost::filesystem::path f)
        return (ext == ".wav" || ext == ".aif" || ext == ".aiff");
 }
 
-shared_ptr<Content>
-SndfileContent::clone () const
-{
-       return shared_ptr<Content> (new SndfileContent (*this));
-}
-
 void
-SndfileContent::examine (shared_ptr<Film> film, shared_ptr<Job> job, bool quick)
+SndfileContent::examine (shared_ptr<Job> job)
 {
        job->set_progress_unknown ();
-       Content::examine (film, job, quick);
+       Content::examine (job);
+
+       shared_ptr<const Film> film = _film.lock ();
+       assert (film);
 
        SndfileDecoder dec (film, shared_from_this());
 
@@ -108,6 +106,10 @@ SndfileContent::examine (shared_ptr<Film> film, shared_ptr<Job> job, bool quick)
        signal_changed (AudioContentProperty::AUDIO_CHANNELS);
        signal_changed (AudioContentProperty::AUDIO_LENGTH);
        signal_changed (AudioContentProperty::AUDIO_FRAME_RATE);
+
+       /* XXX: do this in signal_changed...? */
+       _audio_mapping = AudioMapping (_audio_channels);
+       signal_changed (AudioContentProperty::AUDIO_MAPPING);
 }
 
 void
@@ -115,20 +117,38 @@ SndfileContent::as_xml (xmlpp::Node* node) const
 {
        node->add_child("Type")->add_child_text ("Sndfile");
        Content::as_xml (node);
+       AudioContent::as_xml (node);
        node->add_child("AudioChannels")->add_child_text (lexical_cast<string> (_audio_channels));
        node->add_child("AudioLength")->add_child_text (lexical_cast<string> (_audio_length));
        node->add_child("AudioFrameRate")->add_child_text (lexical_cast<string> (_audio_frame_rate));
+       _audio_mapping.as_xml (node->add_child("AudioMapping"));
+}
+
+Time
+SndfileContent::length () const
+{
+       shared_ptr<const Film> film = _film.lock ();
+       assert (film);
+       
+       return film->audio_frames_to_time (audio_length ());
 }
 
 int
-SndfileContent::output_audio_frame_rate (shared_ptr<const Film>) const
+SndfileContent::output_audio_frame_rate () const
 {
-       /* Resample to a DCI-approved sample rate */
-       return dcp_audio_frame_rate (content_audio_frame_rate ());
+       shared_ptr<const Film> film = _film.lock ();
+       assert (film);
+       
+       return film->dcp_audio_frame_rate ();
 }
 
-Time
-SndfileContent::length (shared_ptr<const Film> film) const
+void
+SndfileContent::set_audio_mapping (AudioMapping m)
 {
-       return film->audio_frames_to_time (audio_length ());
+       {
+               boost::mutex::scoped_lock lm (_mutex);
+               _audio_mapping = m;
+       }
+
+       signal_changed (AudioContentProperty::AUDIO_MAPPING);
 }