Assorted C++11/formatting cleanups.

4 files changed, 102 insertions, 65 deletions

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index cc18d634d..8805d1311 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -59,17 +59,19 @@ extern "C" {
 #include <iostream>
 #include <iomanip>
 
-using std::string;
-using std::pair;
-using std::min;
-using std::max;
+
+using std::bad_alloc;
 using std::cout;
+using std::dynamic_pointer_cast;
+using std::exception;
 using std::list;
-using std::bad_alloc;
 using std::make_pair;
-using std::exception;
+using std::make_shared;
+using std::max;
+using std::min;
+using std::pair;
 using std::shared_ptr;
-using std::dynamic_pointer_cast;
+using std::string;
 using std::vector;
 using std::weak_ptr;
 using boost::optional;
@@ -79,6 +81,7 @@ using namespace boost::placeholders;
 using dcp::Size;
 using namespace dcpomatic;
 
+
 static
 int
 rtaudio_callback (void* out, void *, unsigned int frames, double, RtAudioStreamStatus, void* data)
@@ -86,18 +89,10 @@ rtaudio_callback (void* out, void *, unsigned int frames, double, RtAudioStreamS
 	return reinterpret_cast<FilmViewer*>(data)->audio_callback (out, frames);
 }
 
+
 FilmViewer::FilmViewer (wxWindow* p)
-	: _coalesce_player_changes (false)
-	, _audio (DCPOMATIC_RTAUDIO_API)
-	, _audio_channels (0)
-	, _audio_block_size (1024)
-	, _playing (false)
-	, _suspended (0)
-	, _latency_history_count (0)
+	: _audio (DCPOMATIC_RTAUDIO_API)
 	, _closed_captions_dialog (new ClosedCaptionsDialog(p, this))
-	, _outline_content (false)
-	, _pad_black (false)
-	, _idle_get (false)
 {
 	switch (Config::instance()->video_view_type()) {
 	case Config::VIDEO_VIEW_OPENGL:
@@ -111,17 +106,19 @@ FilmViewer::FilmViewer (wxWindow* p)
 	_video_view->Sized.connect (boost::bind(&FilmViewer::video_view_sized, this));
 	_video_view->TooManyDropped.connect (boost::bind(&FilmViewer::too_many_frames_dropped, this));
 
-	set_film (shared_ptr<Film> ());
+	set_film (shared_ptr<Film>());
 
-	_config_changed_connection = Config::instance()->Changed.connect (bind (&FilmViewer::config_changed, this, _1));
+	_config_changed_connection = Config::instance()->Changed.connect(bind(&FilmViewer::config_changed, this, _1));
 	config_changed (Config::SOUND_OUTPUT);
 }
 
+
 FilmViewer::~FilmViewer ()
 {
 	stop ();
 }
 
+
 /** Ask for ::get() to be called next time we are idle */
 void
 FilmViewer::request_idle_display_next_frame ()
@@ -135,6 +132,7 @@ FilmViewer::request_idle_display_next_frame ()
 	signal_manager->when_idle (boost::bind(&FilmViewer::idle_handler, this));
 }
 
+
 void
 FilmViewer::idle_handler ()
 {
@@ -150,6 +148,7 @@ FilmViewer::idle_handler ()
 	}
 }
 
+
 void
 FilmViewer::set_film (shared_ptr<Film> film)
 {
@@ -170,7 +169,7 @@ FilmViewer::set_film (shared_ptr<Film> film)
 	}
 
 	try {
-		_player.reset (new Player(_film));
+		_player = make_shared<Player>(_film);
 		_player->set_fast ();
 		if (_dcp_decode_reduction) {
 			_player->set_dcp_decode_reduction (_dcp_decode_reduction);
@@ -203,6 +202,7 @@ FilmViewer::set_film (shared_ptr<Film> film)
 	slow_refresh ();
 }
 
+
 void
 FilmViewer::recreate_butler ()
 {
@@ -214,17 +214,15 @@ FilmViewer::recreate_butler ()
 		return;
 	}
 
-	_butler.reset(
-		new Butler(
-			_film,
-			_player,
-			Config::instance()->audio_mapping(_audio_channels),
-			_audio_channels,
-			bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24),
-			VideoRange::FULL,
-			false,
-			true
-			)
+	_butler = std::make_shared<Butler>(
+		_film,
+		_player,
+		Config::instance()->audio_mapping(_audio_channels),
+		_audio_channels,
+		bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24),
+		VideoRange::FULL,
+		false,
+		true
 		);
 
 	if (!Config::instance()->sound() && !_audio.isStreamOpen()) {
@@ -236,6 +234,7 @@ FilmViewer::recreate_butler ()
 	resume ();
 }
 
