X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_content.cc;h=d2d90a1f5b42ce9c0d493ea402765995f1a9512d;hb=43877eccbedc0950ab253e76dd0cea691fd7a4b0;hp=46b80a21c69fe0216dbde395259d91cb6e89a688;hpb=f98caf4af896e9be943046b84586da5c2e103f18;p=dcpomatic.git

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 46b80a21c..d2d90a1f5 100644
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -46,43 +46,43 @@ int const AudioContentProperty::AUDIO_STREAMS = 200;
 int const AudioContentProperty::AUDIO_GAIN = 201;
 int const AudioContentProperty::AUDIO_DELAY = 202;
 
-AudioContent::AudioContent (shared_ptr<const Film> f)
-	: Content (f)
+AudioContent::AudioContent (shared_ptr<const Film> film)
+	: Content (film)
 	, _audio_gain (0)
 	, _audio_delay (Config::instance()->default_audio_delay ())
 {
 
 }
 
-AudioContent::AudioContent (shared_ptr<const Film> f, DCPTime s)
-	: Content (f, s)
+AudioContent::AudioContent (shared_ptr<const Film> film, DCPTime s)
+	: Content (film, s)
 	, _audio_gain (0)
 	, _audio_delay (Config::instance()->default_audio_delay ())
 {
 
 }
 
-AudioContent::AudioContent (shared_ptr<const Film> f, boost::filesystem::path p)
-	: Content (f, p)
+AudioContent::AudioContent (shared_ptr<const Film> film, boost::filesystem::path p)
+	: Content (film, p)
 	, _audio_gain (0)
 	, _audio_delay (Config::instance()->default_audio_delay ())
 {
 
 }
 
-AudioContent::AudioContent (shared_ptr<const Film> f, cxml::ConstNodePtr node)
-	: Content (f, node)
+AudioContent::AudioContent (shared_ptr<const Film> film, cxml::ConstNodePtr node)
+	: Content (film, node)
 {
 	_audio_gain = node->number_child<float> ("AudioGain");
 	_audio_delay = node->number_child<int> ("AudioDelay");
 }
 
-AudioContent::AudioContent (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
-	: Content (f, c)
+AudioContent::AudioContent (shared_ptr<const Film> film, vector<shared_ptr<Content> > c)
+	: Content (film, c)
 {
 	shared_ptr<AudioContent> ref = dynamic_pointer_cast<AudioContent> (c[0]);
 	DCPOMATIC_ASSERT (ref);
-	
+
 	for (size_t i = 0; i < c.size(); ++i) {
 		shared_ptr<AudioContent> ac = dynamic_pointer_cast<AudioContent> (c[i]);
 
@@ -115,7 +115,7 @@ AudioContent::set_audio_gain (double g)
 		boost::mutex::scoped_lock lm (_mutex);
 		_audio_gain = g;
 	}
-	
+
 	signal_changed (AudioContentProperty::AUDIO_GAIN);
 }
 
@@ -126,7 +126,7 @@ AudioContent::set_audio_delay (int d)
 		boost::mutex::scoped_lock lm (_mutex);
 		_audio_delay = d;
 	}
-	
+
 	signal_changed (AudioContentProperty::AUDIO_DELAY);
 }
 
@@ -155,7 +155,7 @@ AudioContent::set_audio_mapping (AudioMapping mapping)
 		}
 		i->set_mapping (stream_mapping);
 	}
-		
+
 	signal_changed (AudioContentProperty::AUDIO_STREAMS);
 }
 
@@ -166,9 +166,9 @@ AudioContent::audio_mapping () const
 	BOOST_FOREACH (AudioStreamPtr i, audio_streams ()) {
 		channels += i->channels ();
 	}
-	
+
 	AudioMapping merged (channels, MAX_DCP_AUDIO_CHANNELS);
-	
+
 	int c = 0;
 	int s = 0;
 	BOOST_FOREACH (AudioStreamPtr i, audio_streams ()) {
@@ -193,7 +193,7 @@ AudioContent::resampled_audio_frame_rate () const
 {
 	shared_ptr<const Film> film = _film.lock ();
 	DCPOMATIC_ASSERT (film);
-	
+
 	/* Resample to a DCI-approved sample rate */
 	double t = has_rate_above_48k() ? 96000 : 48000;