No-op; variable renaming.

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index 4282cd66fd9562f5cc33573196105238fa5b4f22..3dd15ac272dcb6874aa73066feb32c9e291fd464 100644 (file)
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -36,8 +36,8 @@ using boost::dynamic_pointer_cast;
 
 int const AnalyseAudioJob::_num_points = 1024;
 
-AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> f)
-       : Job (f)
+AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> film)
+       : Job (film)
        , _done (0)
        , _samples_per_point (1)
        , _overall_peak (0)

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 46b80a21c69fe0216dbde395259d91cb6e89a688..e1f435f49b4d4e16934e4559dea6639e105b8b7f 100644 (file)
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -46,39 +46,39 @@ 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);

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 9a7cb0f34f68e0837862bbc96bc36aca00ab6d27..2ee660b7fab0111e2f985949a969a802808cc0c7 100644 (file)
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -48,8 +48,8 @@ int const ContentProperty::LENGTH = 402;
 int const ContentProperty::TRIM_START = 403;
 int const ContentProperty::TRIM_END = 404;
 
-Content::Content (shared_ptr<const Film> f)
-       : _film (f)
+Content::Content (shared_ptr<const Film> film)
+       : _film (film)
        , _position (0)
        , _trim_start (0)
        , _trim_end (0)
@@ -58,8 +58,8 @@ Content::Content (shared_ptr<const Film> f)
 
 }
 
-Content::Content (shared_ptr<const Film> f, DCPTime p)
-       : _film (f)
+Content::Content (shared_ptr<const Film> film, DCPTime p)
+       : _film (film)
        , _position (p)
        , _trim_start (0)
        , _trim_end (0)
@@ -68,8 +68,8 @@ Content::Content (shared_ptr<const Film> f, DCPTime p)
 
 }
 
-Content::Content (shared_ptr<const Film> f, boost::filesystem::path p)
-       : _film (f)
+Content::Content (shared_ptr<const Film> film, boost::filesystem::path p)
+       : _film (film)
        , _position (0)
        , _trim_start (0)
        , _trim_end (0)
@@ -78,8 +78,8 @@ Content::Content (shared_ptr<const Film> f, boost::filesystem::path p)
        _paths.push_back (p);
 }
 
-Content::Content (shared_ptr<const Film> f, cxml::ConstNodePtr node)
-       : _film (f)
+Content::Content (shared_ptr<const Film> film, cxml::ConstNodePtr node)
+       : _film (film)
        , _change_signals_frequent (false)
 {
        list<cxml::NodePtr> path_children = node->node_children ("Path");
@@ -92,8 +92,8 @@ Content::Content (shared_ptr<const Film> f, cxml::ConstNodePtr node)
        _trim_end = DCPTime (node->number_child<double> ("TrimEnd"));
 }
 
-Content::Content (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
-       : _film (f)
+Content::Content (shared_ptr<const Film> film, vector<shared_ptr<Content> > c)
+       : _film (film)
        , _position (c.front()->position ())
        , _trim_start (c.front()->trim_start ())
        , _trim_end (c.back()->trim_end ())

diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index b707754a78957bc2e3291659fc01c3e4d84606fe..d51a560dd90dea93684ae251e69adc16799579a3 100644 (file)
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -37,11 +37,11 @@ using boost::optional;
 
 int const DCPContentProperty::CAN_BE_PLAYED = 600;
 
-DCPContent::DCPContent (shared_ptr<const Film> f, boost::filesystem::path p)
-       : Content (f)
-       , VideoContent (f)
-       , SingleStreamAudioContent (f)
-       , SubtitleContent (f)
+DCPContent::DCPContent (shared_ptr<const Film> film, boost::filesystem::path p)
+       : Content (film)
+       , VideoContent (film)
+       , SingleStreamAudioContent (film)
+       , SubtitleContent (film)
        , _has_subtitles (false)
        , _encrypted (false)
        , _kdm_valid (false)
@@ -51,11 +51,11 @@ DCPContent::DCPContent (shared_ptr<const Film> f, boost::filesystem::path p)
        unset_colour_conversion (false);
 }
 
