X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fsndfile_content.cc;h=bf5f3af5bbd22775b0a2ef4a9134ae6bfaf2a031;hp=1a17976657c42759a10566aaec00559de94e1ba9;hb=90becb40eb48467b6d31d6939bcfcf39c3c9652c;hpb=5e4f001bf32e3cdf65efa34803d70e6c1c00c66b

diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index 1a1797665..bf5f3af5b 100644
--- 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-2016 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,43 +17,61 @@
 
 */
 
-#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, film));
 }
 
-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_length (node->number_child<Frame> ("AudioLength"))
 {
-	
+	audio = AudioContent::from_xml (this, film, node);
+
+	if (audio) {
+		audio->set_stream (
+			AudioStreamPtr (
+				new AudioStream (node->number_child<int> ("AudioFrameRate"), 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 ()));
+		audio->stream()->mapping().as_xml (node->add_child("AudioMapping"));
+	}
+
+	node->add_child("AudioLength")->add_child_text (raw_convert<string> (audio_length ()));
 }
 
 
@@ -68,36 +86,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 +104,24 @@ 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_channels ()));
+		audio->set_stream (as);
+		AudioMapping m = as->mapping ();
+		film()->make_audio_mapping_default (m);
+		as->set_mapping (m);
+		_audio_length = ex->audio_length ();
+	}
+
+	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_length() / frc.speed_up, audio->stream()->frame_rate ());
 }
-