Fix deadlock.

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

diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index 657e7d519c3b5ac5779b580e6ff40728d5248628..9f9ea351e2a94e0f93a35d99c5075bf22c171b01 100644 (file)
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -1,60 +1,74 @@
+/*
+    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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#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 "safe_stringstream.h"
 
 #include "i18n.h"
 
 using std::string;
+using std::cout;
 using boost::shared_ptr;
 
-SndfileContent::SndfileContent (boost::filesystem::path f)
-       : Content (f)
-       , AudioContent (f)
+SndfileContent::SndfileContent (shared_ptr<const Film> f, boost::filesystem::path p)
+       : Content (f, p)
+       , SingleStreamAudioContent (f, p)
 {
 
 }
 
-SndfileContent::SndfileContent (shared_ptr<const cxml::Node> node)
-       : Content (node)
-       , AudioContent (node)
-                  
-{
-
-}
-
-string
-SndfileContent::summary () const
+SndfileContent::SndfileContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
+       : Content (f, node)
+       , SingleStreamAudioContent (f, node, version)
 {
-       return String::compose (_("Sound file: %1"), file().filename ());
+       
 }
 
-int
-SndfileContent::audio_channels () const
+void
+SndfileContent::as_xml (xmlpp::Node* node) const
 {
-       /* XXX */
-       return 0;
+       node->add_child("Type")->add_child_text ("Sndfile");
+       Content::as_xml (node);
+       SingleStreamAudioContent::as_xml (node);
 }
 
-ContentAudioFrame
-SndfileContent::audio_length () const
-{
-       /* XXX */
-       return 0;
-}
 
-int
-SndfileContent::audio_frame_rate () const
+string
+SndfileContent::summary () const
 {
-       /* XXX */
-       return 0;
+       /* Get the string() here so that the name does not have quotes around it */
+       return String::compose (_("%1 [audio]"), path_summary ());
 }
 
-int64_t
-SndfileContent::audio_channel_layout () const
+string
+SndfileContent::technical_summary () const
 {
-       /* XXX */
-       return 0;
+       return Content::technical_summary() + " - "
+               + AudioContent::technical_summary ()
+               + " - sndfile";
 }
-       
 
 bool
 SndfileContent::valid_file (boost::filesystem::path f)
@@ -65,8 +79,20 @@ SndfileContent::valid_file (boost::filesystem::path f)
        return (ext == ".wav" || ext == ".aif" || ext == ".aiff");
 }
 
-shared_ptr<Content>
-SndfileContent::clone () const
+void
+SndfileContent::examine (shared_ptr<Job> job)
 {
-       return shared_ptr<Content> (new SndfileContent (*this));
+       job->set_progress_unknown ();
+       Content::examine (job);
+       shared_ptr<AudioExaminer> dec (new SndfileDecoder (shared_from_this()));
+       take_from_audio_examiner (dec);
 }
+
+DCPTime
+SndfileContent::full_length () const
+{
+       shared_ptr<const Film> film = _film.lock ();
+       DCPOMATIC_ASSERT (film);
+       return DCPTime (audio_length(), film->active_frame_rate_change (position ()));
+}
+