X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsndfile_content.cc;h=2d7fa1c1cf9446e0a26cedf13db62bd911cc6df6;hb=854f2e5bbb7ffb9758b823af87034033033f3cb8;hp=beee7cd9d0aa33c37dfa31d789b4ef076d3eacfa;hpb=d0d584a7dde6de383302615634fdee17e9724fe8;p=dcpomatic.git

diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index beee7cd9d..2d7fa1c1c 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
@@ -20,8 +20,10 @@
 #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 "i18n.h"
 
@@ -41,20 +43,29 @@ SndfileContent::SndfileContent (shared_ptr<const Film> f, boost::filesystem::pat
 
 }
 
-SndfileContent::SndfileContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> 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<AudioContent::Frame> ("AudioLength");
+	_audio_length = ContentTime (node->number_child<int64_t> ("AudioLength"));
 	_audio_frame_rate = node->number_child<int> ("AudioFrameRate");
-	_audio_mapping = AudioMapping (node->node_child ("AudioMapping"));
 }
 
 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
@@ -70,7 +81,7 @@ SndfileContent::information () const
 		_("%1 channels, %2kHz, %3 samples"),
 		audio_channels(),
 		content_audio_frame_rate() / 1000.0,
-		audio_length()
+		audio_length().frames (content_audio_frame_rate ())
 		);
 	
 	return s.str ();
@@ -85,22 +96,13 @@ 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<Job> job)
 {
 	job->set_progress_unknown ();
 	Content::examine (job);
 
-	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
-
-	SndfileDecoder dec (film, shared_from_this());
+	SndfileDecoder dec (shared_from_this());
 
 	{
 		boost::mutex::scoped_lock lm (_mutex);
@@ -113,8 +115,13 @@ SndfileContent::examine (shared_ptr<Job> job)
 	signal_changed (AudioContentProperty::AUDIO_LENGTH);
 	signal_changed (AudioContentProperty::AUDIO_FRAME_RATE);
 
-	/* XXX: do this in signal_changed...? */
-	_audio_mapping = AudioMapping (_audio_channels);
+	{
+		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);
 }
 
@@ -124,19 +131,19 @@ SndfileContent::as_xml (xmlpp::Node* node) const
 	node->add_child("Type")->add_child_text ("Sndfile");
 	Content::as_xml (node);
 	AudioContent::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));
+
+	node->add_child("AudioChannels")->add_child_text (lexical_cast<string> (audio_channels ()));
+	node->add_child("AudioLength")->add_child_text (lexical_cast<string> (audio_length().get ()));
+	node->add_child("AudioFrameRate")->add_child_text (lexical_cast<string> (content_audio_frame_rate ()));
 	_audio_mapping.as_xml (node->add_child("AudioMapping"));
 }
 
-Time
-SndfileContent::length () const
+DCPTime
+SndfileContent::full_length () const
 {
 	shared_ptr<const Film> film = _film.lock ();
 	assert (film);
-	
-	return film->audio_frames_to_time (audio_length ());
+	return DCPTime (audio_length(), film->active_frame_rate_change (position ()));
 }
 
 int
@@ -145,7 +152,7 @@ SndfileContent::output_audio_frame_rate () const
 	shared_ptr<const Film> film = _film.lock ();
 	assert (film);
 	
-	return film->dcp_audio_frame_rate ();
+	return film->audio_frame_rate ();
 }
 
 void
@@ -158,3 +165,4 @@ SndfileContent::set_audio_mapping (AudioMapping m)
 
 	signal_changed (AudioContentProperty::AUDIO_MAPPING);
 }
+