Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index 1a17976657c42759a10566aaec00559de94e1ba9..dc26a1a7e17655f6f91521862a86cd8f6ac67bc7 100644 (file)
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 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
@@ -17,35 +17,38 @@
 
 */
 
-#include <libcxml/cxml.h>
-#include <dcp/raw_convert.h>
 #include "sndfile_content.h"
 #include "sndfile_decoder.h"
+#include "sndfile_examiner.h"
 #include "film.h"
 #include "compose.hpp"
 #include "job.h"
 #include "util.h"
 #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 boost::shared_ptr;
-using dcp::raw_convert;
 
-SndfileContent::SndfileContent (shared_ptr<const Film> f, boost::filesystem::path p)
-       : Content (f, p)
-       , SingleStreamAudioContent (f, p)
+SndfileContent::SndfileContent (shared_ptr<const Film> film, boost::filesystem::path p)
+       : Content (film, p)
+       , SingleStreamAudioContent (film, p)
 {
 
 }
 
-SndfileContent::SndfileContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
-       : Content (f, node)
-       , SingleStreamAudioContent (f, node, version)
+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"))
 {
-       
+
 }
 
 void
@@ -54,6 +57,7 @@ SndfileContent::as_xml (xmlpp::Node* node) const
        node->add_child("Type")->add_child_text ("Sndfile");
        Content::as_xml (node);
        SingleStreamAudioContent::as_xml (node);
+       node->add_child("AudioLength")->add_child_text (raw_convert<string> (audio_length ()));
 }
 
 
@@ -72,32 +76,13 @@ SndfileContent::technical_summary () const
                + " - sndfile";
 }
 
-string
-SndfileContent::information () const
-{
-       if (_audio_frame_rate == 0) {
-               return "";
-       }
-       
-       SafeStringStream s;
-
-       s << String::compose (
-               _("%1 channels, %2kHz, %3 samples"),
-               audio_channels(),
-               audio_frame_rate() / 1000.0,
-               audio_length().frames (audio_frame_rate ())
-               );
-       
-       return s.str ();
-}
-
 bool
 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
@@ -105,15 +90,24 @@ SndfileContent::examine (shared_ptr<Job> job)
 {
        job->set_progress_unknown ();
        Content::examine (job);
-       shared_ptr<AudioExaminer> dec (new SndfileDecoder (shared_from_this()));
+       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 ();
+}
+
 DCPTime
 SndfileContent::full_length () const
 {
        shared_ptr<const Film> film = _film.lock ();
-       assert (film);
-       return DCPTime (audio_length(), film->active_frame_rate_change (position ()));
+       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 ());
 }
-