X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fsndfile_content.cc;h=3efba6fd5db219c38e6f93249d28155786020934;hb=7e690d21278df14b113f3602cbbd43f6214fd614;hp=210ca15779980d6970d79eebf61d801ca973cdb7;hpb=21ce34c2cd04a2e7e133ff693b84c054182f4f91;p=dcpomatic.git

diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index 210ca1577..3efba6fd5 100644
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 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
@@ -18,10 +18,13 @@
 */
 
 #include <libcxml/cxml.h>
+#include <libdcp/raw_convert.h>
 #include "sndfile_content.h"
 #include "sndfile_decoder.h"
+#include "film.h"
 #include "compose.hpp"
 #include "job.h"
+#include "util.h"
 
 #include "i18n.h"
 
@@ -29,11 +32,11 @@ using std::string;
 using std::stringstream;
 using std::cout;
 using boost::shared_ptr;
-using boost::lexical_cast;
+using libdcp::raw_convert;
 
-SndfileContent::SndfileContent (boost::filesystem::path f)
-	: Content (f)
-	, AudioContent (f)
+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)
@@ -41,19 +44,29 @@ SndfileContent::SndfileContent (boost::filesystem::path f)
 
 }
 
-SndfileContent::SndfileContent (shared_ptr<const cxml::Node> node)
-	: Content (node)
-	, AudioContent (node)
+SndfileContent::SndfileContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node, int version)
+	: Content (f, node)
+	, AudioContent (f, node)
+	, _audio_mapping (node->node_child ("AudioMapping"), version)
 {
 	_audio_channels = node->number_child<int> ("AudioChannels");
-	_audio_length = node->number_child<ContentAudioFrame> ("AudioLength");
+	_audio_length = node->number_child<AudioContent::Frame> ("AudioLength");
 	_audio_frame_rate = node->number_child<int> ("AudioFrameRate");
 }
 
 string
 SndfileContent::summary () const
 {
-	return String::compose (_("Sound file: %1"), file().filename().string());
+	/* Get the string() here so that the name does not have quotes around it */
+	return String::compose (_("%1 [audio]"), path_summary ());
+}
+
+string
+SndfileContent::technical_summary () const
+{
+	return Content::technical_summary() + " - "
+		+ AudioContent::technical_summary ()
+		+ " - sndfile";
 }
 
 string
@@ -84,17 +97,14 @@ SndfileContent::valid_file (boost::filesystem::path f)
 	return (ext == ".wav" || ext == ".aif" || ext == ".aiff");
 }
 
-shared_ptr<Content>
-SndfileContent::clone () const
-{
-	return shared_ptr<Content> (new SndfileContent (*this));
-}
-
 void
-SndfileContent::examine (shared_ptr<Film> film, shared_ptr<Job> job, bool quick)
+SndfileContent::examine (shared_ptr<Job> job)
 {
 	job->set_progress_unknown ();
-	Content::examine (film, job, quick);
+	Content::examine (job);
+
+	shared_ptr<const Film> film = _film.lock ();
+	assert (film);
 
 	SndfileDecoder dec (film, shared_from_this());
 
@@ -108,6 +118,15 @@ SndfileContent::examine (shared_ptr<Film> film, shared_ptr<Job> job, bool quick)
 	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);
 }
 
 void
@@ -115,20 +134,37 @@ SndfileContent::as_xml (xmlpp::Node* node) const
 {
 	node->add_child("Type")->add_child_text ("Sndfile");
 	Content::as_xml (node);
-	node->add_child("AudioChannels")->add_child_text (lexical_cast<string> (_audio_channels));
-	node->add_child("AudioLength")->add_child_text (lexical_cast<string> (_audio_length));
-	node->add_child("AudioFrameRate")->add_child_text (lexical_cast<string> (_audio_frame_rate));
+	AudioContent::as_xml (node);
+
+	node->add_child("AudioChannels")->add_child_text (raw_convert<string> (audio_channels ()));
+	node->add_child("AudioLength")->add_child_text (raw_convert<string> (audio_length ()));
+	node->add_child("AudioFrameRate")->add_child_text (raw_convert<string> (content_audio_frame_rate ()));
+	_audio_mapping.as_xml (node->add_child("AudioMapping"));
 }
 
-int
-SndfileContent::output_audio_frame_rate (shared_ptr<const Film>) const
+Time
+SndfileContent::full_length () const
 {
-	/* Resample to a DCI-approved sample rate */
-	return dcp_audio_frame_rate (content_audio_frame_rate ());
+	shared_ptr<const Film> film = _film.lock ();
+	assert (film);
+
+	FrameRateChange frc = film->active_frame_rate_change (position ());
+
+	OutputAudioFrame const len = divide_with_round (
+		audio_length() * output_audio_frame_rate() * frc.source,
+		content_audio_frame_rate() * film->video_frame_rate()
+		);
+	
+	return film->audio_frames_to_time (len);
 }
 
-Time
-SndfileContent::length (shared_ptr<const Film> film) const
+void
+SndfileContent::set_audio_mapping (AudioMapping m)
 {
-	return film->audio_frames_to_time (audio_length ());
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_audio_mapping = m;
+	}
+
+	signal_changed (AudioContentProperty::AUDIO_MAPPING);
 }