+
 void
 FilmViewer::set_outline_content (bool o)
 {
@@ -245,7 +244,7 @@ FilmViewer::set_outline_content (bool o)
 
 
 void
-FilmViewer::set_outline_subtitles (optional<dcpomatic::Rect<double> > rect)
+FilmViewer::set_outline_subtitles (optional<dcpomatic::Rect<double>> rect)
 {
 	_outline_subtitles = rect;
 	_video_view->update ();
@@ -259,6 +258,7 @@ FilmViewer::set_eyes (Eyes e)
 	slow_refresh ();
 }
 
+
 void
 FilmViewer::video_view_sized ()
 {
@@ -268,6 +268,7 @@ FilmViewer::video_view_sized ()
 	}
 }
 
+
 void
 FilmViewer::calculate_sizes ()
 {
@@ -275,10 +276,10 @@ FilmViewer::calculate_sizes ()
 		return;
 	}
 
-	Ratio const * container = _film->container ();
+	auto const container = _film->container ();
 
-	float const view_ratio = float(_video_view->get()->GetSize().x) / _video_view->get()->GetSize().y;
-	float const film_ratio = container ? container->ratio () : 1.78;
+	auto const view_ratio = float(_video_view->get()->GetSize().x) / _video_view->get()->GetSize().y;
+	auto const film_ratio = container ? container->ratio () : 1.78;
 
 	if (view_ratio < film_ratio) {
 		/* panel is less widscreen than the film; clamp width */
@@ -297,6 +298,7 @@ FilmViewer::calculate_sizes ()
 	_player->set_video_container_size (_out_size);
 }
 
+
 void
 FilmViewer::suspend ()
 {
@@ -306,6 +308,7 @@ FilmViewer::suspend ()
 	}
 }
 
+
 void
 FilmViewer::resume ()
 {
@@ -320,6 +323,7 @@ FilmViewer::resume ()
 	}
 }
 
+
 void
 FilmViewer::start ()
 {
@@ -327,7 +331,7 @@ FilmViewer::start ()
 		return;
 	}
 
-	optional<bool> v = PlaybackPermitted ();
+	auto v = PlaybackPermitted ();
 	if (v && !*v) {
 		/* Computer says no */
 		return;
@@ -357,6 +361,7 @@ FilmViewer::start ()
 	_video_view->start ();
 }
 
+
 bool
 FilmViewer::stop ()
 {
@@ -377,6 +382,7 @@ FilmViewer::stop ()
 	return true;
 }
 
+
 void
 FilmViewer::player_change (ChangeType type, int property, bool frequent)
 {
@@ -392,6 +398,7 @@ FilmViewer::player_change (ChangeType type, int property, bool frequent)
 	player_change ({property});
 }
 
+
 void
 FilmViewer::player_change (vector<int> properties)
 {
@@ -427,6 +434,7 @@ FilmViewer::player_change (vector<int> properties)
 	}
 }
 
+
 void
 FilmViewer::film_change (ChangeType type, Film::Property p)
 {
@@ -445,12 +453,14 @@ FilmViewer::film_change (ChangeType type, Film::Property p)
 	}
 }
 
+
 void
 FilmViewer::film_length_change ()
 {
 	_video_view->set_length (_film->length());
 }
 
