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

diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index 2d7fa1c1c..37f205535 100644
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -18,6 +18,7 @@
 */
 
 #include <libcxml/cxml.h>
+#include <dcp/raw_convert.h>
 #include "sndfile_content.h"
 #include "sndfile_decoder.h"
 #include "film.h"
@@ -31,7 +32,7 @@ using std::string;
 using std::stringstream;
 using std::cout;
 using boost::shared_ptr;
-using boost::lexical_cast;
+using dcp::raw_convert;
 
 SndfileContent::SndfileContent (shared_ptr<const Film> f, boost::filesystem::path p)
 	: Content (f, p)
@@ -43,7 +44,7 @@ SndfileContent::SndfileContent (shared_ptr<const Film> f, boost::filesystem::pat
 
 }
 
-SndfileContent::SndfileContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node, int version)
+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)
@@ -80,8 +81,8 @@ SndfileContent::information () const
 	s << String::compose (
 		_("%1 channels, %2kHz, %3 samples"),
 		audio_channels(),
-		content_audio_frame_rate() / 1000.0,
-		audio_length().frames (content_audio_frame_rate ())
+		audio_frame_rate() / 1000.0,
+		audio_length().frames (audio_frame_rate ())
 		);
 	
 	return s.str ();
@@ -132,9 +133,9 @@ SndfileContent::as_xml (xmlpp::Node* node) const
 	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().get ()));
-	node->add_child("AudioFrameRate")->add_child_text (lexical_cast<string> (content_audio_frame_rate ()));
+	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"));
 }
 
@@ -146,15 +147,6 @@ SndfileContent::full_length () const
 	return DCPTime (audio_length(), film->active_frame_rate_change (position ()));
 }
 
-int
-SndfileContent::output_audio_frame_rate () const
-{
-	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
-	
-	return film->audio_frame_rate ();
-}
-
 void
 SndfileContent::set_audio_mapping (AudioMapping m)
 {
@@ -163,6 +155,5 @@ SndfileContent::set_audio_mapping (AudioMapping m)
 		_audio_mapping = m;
 	}
 
-	signal_changed (AudioContentProperty::AUDIO_MAPPING);
+	AudioContent::set_audio_mapping (m);
 }
-