Merge master.

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

diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index 963abb58e0f63d3dc12e4f91859cc296a5b5f63f..2d7fa1c1cf9446e0a26cedf13db62bd911cc6df6 100644 (file)
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -1,7 +1,5 @@
-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 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
@@ -22,8 +20,10 @@
 #include <libcxml/cxml.h>
 #include "sndfile_content.h"
 #include "sndfile_decoder.h"
+#include "film.h"
 #include "compose.hpp"
 #include "job.h"
+#include "util.h"
 
 #include "i18n.h"
 
@@ -33,9 +33,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)
@@ -43,20 +43,29 @@ 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, int version)
+       : Content (f, node)
+       , AudioContent (f, node)
+       , _audio_mapping (node->node_child ("AudioMapping"), version)
 {
        _audio_channels = node->number_child<int> ("AudioChannels");
-       _audio_length = node->number_child<ContentAudioFrame> ("AudioLength");
+       _audio_length = ContentTime (node->number_child<int64_t> ("AudioLength"));
        _audio_frame_rate = node->number_child<int> ("AudioFrameRate");
-       _mapping = AudioMapping (node->node_child ("Mapping"));
 }
 
 string
 SndfileContent::summary () const
 {
-       return String::compose (_("Sound file: %1"), file().filename().string());
+       /* Get the string() here so that the name does not have quotes around it */
+       return String::compose (_("%1 [audio]"), path_summary ());
+}
+
+string
+SndfileContent::technical_summary () const
+{
+       return Content::technical_summary() + " - "
+               + AudioContent::technical_summary ()
+               + " - sndfile";
 }
 
 string
@@ -72,7 +81,7 @@ SndfileContent::information () const
                _("%1 channels, %2kHz, %3 samples"),
                audio_channels(),
                content_audio_frame_rate() / 1000.0,
-               audio_length()
+               audio_length().frames (content_audio_frame_rate ())
                );
        
        return s.str ();
@@ -87,31 +96,33 @@ 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);
 
-       SndfileDecoder dec (film, shared_from_this());
+       SndfileDecoder dec (shared_from_this());
 
        {
                boost::mutex::scoped_lock lm (_mutex);
                _audio_channels = dec.audio_channels ();
                _audio_length = dec.audio_length ();
                _audio_frame_rate = dec.audio_frame_rate ();
-               _mapping = AudioMapping (_audio_channels);
        }
 
        signal_changed (AudioContentProperty::AUDIO_CHANNELS);
        signal_changed (AudioContentProperty::AUDIO_LENGTH);
        signal_changed (AudioContentProperty::AUDIO_FRAME_RATE);
+
+       {
+               boost::mutex::scoped_lock lm (_mutex);
+               /* XXX: do this in signal_changed...? */
+               _audio_mapping = AudioMapping (_audio_channels);
+               _audio_mapping.make_default ();
+       }
+       
+       signal_changed (AudioContentProperty::AUDIO_MAPPING);
 }
 
 void
@@ -119,21 +130,39 @@ SndfileContent::as_xml (xmlpp::Node* node) const
 {
        node->add_child("Type")->add_child_text ("Sndfile");
        Content::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));
-       _mapping.as_xml (node->add_child("Mapping"));
+       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().get ()));
+       node->add_child("AudioFrameRate")->add_child_text (lexical_cast<string> (content_audio_frame_rate ()));
+       _audio_mapping.as_xml (node->add_child("AudioMapping"));
+}
+
+DCPTime
+SndfileContent::full_length () const
+{
+       shared_ptr<const Film> film = _film.lock ();
+       assert (film);
+       return DCPTime (audio_length(), film->active_frame_rate_change (position ()));
 }
 
 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->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);
 }
+