+
 /** Re-get the current frame slowly by seeking */
 void
 FilmViewer::slow_refresh ()
@@ -458,6 +468,7 @@ FilmViewer::slow_refresh ()
 	seek (_video_view->position(), true);
 }
 
+
 /** Try to re-get the current frame quickly by resetting the metadata
  *  in the PlayerVideo that we used last time.
  *  @return true if this was possible, false if not.
@@ -471,15 +482,17 @@ FilmViewer::quick_refresh ()
 	return _video_view->reset_metadata (_film, _player->video_container_size());
 }
 
+
 void
 FilmViewer::seek (shared_ptr<Content> content, ContentTime t, bool accurate)
 {
-	optional<DCPTime> dt = _player->content_time_to_dcp (content, t);
+	auto dt = _player->content_time_to_dcp (content, t);
 	if (dt) {
 		seek (*dt, accurate);
 	}
 }
 
+
 void
 FilmViewer::set_coalesce_player_changes (bool c)
 {
@@ -491,6 +504,7 @@ FilmViewer::set_coalesce_player_changes (bool c)
 	}
 }
 
+
 void
 FilmViewer::seek (DCPTime t, bool accurate)
 {
@@ -498,11 +512,11 @@ FilmViewer::seek (DCPTime t, bool accurate)
 		return;
 	}
 
-	if (t < DCPTime ()) {
+	if (t < DCPTime()) {
 		t = DCPTime ();
 	}
 
-	if (t >= _film->length ()) {
+	if (t >= _film->length()) {
 		t = _film->length() - one_video_frame();
 	}
 
@@ -526,6 +540,7 @@ FilmViewer::seek (DCPTime t, bool accurate)
 	resume ();
 }
 
+
 void
 FilmViewer::config_changed (Config::Property p)
 {
@@ -584,38 +599,42 @@ FilmViewer::config_changed (Config::Property p)
 	}
 }
 
+
 DCPTime
 FilmViewer::uncorrected_time () const
 {
-	if (_audio.isStreamRunning ()) {
+	if (_audio.isStreamRunning()) {
 		return DCPTime::from_seconds (const_cast<RtAudio*>(&_audio)->getStreamTime());
 	}
 
 	return _video_view->position();
 }
 
+
 optional<DCPTime>
 FilmViewer::audio_time () const
 {
 	if (!_audio.isStreamRunning()) {
-		return optional<DCPTime>();
+		return {};
 	}
 
 	return DCPTime::from_seconds (const_cast<RtAudio*>(&_audio)->getStreamTime ()) -
 		DCPTime::from_frames (average_latency(), _film->audio_frame_rate());
 }
 
+
 DCPTime
 FilmViewer::time () const
 {
 	return audio_time().get_value_or(_video_view->position());
 }
 
+
 int
 FilmViewer::audio_callback (void* out_p, unsigned int frames)
 {
 	while (true) {
-		optional<DCPTime> t = _butler->get_audio (reinterpret_cast<float*> (out_p), frames);
+		auto t = _butler->get_audio (reinterpret_cast<float*> (out_p), frames);
 		if (!t || DCPTime(uncorrected_time() - *t) < one_video_frame()) {
 			/* There was an underrun or this audio is on time; carry on */
 			break;
@@ -634,6 +653,7 @@ FilmViewer::audio_callback (void* out_p, unsigned int frames)
 	return 0;
 }
 
+
 Frame
 FilmViewer::average_latency () const
 {
@@ -650,6 +670,7 @@ FilmViewer::average_latency () const
         return total / _latency_history.size();
 }
 
+
 void
 FilmViewer::set_dcp_decode_reduction (optional<int> reduction)
 {
@@ -659,18 +680,21 @@ FilmViewer::set_dcp_decode_reduction (optional<int> reduction)
 	}
 }
 
+
 optional<int>
 FilmViewer::dcp_decode_reduction () const
 {
 	return _dcp_decode_reduction;
 }
 
