X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fsndfile_content.cc;h=dc26a1a7e17655f6f91521862a86cd8f6ac67bc7;hp=ed4f8ffd527ebde2358319d8344456829d25448c;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hpb=39bc73fe192f932ed6695eb87b19de446e8b4f55

diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index ed4f8ffd5..dc26a1a7e 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-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,43 +17,50 @@
 
 */
 
-#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::stringstream;
 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)
-	, AudioContent (f, p)
-	, _audio_channels (0)
-	, _audio_length (0)
-	, _audio_frame_rate (0)
+
+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)
-	, AudioContent (f, node)
-	, _audio_mapping (node->node_child ("AudioMapping"), 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"))
 {
-	_audio_channels = node->number_child<int> ("AudioChannels");
-	_audio_length = ContentTime (node->number_child<int64_t> ("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);
+	node->add_child("AudioLength")->add_child_text (raw_convert<string> (audio_length ()));
+}
+
+
 string
 SndfileContent::summary () const
 {
@@ -69,32 +76,13 @@ SndfileContent::technical_summary () const
 		+ " - sndfile";
 }
 
-string
-SndfileContent::information () const
-{
-	if (_audio_frame_rate == 0) {
-		return "";
-	}
-	
-	stringstream 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
@@ -102,59 +90,24 @@ SndfileContent::examine (shared_ptr<Job> job)
 {
 	job->set_progress_unknown ();
 	Content::examine (job);
-
-	SndfileDecoder dec (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);
-
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-		/* XXX: do this in signal_changed...? */
-		_audio_mapping = AudioMapping (_audio_channels);
-		_audio_mapping.make_default ();
-	}
-	
-	signal_changed (AudioContentProperty::AUDIO_MAPPING);
+	shared_ptr<AudioExaminer> dec (new SndfileExaminer (shared_from_this ()));
+	take_from_audio_examiner (dec);
 }
 
 void
-SndfileContent::as_xml (xmlpp::Node* node) const
+SndfileContent::take_from_audio_examiner (shared_ptr<AudioExaminer> examiner)
 {
-	node->add_child("Type")->add_child_text ("Sndfile");
-	Content::as_xml (node);
-	AudioContent::as_xml (node);
+	SingleStreamAudioContent::take_from_audio_examiner (examiner);
 
-	node->add_child("AudioChannels")->add_child_text (raw_convert<string> (audio_channels ()));
-	node->add_child("AudioLength")->add_child_text (raw_convert<string> (audio_length().get ()));
-	node->add_child("AudioFrameRate")->add_child_text (raw_convert<string> (audio_frame_rate ()));
-	_audio_mapping.as_xml (node->add_child("AudioMapping"));
+	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 ());
 }
-
-void
-SndfileContent::set_audio_mapping (AudioMapping m)
-{
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-		_audio_mapping = m;
-	}
-
-	AudioContent::set_audio_mapping (m);
-}
-