-DCPContent::DCPContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
-       : Content (f, node)
-       , VideoContent (f, node, version)
-       , SingleStreamAudioContent (f, node, version)
-       , SubtitleContent (f, node, version)
+DCPContent::DCPContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
+       : Content (film, node)
+       , VideoContent (film, node, version)
+       , SingleStreamAudioContent (film, node, version)
+       , SubtitleContent (film, node, version)
 {
        _name = node->string_child ("Name");
        _has_subtitles = node->bool_child ("HasSubtitles");

diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index 9365a6e2c3bb8bc0fa612efac67c2b645c44610a..74f06cdc640adaa8a7337becaf1bb31ae5508534 100644 (file)
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -43,8 +43,8 @@ public:
 class DCPContent : public VideoContent, public SingleStreamAudioContent, public SubtitleContent
 {
 public:
-       DCPContent (boost::shared_ptr<const Film> f, boost::filesystem::path p);
-       DCPContent (boost::shared_ptr<const Film> f, cxml::ConstNodePtr, int version);
+       DCPContent (boost::shared_ptr<const Film>, boost::filesystem::path p);
+       DCPContent (boost::shared_ptr<const Film>, cxml::ConstNodePtr, int version);
 
        boost::shared_ptr<DCPContent> shared_from_this () {
                return boost::dynamic_pointer_cast<DCPContent> (Content::shared_from_this ());

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index d0764ac35d8fa89393a872b6c7c8c5aca3947885..776ccd118eb2beadef66c0a15ad605284dc908b2 100644 (file)
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -59,8 +59,8 @@ using boost::scoped_array;
 int const Encoder::_history_size = 25;
 
 /** @param f Film that we are encoding */
-Encoder::Encoder (shared_ptr<const Film> f, weak_ptr<Job> j, shared_ptr<Writer> writer)
-       : _film (f)
+Encoder::Encoder (shared_ptr<const Film> film, weak_ptr<Job> j, shared_ptr<Writer> writer)
+       : _film (film)
        , _job (j)
        , _video_frames_enqueued (0)
        , _terminate (false)

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 8b7c1f3adfea058c8194f4ca08a0ee7105b387b0..0e2d306546635de6d75aade7436364d5505d40c2 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -59,7 +59,7 @@ class PlayerVideo;
 class Encoder : public boost::noncopyable, public ExceptionStore
 {
 public:
-       Encoder (boost::shared_ptr<const Film> f, boost::weak_ptr<Job>, boost::shared_ptr<Writer>);
+       Encoder (boost::shared_ptr<const Film>, boost::weak_ptr<Job>, boost::shared_ptr<Writer>);
        virtual ~Encoder ();
 
        /** Called to indicate that a processing run is about to begin */

diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc
index b5441e36b55c662451f2a3d9bab92bcd45a72fa6..238c89e66763a9390c8f9515701017eb1bb25e4f 100644 (file)
--- a/src/lib/examine_content_job.cc
+++ b/src/lib/examine_content_job.cc
@@ -29,8 +29,8 @@ using std::string;
 using std::cout;
 using boost::shared_ptr;
 
-ExamineContentJob::ExamineContentJob (shared_ptr<const Film> f, shared_ptr<Content> c)
-       : Job (f)
+ExamineContentJob::ExamineContentJob (shared_ptr<const Film> film, shared_ptr<Content> c)
+       : Job (film)
        , _content (c)
 {
 

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 608c8cdb7e31391f8f8fb1ddb0e33919387e6b68..1793b8998c47c00394a673107d093f6f19c8c0c8 100644 (file)
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -53,20 +53,20 @@ int const FFmpegContentProperty::SUBTITLE_STREAMS = 100;
 int const FFmpegContentProperty::SUBTITLE_STREAM = 101;
 int const FFmpegContentProperty::FILTERS = 102;
 
-FFmpegContent::FFmpegContent (shared_ptr<const Film> f, boost::filesystem::path p)
-       : Content (f, p)
-       , VideoContent (f, p)
-       , AudioContent (f, p)
-       , SubtitleContent (f, p)
+FFmpegContent::FFmpegContent (shared_ptr<const Film> film, boost::filesystem::path p)
+       : Content (film, p)
+       , VideoContent (film, p)
+       , AudioContent (film, p)
+       , SubtitleContent (film, p)
 {
 
 }
 
-FFmpegContent::FFmpegContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version, list<string>& notes)
-       : Content (f, node)
-       , VideoContent (f, node, version)
-       , AudioContent (f, node)
-       , SubtitleContent (f, node, version)
+FFmpegContent::FFmpegContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version, list<string>& notes)
+       : Content (film, node)
+       , VideoContent (film, node, version)
+       , AudioContent (film, node)
+       , SubtitleContent (film, node, version)
 {
        list<cxml::NodePtr> c = node->node_children ("SubtitleStream");
        for (list<cxml::NodePtr>::const_iterator i = c.begin(); i != c.end(); ++i) {
@@ -98,11 +98,11 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> f, cxml::ConstNodePtr node,
        _first_video = node->optional_number_child<double> ("FirstVideo");
 }
 
-FFmpegContent::FFmpegContent (shared_ptr<const Film> f, vector<boost::shared_ptr<Content> > c)
-       : Content (f, c)
-       , VideoContent (f, c)
-       , AudioContent (f, c)
-       , SubtitleContent (f, c)
+FFmpegContent::FFmpegContent (shared_ptr<const Film> film, vector<boost::shared_ptr<Content> > c)
+       : Content (film, c)
+       , VideoContent (film, c)
+       , AudioContent (film, c)
+       , SubtitleContent (film, c)
 {
        shared_ptr<FFmpegContent> ref = dynamic_pointer_cast<FFmpegContent> (c[0]);
        DCPOMATIC_ASSERT (ref);

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index c0004e59c826a0aff22749064c230d180b57184c..3f62c3ebfdccbddd487b30751e43d226d9cc3307 100644 (file)
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -35,9 +35,9 @@ using std::string;
 using std::cout;
 using boost::shared_ptr;
 
-ImageContent::ImageContent (shared_ptr<const Film> f, boost::filesystem::path p)
-       : Content (f)
-       , VideoContent (f)
+ImageContent::ImageContent (shared_ptr<const Film> film, boost::filesystem::path p)
+       : Content (film)
+       , VideoContent (film)
 {
        bool have_j2k = false;
        if (boost::filesystem::is_regular_file (p) && valid_image_file (p)) {
@@ -69,9 +69,9 @@ ImageContent::ImageContent (shared_ptr<const Film> f, boost::filesystem::path p)
 }
 
 
-ImageContent::ImageContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
-       : Content (f, node)
-       , VideoContent (f, node, version)
+ImageContent::ImageContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
+       : Content (film, node)
+       , VideoContent (film, node, version)
 {
        
 }

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 286b38456a8c0b82891e67d8b698cfaf4fedde64..25ff0aa4cf887e0422fb9e470b0fbd2b0b0f424c 100644 (file)
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -41,8 +41,8 @@ using boost::optional;
 
 #define LOG_ERROR_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_ERROR);
 
-Job::Job (shared_ptr<const Film> f)
-       : _film (f)
+Job::Job (shared_ptr<const Film> film)
+       : _film (film)
        , _thread (0)
        , _state (NEW)
        , _start_time (0)

diff --git a/src/lib/player.cc b/src/lib/player.cc
index ac41cc7b35ca7aa815900ac23a2d0b113483f9db..449a4384dfd9b2f8c02d5f971309dddcb2ea70a1 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -68,11 +68,11 @@ using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 
-Player::Player (shared_ptr<const Film> f)
-       : _film (f)
+Player::Player (shared_ptr<const Film> film)
+       : _film (film)
        , _have_valid_pieces (false)
        , _ignore_video (false)
-       , _burn_subtitles (f->burn_subtitles ())
+       , _burn_subtitles (film->burn_subtitles ())
 {
        _film_content_changed_connection = _film->ContentChanged.connect (bind (&Player::content_changed, this, _1, _2, _3));
        _film_changed_connection = _film->Changed.connect (bind (&Player::film_changed, this, _1));

diff --git a/src/lib/scp_dcp_job.cc b/src/lib/scp_dcp_job.cc
index 5aade6382d13b3442dee91ca94f98cb7fad05838..d71ec6fd207aaa5a3e9a04e9c953ca43c31d3295 100644 (file)
--- a/src/lib/scp_dcp_job.cc
+++ b/src/lib/scp_dcp_job.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-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
@@ -98,8 +98,8 @@ public:
 };
 
 
-SCPDCPJob::SCPDCPJob (shared_ptr<const Film> f)
-       : Job (f)
+SCPDCPJob::SCPDCPJob (shared_ptr<const Film> film)
+       : Job (film)
        , _status (_("Waiting"))
 {
 

diff --git a/src/lib/send_kdm_email_job.cc b/src/lib/send_kdm_email_job.cc
index de03222725074b9a6a9fdfa670a463de0f88f396..4be54c5cd98bbb7cbf68b814ede4c8269c8195a7 100644 (file)
--- a/src/lib/send_kdm_email_job.cc
+++ b/src/lib/send_kdm_email_job.cc
@@ -29,14 +29,14 @@ using std::list;
 using boost::shared_ptr;
 
 SendKDMEmailJob::SendKDMEmailJob (
-       shared_ptr<const Film> f,
+       shared_ptr<const Film> film,
        list<shared_ptr<Screen> > screens,
        boost::filesystem::path dcp,
        boost::posix_time::ptime from,
        boost::posix_time::ptime to,
        dcp::Formulation formulation
        )
-       : Job (f)
+       : Job (film)
        , _screens (screens)
        , _dcp (dcp)
        , _from (from)

diff --git a/src/lib/single_stream_audio_content.cc b/src/lib/single_stream_audio_content.cc
index f978fa423150f912eee111a23a5b3e505c10c303..6a9a78bfae712e654b48c3424840fbeaa75ee267 100644 (file)
--- a/src/lib/single_stream_audio_content.cc
+++ b/src/lib/single_stream_audio_content.cc
@@ -27,23 +27,23 @@ using std::cout;
 using std::vector;
 using boost::shared_ptr;
 
-SingleStreamAudioContent::SingleStreamAudioContent (shared_ptr<const Film> f)
-       : Content (f)
-       , AudioContent (f)
+SingleStreamAudioContent::SingleStreamAudioContent (shared_ptr<const Film> film)
+       : Content (film)
+       , AudioContent (film)
 {
 
 }
 
-SingleStreamAudioContent::SingleStreamAudioContent (shared_ptr<const Film> f, boost::filesystem::path p)
-       : Content (f, p)
-       , AudioContent (f, p)
+SingleStreamAudioContent::SingleStreamAudioContent (shared_ptr<const Film> film, boost::filesystem::path p)
+       : Content (film, p)
+       , AudioContent (film, p)
 {
 
 }
 
-SingleStreamAudioContent::SingleStreamAudioContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
-       : Content (f, node)
-       , AudioContent (f, node)
+SingleStreamAudioContent::SingleStreamAudioContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
+       : Content (film, node)
+       , AudioContent (film, node)
        , _audio_stream (new AudioStream (node->number_child<int> ("AudioFrameRate"), AudioMapping (node->node_child ("AudioMapping"), version)))
 {
 

diff --git a/src/lib/single_stream_audio_content.h b/src/lib/single_stream_audio_content.h
index d8fcb8df0193237da7d1b687b33bc915269307de..abe68b4447cfc5098c7161e8d975d15b9b6d2ccd 100644 (file)
--- a/src/lib/single_stream_audio_content.h
+++ b/src/lib/single_stream_audio_content.h
@@ -36,7 +36,7 @@ class SingleStreamAudioContent : public AudioContent
 public:
        SingleStreamAudioContent (boost::shared_ptr<const Film>);
        SingleStreamAudioContent (boost::shared_ptr<const Film>, boost::filesystem::path);
-       SingleStreamAudioContent (boost::shared_ptr<const Film> f, cxml::ConstNodePtr node, int version);
+       SingleStreamAudioContent (boost::shared_ptr<const Film>, cxml::ConstNodePtr node, int version);
 
        void as_xml (xmlpp::Node* node) const;
 

diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index cfee7bd381b3fc6b615291f8ad590c064e6dc5dd..6d3ee18f586dfc5b4a5b04d6768ecd42971e0deb 100644 (file)
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -34,16 +34,16 @@ using std::string;
 using std::cout;
 using boost::shared_ptr;
 
-SndfileContent::SndfileContent (shared_ptr<const Film> f, boost::filesystem::path p)
-       : Content (f, p)
-       , SingleStreamAudioContent (f, p)
+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)
-       , SingleStreamAudioContent (f, node, 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<int64_t> ("AudioLength"))
 {
 

diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc
index f03968d91db3cfbc134bf7c54fb5277a605ff0d0..514ee03cb276e69aaffac87bbde5429b9a5d1ce0 100644 (file)
--- a/src/lib/subtitle_content.cc
+++ b/src/lib/subtitle_content.cc
@@ -43,8 +43,8 @@ int const SubtitleContentProperty::USE_SUBTITLES = 504;
 int const SubtitleContentProperty::SUBTITLE_LANGUAGE = 505;
 int const SubtitleContentProperty::FONTS = 506;
 
-SubtitleContent::SubtitleContent (shared_ptr<const Film> f)
-       : Content (f)
+SubtitleContent::SubtitleContent (shared_ptr<const Film> film)
+       : Content (film)
        , _use_subtitles (false)
        , _subtitle_x_offset (0)
        , _subtitle_y_offset (0)
@@ -54,8 +54,8 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f)
 
 }
 
-SubtitleContent::SubtitleContent (shared_ptr<const Film> f, boost::filesystem::path p)
-       : Content (f, p)
+SubtitleContent::SubtitleContent (shared_ptr<const Film> film, boost::filesystem::path p)
+       : Content (film, p)
        , _use_subtitles (false)
        , _subtitle_x_offset (0)
        , _subtitle_y_offset (0)
@@ -65,8 +65,8 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f, boost::filesystem::p
 
 }
 
-SubtitleContent::SubtitleContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
-       : Content (f, node)
+SubtitleContent::SubtitleContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
+       : Content (film, node)
        , _use_subtitles (false)
        , _subtitle_x_offset (0)
        , _subtitle_y_offset (0)
@@ -103,8 +103,8 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f, cxml::ConstNodePtr n
        connect_to_fonts ();
 }
 
-SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
-       : Content (f, c)
+SubtitleContent::SubtitleContent (shared_ptr<const Film> film, vector<shared_ptr<Content> > c)
+       : Content (film, c)
 {
        shared_ptr<SubtitleContent> ref = dynamic_pointer_cast<SubtitleContent> (c[0]);
        DCPOMATIC_ASSERT (ref);

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 1a2202ad2f2b91b9914297c07c9852ff227b3cb7..d16287111edaf098f3df86e7d7b86b472efc18cd 100644 (file)
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-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
@@ -42,8 +42,8 @@ using boost::shared_ptr;
 
 /** @param s Film to use.
  */
-TranscodeJob::TranscodeJob (shared_ptr<const Film> f)
-       : Job (f)
+TranscodeJob::TranscodeJob (shared_ptr<const Film> film)
+       : Job (film)
 {
        
 }

diff --git a/src/lib/transcode_job.h b/src/lib/transcode_job.h
index e0145d7d06e082a998bda94f172546166700c7c4..efe3f971993d818a4c5abe96c3c59d3d446d4579 100644 (file)
--- a/src/lib/transcode_job.h
+++ b/src/lib/transcode_job.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-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
@@ -32,7 +32,7 @@ class Transcoder;
 class TranscodeJob : public Job
 {
 public:
-       TranscodeJob (boost::shared_ptr<const Film> f);
+       TranscodeJob (boost::shared_ptr<const Film>);
        
        std::string name () const;
        std::string json_name () const;

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 091da50f445d92fbcd42079765a286059814cadd..4ff0c6dfe0ae7397ad90121ea6808f5568bd31fd 100644 (file)
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -46,11 +46,11 @@ using boost::dynamic_pointer_cast;
  *  @param f Film that we are transcoding.
  *  @param j Job that this transcoder is being used in.
  */
-Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
-       : _film (f)
-       , _player (new Player (f))
-       , _writer (new Writer (f, j))
-       , _encoder (new Encoder (f, j, _writer))
+Transcoder::Transcoder (shared_ptr<const Film> film, shared_ptr<Job> j)
+       : _film (film)
+       , _player (new Player (film))
+       , _writer (new Writer (film, j))
+       , _encoder (new Encoder (film, j, _writer))
        , _finishing (false)
 {
 

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 60b702e0120ed74598e704422cd9ba0c140fbf29..f97e46322b9f5cd515741959ef3064367f3b8d44 100644 (file)
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -60,8 +60,8 @@ using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
 
-VideoContent::VideoContent (shared_ptr<const Film> f)
-       : Content (f)
+VideoContent::VideoContent (shared_ptr<const Film> film)
+       : Content (film)
        , _video_length (0)
        , _video_frame_rate (0)
        , _video_frame_type (VIDEO_FRAME_TYPE_2D)
@@ -72,8 +72,8 @@ VideoContent::VideoContent (shared_ptr<const Film> f)
        set_default_colour_conversion ();
 }
 
-VideoContent::VideoContent (shared_ptr<const Film> f, DCPTime s, Frame len)
-       : Content (f, s)
+VideoContent::VideoContent (shared_ptr<const Film> film, DCPTime s, Frame len)
+       : Content (film, s)
        , _video_length (len)
        , _video_frame_rate (0)
        , _video_frame_type (VIDEO_FRAME_TYPE_2D)
@@ -84,8 +84,8 @@ VideoContent::VideoContent (shared_ptr<const Film> f, DCPTime s, Frame len)
        set_default_colour_conversion ();
 }
 
-VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
-       : Content (f, p)
+VideoContent::VideoContent (shared_ptr<const Film> film, boost::filesystem::path p)
+       : Content (film, p)
        , _video_length (0)
        , _video_frame_rate (0)
        , _video_frame_type (VIDEO_FRAME_TYPE_2D)
@@ -96,8 +96,8 @@ VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
        set_default_colour_conversion ();
 }
 
-VideoContent::VideoContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
-       : Content (f, node)
+VideoContent::VideoContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
+       : Content (film, node)
 {
        _video_size.width = node->number_child<int> ("VideoWidth");
        _video_size.height = node->number_child<int> ("VideoHeight");
@@ -131,8 +131,8 @@ VideoContent::VideoContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, i
        }
 }
 
-VideoContent::VideoContent (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
-       : Content (f, c)
+VideoContent::VideoContent (shared_ptr<const Film> film, vector<shared_ptr<Content> > c)
+       : Content (film, c)
        , _video_length (0)
 {
        shared_ptr<VideoContent> ref = dynamic_pointer_cast<VideoContent> (c[0]);

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 5c711ef9224db8c422198d65361feb002ebc7b71..8643b0def14886807a95fad9755b58461df45215 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -74,8 +74,8 @@ using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 
-Writer::Writer (shared_ptr<const Film> f, weak_ptr<Job> j)
-       : _film (f)
+Writer::Writer (shared_ptr<const Film> film, weak_ptr<Job> j)
+       : _film (film)
        , _job (j)
        , _first_nonexistant_frame (0)
        , _thread (0)

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 2e9fe43fe6333568792dbeaf1e1845dffe57c41c..3cf9f23dcf636f2544fe7edf1668bb2fcee524b4 100644 (file)
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -78,9 +78,9 @@ ContentMenu::~ContentMenu ()
 }
 
 void
-ContentMenu::popup (weak_ptr<Film> f, ContentList c, TimelineContentViewList v, wxPoint p)
+ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList v, wxPoint p)
 {
-       _film = f;
+       _film = film;
        _content = c;
        _views = v;
        _repeat->Enable (!_content.empty ());

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index a6d0134348f2f45757781c8de72f47695019b4bd..8bb2512517c638467b84de16855f48dd89f5a8e9 100644 (file)
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -48,9 +48,9 @@ using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 
-ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr<Film> f, FilmViewer* viewer)
+ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr<Film> film, FilmViewer* viewer)
        : _timeline_dialog (0)
-       , _film (f)
+       , _film (film)
        , _generally_sensitive (true)
 {
        _panel = new wxPanel (n);
@@ -365,9 +365,9 @@ ContentPanel::setup_sensitivity ()
 }
 
 void
-ContentPanel::set_film (shared_ptr<Film> f)
+ContentPanel::set_film (shared_ptr<Film> film)
 {
-       _film = f;
+       _film = film;
 
        film_changed (Film::CONTENT);
        film_changed (Film::AUDIO_CHANNELS);

diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index d48ee26c1ded308843bad01ebbcb7ba8e0b46d46..bb7353a9ba9fbab6dd307a8d6dbab8843f4ffd54 100644 (file)
--- a/src/wx/content_panel.h
+++ b/src/wx/content_panel.h
@@ -43,7 +43,7 @@ public:
                return _film;
        }
 
-       void set_film (boost::shared_ptr<Film> f);
+       void set_film (boost::shared_ptr<Film>);
        void set_general_sensitivity (bool s);
        void set_selection (boost::weak_ptr<Content>);
 

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 0a7f3c810287c875dc89d6b5f2b59f2bd44d9e67..11db3466fd74d482f0d707351a4bac13d44b84fc 100644 (file)
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -48,9 +48,9 @@ using std::make_pair;
 using boost::lexical_cast;
 using boost::shared_ptr;
 
-DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> f)
+DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> film)
        : _audio_dialog (0)