+
 DCPTime
 FilmViewer::one_video_frame () const
 {
 	return DCPTime::from_frames (1, _film ? _film->video_frame_rate() : 24);
 }
 
+
 /** Open a dialog box showing our film's closed captions */
 void
 FilmViewer::show_closed_captions ()
@@ -678,18 +702,21 @@ FilmViewer::show_closed_captions ()
 	_closed_captions_dialog->Show();
 }
 
+
 void
 FilmViewer::seek_by (DCPTime by, bool accurate)
 {
 	seek (_video_view->position() + by, accurate);
 }
 
+
 void
 FilmViewer::set_pad_black (bool p)
 {
 	_pad_black = p;
 }
 
+
 /** Called when a player has finished the current film.
  *  May be called from a non-UI thread.
  */
@@ -699,6 +726,7 @@ FilmViewer::finished ()
 	emit (boost::bind(&FilmViewer::ui_finished, this));
 }
 
+
 /** Called by finished() in the UI thread */
 void
 FilmViewer::ui_finished ()
@@ -707,6 +735,7 @@ FilmViewer::ui_finished ()
 	Finished ();
 }
 
+
 int
 FilmViewer::dropped () const
 {
diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 52b97f0f6..0f9967519 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -95,7 +95,7 @@ public:
 	void set_dcp_decode_reduction (boost::optional<int> reduction);
 	boost::optional<int> dcp_decode_reduction () const;
 	void set_outline_content (bool o);
-	void set_outline_subtitles (boost::optional<dcpomatic::Rect<double> >);
+	void set_outline_subtitles (boost::optional<dcpomatic::Rect<double>>);
 	void set_eyes (Eyes e);
 	void set_pad_black (bool p);
 
@@ -121,7 +121,7 @@ public:
 	bool outline_content () const {
 		return _outline_content;
 	}
-	boost::optional<dcpomatic::Rect<double> > outline_subtitles () const {
+	boost::optional<dcpomatic::Rect<double>> outline_subtitles () const {
 		return _outline_subtitles;
 	}
 	bool pad_black () const {
@@ -171,38 +171,38 @@ private:
 	std::shared_ptr<Film> _film;
 	std::shared_ptr<Player> _player;
 
-	VideoView* _video_view;
-	bool _coalesce_player_changes;
+	VideoView* _video_view = nullptr;
+	bool _coalesce_player_changes = false;
 	std::vector<int> _pending_player_changes;
 
 	/** Size of our output (including padding if we have any) */
 	dcp::Size _out_size;
 
 	RtAudio _audio;
-	int _audio_channels;
-	unsigned int _audio_block_size;
-	bool _playing;
-	int _suspended;
+	int _audio_channels = 0;
+	unsigned int _audio_block_size = 1024;
+	bool _playing = false;
+	int _suspended = 0;
 	std::shared_ptr<Butler> _butler;
 
 	std::list<Frame> _latency_history;
 	/** Mutex to protect _latency_history */
 	mutable boost::mutex _latency_history_mutex;
-	int _latency_history_count;
+	int _latency_history_count = 0;
 
 	boost::optional<int> _dcp_decode_reduction;
 
-	ClosedCaptionsDialog* _closed_captions_dialog;
+	ClosedCaptionsDialog* _closed_captions_dialog = nullptr;
 
-	bool _outline_content;
-	boost::optional<dcpomatic::Rect<double> > _outline_subtitles;
+	bool _outline_content = false;
+	boost::optional<dcpomatic::Rect<double>> _outline_subtitles;
 	/** true to pad the viewer panel with black, false to use
 	    the normal window background colour.
 	*/
-	bool _pad_black;
+	bool _pad_black = false;
 
 	/** true if an get() is required next time we are idle */
-	bool _idle_get;
+	bool _idle_get = false;
 
 	boost::signals2::scoped_connection _config_changed_connection;
 };
diff --git a/src/wx/timeline_reels_view.cc b/src/wx/timeline_reels_view.cc
index 962451ac3..cf1abb34f 100644
--- a/src/wx/timeline_reels_view.cc
+++ b/src/wx/timeline_reels_view.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,15 +18,18 @@
 
 */
 
+
 #include "timeline_reels_view.h"
 #include "timeline.h"
 #include <wx/wx.h>
 #include <wx/graphics.h>
 
+
 using std::min;
 using std::list;
 using namespace dcpomatic;
 
+
 TimelineReelsView::TimelineReelsView (Timeline& tl, int y)
 	: TimelineView (tl)
 	, _y (y)
@@ -34,12 +37,14 @@ TimelineReelsView::TimelineReelsView (Timeline& tl, int y)
 
 }
 
+
 dcpomatic::Rect<int>
 TimelineReelsView::bbox () const
 {
 	return dcpomatic::Rect<int> (0, _y - 4, _timeline.width(), 24);
 }
 
+
 void
 TimelineReelsView::set_y (int y)
 {
@@ -47,8 +52,9 @@ TimelineReelsView::set_y (int y)
 	force_redraw ();
 }
 
+
 void
-TimelineReelsView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int> >)
+TimelineReelsView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>>)
 {
 	if (!_timeline.pixels_per_second()) {
 		return;
@@ -58,7 +64,7 @@ TimelineReelsView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int> >)
 
 	gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 255), 1, wxPENSTYLE_SOLID));
 
