X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsndfile_content.cc;h=647fc9b6241b6324a0d5bc01604c024bb3604a64;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=1a17976657c42759a10566aaec00559de94e1ba9;hpb=946dbad9821e676f1d8fdc5abba459da54b8e84c;p=dcpomatic.git

diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index 1a1797665..647fc9b62 100644
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -1,59 +1,81 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic 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,
+    DCP-o-matic 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.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include <libcxml/cxml.h>
-#include <dcp/raw_convert.h>
 #include "sndfile_content.h"
 #include "sndfile_decoder.h"
+#include "sndfile_examiner.h"
+#include "audio_content.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 std::vector;
 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)
 {
-
+	audio.reset (new AudioContent (this));
 }
 
-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)
 {
-	
+	audio = AudioContent::from_xml (this, node);
+
+	if (audio) {
+		audio->set_stream (
+			AudioStreamPtr (
+				new AudioStream (
+					node->number_child<int> ("AudioFrameRate"),
+					node->number_child<Frame> ("AudioLength"),
+					AudioMapping (node->node_child ("AudioMapping"), version)
+					)
+				)
+			);
+	}
 }
 
 void
 SndfileContent::as_xml (xmlpp::Node* node) const
 {
 	node->add_child("Type")->add_child_text ("Sndfile");
+
 	Content::as_xml (node);
-	SingleStreamAudioContent::as_xml (node);
+
+	if (audio) {
+		audio->as_xml (node);
+		node->add_child("AudioFrameRate")->add_child_text (raw_convert<string> (audio->stream()->frame_rate ()));
+		node->add_child("AudioLength")->add_child_text (raw_convert<string> (audio->stream()->length ()));
+		audio->stream()->mapping().as_xml (node->add_child("AudioMapping"));
+	}
 }
 
 
@@ -68,36 +90,17 @@ string
 SndfileContent::technical_summary () const
 {
 	return Content::technical_summary() + " - "
-		+ AudioContent::technical_summary ()
+		+ audio->technical_summary ()
 		+ " - 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 +108,23 @@ SndfileContent::examine (shared_ptr<Job> job)
 {
 	job->set_progress_unknown ();
 	Content::examine (job);
-	shared_ptr<AudioExaminer> dec (new SndfileDecoder (shared_from_this()));
-	take_from_audio_examiner (dec);
+	shared_ptr<AudioExaminer> ex (new SndfileExaminer (shared_from_this ()));
+
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		AudioStreamPtr as (new AudioStream (ex->audio_frame_rate(), ex->audio_length(), ex->audio_channels ()));
+		audio->set_stream (as);
+		AudioMapping m = as->mapping ();
+		film()->make_audio_mapping_default (m);
+		as->set_mapping (m);
+	}
+
+	signal_changed (AudioContentProperty::STREAMS);
 }
 
 DCPTime
 SndfileContent::full_length () const
 {
-	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
-	return DCPTime (audio_length(), film->active_frame_rate_change (position ()));
+	FrameRateChange const frc (active_video_frame_rate(), film()->video_frame_rate());
+	return DCPTime::from_frames (audio->stream()->length() / frc.speed_up, audio->stream()->frame_rate ());
 }
-