-       , _film (f)
+       , _film (film)
        , _generally_sensitive (true)
 {
        _panel = new wxPanel (n);

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 82fae2e9bdbb69f732754d2fe9e1c4feba1e58de..ce3791faa79d27351f54b92e701992f328c37dde 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -99,15 +99,15 @@ FilmEditor::film_content_changed (int property)
 
 /** Sets the Film that we are editing */
 void
-FilmEditor::set_film (shared_ptr<Film> f)
+FilmEditor::set_film (shared_ptr<Film> film)
 {
-       set_general_sensitivity (f != 0);
+       set_general_sensitivity (film != 0);
 
-       if (_film == f) {
+       if (_film == film) {
                return;
        }
        
-       _film = f;
+       _film = film;
 
        _content_panel->set_film (_film);
        _dcp_panel->set_film (_film);

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 07c64886e2577ee3e1ec9ccecf9c800e7ebaa6c4..a9b0907a1726abb0eab3abc2a9b819d612169f8d 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -120,13 +120,13 @@ FilmViewer::FilmViewer (wxWindow* p)
 }
 
 void
-FilmViewer::set_film (shared_ptr<Film> f)
+FilmViewer::set_film (shared_ptr<Film> film)
 {
-       if (_film == f) {
+       if (_film == film) {
                return;
        }
 
-       _film = f;
+       _film = film;
 
        _frame.reset ();
        
@@ -138,7 +138,7 @@ FilmViewer::set_film (shared_ptr<Film> f)
        }
 
        try {
-               _player.reset (new Player (f));
+               _player.reset (new Player (_film));
        } catch (bad_alloc) {
                error_dialog (this, _("There is not enough free memory to do that."));
                _film.reset ();

diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc
index d275971437fd508f6332f70b84442c73d60d3cff..40f1f3377f9fe8704d14ea88b22d837042aab60b 100644 (file)
--- a/src/wx/hints_dialog.cc
+++ b/src/wx/hints_dialog.cc
@@ -30,9 +30,9 @@
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 
-HintsDialog::HintsDialog (wxWindow* parent, boost::weak_ptr<Film> f)
+HintsDialog::HintsDialog (wxWindow* parent, boost::weak_ptr<Film> film)
        : wxDialog (parent, wxID_ANY, _("Hints"))
-       , _film (f)
+       , _film (film)
 {
        wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
        _text = new wxRichTextCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (400, 300), wxRE_READONLY);
@@ -49,10 +49,10 @@ HintsDialog::HintsDialog (wxWindow* parent, boost::weak_ptr<Film> f)
 
        _text->GetCaret()->Hide ();
 
-       boost::shared_ptr<Film> film = _film.lock ();
-       if (film) {
-               _film_changed_connection = film->Changed.connect (boost::bind (&HintsDialog::film_changed, this));
-               _film_content_changed_connection = film->ContentChanged.connect (boost::bind (&HintsDialog::film_changed, this));
+       boost::shared_ptr<Film> locked_film = _film.lock ();
+       if (locked_film) {
+               _film_changed_connection = locked_film->Changed.connect (boost::bind (&HintsDialog::film_changed, this));
+               _film_content_changed_connection = locked_film->ContentChanged.connect (boost::bind (&HintsDialog::film_changed, this));
        }
 
        film_changed ();

diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 3929cf1c24d1cdb48ad5d96e96905f579be4544c..8c8692aa1acca5c8fc7f6a43d5abdffd0bac19bd 100644 (file)
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -101,15 +101,15 @@ Timeline::film_changed (Film::Property p)
 void
 Timeline::recreate_views ()
 {
-       shared_ptr<const Film> fl = _film.lock ();
-       if (!fl) {
+       shared_ptr<const Film> film = _film.lock ();
+       if (!film) {
                return;
        }
 
        _views.clear ();
        _views.push_back (_time_axis_view);
 
-       ContentList content = fl->content ();
+       ContentList content = film->content ();
 
        for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
                if (dynamic_pointer_cast<VideoContent> (*i)) {

diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc
index 1aa41967abe502c2772d94267db9d410cc42cb07..797af8736989015e19528b5e8dc9f2de303ed7d4 100644 (file)
--- a/test/ffmpeg_dcp_test.cc
+++ b/test/ffmpeg_dcp_test.cc
@@ -57,11 +57,11 @@ BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
 BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test)
 {
        boost::filesystem::path p = test_film_dir ("ffmpeg_dcp_test");
-       shared_ptr<Film> f (new Film (p.string ()));
-       f->read_metadata ();
-       BOOST_CHECK (!f->cpls().empty());
+       shared_ptr<Film> film (new Film (p.string ()));
+       film->read_metadata ();
+       BOOST_CHECK (!film->cpls().empty());
 
-       p /= f->dcp_name();
+       p /= film->dcp_name();
        boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (p);
        while (i != boost::filesystem::directory_iterator() && !boost::algorithm::starts_with (i->path().leaf().string(), "j2c")) {
                ++i;
@@ -71,5 +71,5 @@ BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test)
                boost::filesystem::remove (i->path ());
        }
        
-       BOOST_CHECK (f->cpls().empty());
+       BOOST_CHECK (film->cpls().empty());
 }

diff --git a/test/film_metadata_test.cc b/test/film_metadata_test.cc
index 90f81deb6497ad168450ff24665ef4677eceeb3a..851fffb3f20d8e8a2002b28b140a4890487cc836 100644 (file)
--- a/test/film_metadata_test.cc
+++ b/test/film_metadata_test.cc
@@ -35,18 +35,18 @@ using boost::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (film_metadata_test)
 {
-       shared_ptr<Film> f = new_test_film ("film_metadata_test");
+       shared_ptr<Film> film = new_test_film ("film_metadata_test");
        boost::filesystem::path dir = test_film_dir ("film_metadata_test");
 
-       f->_isdcf_date = boost::gregorian::from_undelimited_string ("20130211");
-       BOOST_CHECK (f->container() == Ratio::from_id ("185"));
-       BOOST_CHECK (f->dcp_content_type() == 0);
+       film->_isdcf_date = boost::gregorian::from_undelimited_string ("20130211");
+       BOOST_CHECK (film->container() == Ratio::from_id ("185"));
+       BOOST_CHECK (film->dcp_content_type() == 0);
 
-       f->set_name ("fred");
-       f->set_dcp_content_type (DCPContentType::from_pretty_name ("Short"));
-       f->set_container (Ratio::from_id ("185"));
-       f->set_j2k_bandwidth (200000000);
-       f->write_metadata ();
+       film->set_name ("fred");
+       film->set_dcp_content_type (DCPContentType::from_pretty_name ("Short"));
+       film->set_container (Ratio::from_id ("185"));
+       film->set_j2k_bandwidth (200000000);
+       film->write_metadata ();
 
        list<string> ignore;
        ignore.push_back ("Key");

diff --git a/test/job_test.cc b/test/job_test.cc
index c1b66d4e01f38f36127c49087c79473cbdb20739..5a554145b4fe2ff7a030b1b3fec87d3028dc64de 100644 (file)
--- a/test/job_test.cc
+++ b/test/job_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-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
@@ -32,8 +32,8 @@ using boost::shared_ptr;
 class TestJob : public Job
 {
 public:
-       TestJob (shared_ptr<Film> f)
-               : Job (f)
+       TestJob (shared_ptr<Film> film)
+               : Job (film)
        {
 
        }
@@ -66,10 +66,10 @@ public:
 
 BOOST_AUTO_TEST_CASE (job_manager_test)
 {
-       shared_ptr<Film> f;
+       shared_ptr<Film> film;
 
        /* Single job */
-       shared_ptr<TestJob> a (new TestJob (f));
+       shared_ptr<TestJob> a (new TestJob (film));
 
        JobManager::instance()->add (a);
        dcpomatic_sleep (1);

diff --git a/test/test.cc b/test/test.cc
index f325aacbc766f1a2b31ed194368d2b51386d5981..bdd17e6a1dc5d66442808754295b792122136e38 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -107,9 +107,9 @@ new_test_film (string name)
                boost::filesystem::remove_all (p);
        }
        
-       shared_ptr<Film> f = shared_ptr<Film> (new Film (p.string()));
-       f->write_metadata ();
-       return f;
+       shared_ptr<Film> film = shared_ptr<Film> (new Film (p.string()));
+       film->write_metadata ();
+       return film;
 }
 
 void