-	wxGraphicsPath path = gc->CreatePath ();
+	auto path = gc->CreatePath ();
 	path.MoveToPoint (time_x (DCPTime (0)), _y);
 	path.AddLineToPoint (time_x (_timeline.film()->length()), _y);
 	gc->StrokePath (path);
@@ -69,7 +75,7 @@ TimelineReelsView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int> >)
 	for (auto i: _timeline.film()->reels()) {
 		int const size = min (8.0, i.duration().seconds() * pps / 2);
 
-		wxGraphicsPath path = gc->CreatePath ();
+		auto path = gc->CreatePath ();
 		path.MoveToPoint (time_x (i.from) + size, _y + size / 2);
 		path.AddLineToPoint (time_x (i.from), _y);
 		path.AddLineToPoint (time_x (i.from) + size, _y - size / 2);
@@ -81,17 +87,17 @@ TimelineReelsView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int> >)
 		path.AddLineToPoint (time_x (i.to) - size, _y - size / 2);
 		gc->StrokePath (path);
 
-		wxString str = wxString::Format (_("Reel %d"), reel++);
+		auto str = wxString::Format (_("Reel %d"), reel++);
 		wxDouble str_width;
 		wxDouble str_height;
 		wxDouble str_descent;
 		wxDouble str_leading;
 		gc->GetTextExtent (str, &str_width, &str_height, &str_descent, &str_leading);
 
-		int const available_width = time_x (DCPTime (i.to.get())) - time_x (DCPTime (i.from.get()));
+		int const available_width = time_x(DCPTime(i.to.get())) - time_x(DCPTime(i.from.get()));
 
 		if (available_width > str_width) {
-			gc->DrawText (str, time_x (DCPTime (i.from.get())) + (available_width - str_width) / 2, _y + 4);
+			gc->DrawText (str, time_x(DCPTime(i.from.get())) + (available_width - str_width) / 2, _y + 4);
 		}
 	}
 }
diff --git a/src/wx/timeline_reels_view.h b/src/wx/timeline_reels_view.h
index c31045651..a6c73100f 100644
--- a/src/wx/timeline_reels_view.h
+++ b/src/wx/timeline_reels_view.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,8 +18,10 @@
 
 */
 
+
 #include "timeline_view.h"
 
+
 class TimelineReelsView : public TimelineView
 {
 public:
@@ -29,7 +31,7 @@ public:
 	void set_y (int y);
 
 private:
-	void do_paint (wxGraphicsContext* gc, std::list<dcpomatic::Rect<int> > overlaps);
+	void do_paint (wxGraphicsContext* gc, std::list<dcpomatic::Rect<int>> overlaps);
 
 	int _y;
 };