Keep signing certificates / keys in config.xml rather than on disk; allow configuration.

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

diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index e5491480fc7737065567ad931699c0cbc57c67aa..a573d43c407f8ac8a825190a1784600ba37ac873 100644 (file)
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -1,5 +1,5 @@
 /*
-    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
@@ -18,11 +18,13 @@
 */
 
 #include <libcxml/cxml.h>
+#include <dcp/raw_convert.h>
 #include "sndfile_content.h"
 #include "sndfile_decoder.h"
 #include "film.h"
 #include "compose.hpp"
 #include "job.h"
+#include "util.h"
 
 #include "i18n.h"
 
@@ -30,32 +32,44 @@ using std::string;
 using std::stringstream;
 using std::cout;
 using boost::shared_ptr;
-using boost::lexical_cast;
+using dcp::raw_convert;
 
 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)
+       , SingleStreamAudioContent (f, p)
 {
 
 }
 
-SndfileContent::SndfileContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node)
+SndfileContent::SndfileContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
        : Content (f, node)
-       , AudioContent (f, node)
-       , _audio_mapping (node->node_child ("AudioMapping"))
+       , SingleStreamAudioContent (f, node, version)
 {
-       _audio_channels = node->number_child<int> ("AudioChannels");
-       _audio_length = node->number_child<AudioContent::Frame> ("AudioLength");
-       _audio_frame_rate = node->number_child<int> ("AudioFrameRate");
+       
+}
+
+void
+SndfileContent::as_xml (xmlpp::Node* node) const
+{
+       node->add_child("Type")->add_child_text ("Sndfile");
+       Content::as_xml (node);
+       SingleStreamAudioContent::as_xml (node);
 }
 
+
 string
 SndfileContent::summary () const
 {
-       return String::compose (_("%1 [audio]"), 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
@@ -70,8 +84,8 @@ SndfileContent::information () const
        s << String::compose (
                _("%1 channels, %2kHz, %3 samples"),
                audio_channels(),
-               content_audio_frame_rate() / 1000.0,
-               audio_length()
+               audio_frame_rate() / 1000.0,
+               audio_length().frames (audio_frame_rate ())
                );
        
        return s.str ();
@@ -91,66 +105,15 @@ SndfileContent::examine (shared_ptr<Job> job)
 {
        job->set_progress_unknown ();
        Content::examine (job);
-
-       shared_ptr<const Film> film = _film.lock ();
-       assert (film);
-
-       SndfileDecoder dec (film, 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 ();
-       }
-
-       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);
-       _audio_mapping.make_default ();
-       signal_changed (AudioContentProperty::AUDIO_MAPPING);
-}
-
-void
-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 ());
+       shared_ptr<AudioExaminer> dec (new SndfileDecoder (shared_from_this()));
+       take_from_audio_examiner (dec);
 }
 
-int
-SndfileContent::output_audio_frame_rate () const
+DCPTime
+SndfileContent::full_length () const
 {
        shared_ptr<const Film> film = _film.lock ();
        assert (film);
-       
-       return film->dcp_audio_frame_rate ();
+       return DCPTime (audio_length(), film->active_frame_rate_change (position ()));
 }
 
-void
-SndfileContent::set_audio_mapping (AudioMapping m)
-{
-       {
-               boost::mutex::scoped_lock lm (_mutex);
-               _audio_mapping = m;
-       }
-
-       signal_changed (AudioContentProperty::AUDIO_MAPPING);
-}