White space: playlist_controls.{cc,h}

2 files changed, 143 insertions, 143 deletions

diff --git a/src/wx/playlist_controls.cc b/src/wx/playlist_controls.cc
index ef9dd2213..20bdd1658 100644
--- a/src/wx/playlist_controls.cc
+++ b/src/wx/playlist_controls.cc
@@ -54,179 +54,179 @@ using namespace dcpomatic;
 
 
 PlaylistControls::PlaylistControls(wxWindow* parent, FilmViewer& viewer)
-	: Controls (parent, viewer, false)
-	, _play_button (new Button(this, _("Play")))
-	, _pause_button (new Button(this, _("Pause")))
-	, _stop_button (new Button(this, _("Stop")))
+	: Controls(parent, viewer, false)
+	, _play_button(new Button(this, _("Play")))
+	, _pause_button(new Button(this, _("Pause")))
+	, _stop_button(new Button(this, _("Stop")))
 	, _next_button(new Button(this, _("Next")))
 	, _previous_button(new Button(this, _("Previous")))
 {
-	_button_sizer->Add (_previous_button, 0, wxEXPAND);
-	_button_sizer->Add (_play_button, 0, wxEXPAND);
-	_button_sizer->Add (_pause_button, 0, wxEXPAND);
-	_button_sizer->Add (_stop_button, 0, wxEXPAND);
-	_button_sizer->Add (_next_button, 0, wxEXPAND);
+	_button_sizer->Add(_previous_button, 0, wxEXPAND);
+	_button_sizer->Add(_play_button, 0, wxEXPAND);
+	_button_sizer->Add(_pause_button, 0, wxEXPAND);
+	_button_sizer->Add(_stop_button, 0, wxEXPAND);
+	_button_sizer->Add(_next_button, 0, wxEXPAND);
 
-	_spl_view = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER);
+	_spl_view = new wxListCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER);
 	_spl_view->AppendColumn({}, wxLIST_FORMAT_LEFT, 740);
 
 	auto left_sizer = new wxBoxSizer(wxVERTICAL);
 	auto e_sizer = new wxBoxSizer(wxHORIZONTAL);
 
-	wxFont subheading_font (*wxNORMAL_FONT);
-	subheading_font.SetWeight (wxFONTWEIGHT_BOLD);
+	wxFont subheading_font(*wxNORMAL_FONT);
+	subheading_font.SetWeight(wxFONTWEIGHT_BOLD);
 
 	auto spl_header = new wxBoxSizer(wxHORIZONTAL);
 	{
 		auto m = new StaticText(this, _("Playlists"));
-		m->SetFont (subheading_font);
-		spl_header->Add (m, 1, wxALIGN_CENTER_VERTICAL);
+		m->SetFont(subheading_font);
+		spl_header->Add(m, 1, wxALIGN_CENTER_VERTICAL);
 	}
 	_refresh_spl_view = new Button(this, _("Refresh"));
-	spl_header->Add (_refresh_spl_view, 0, wxBOTTOM, DCPOMATIC_SIZER_GAP / 2);
+	spl_header->Add(_refresh_spl_view, 0, wxBOTTOM, DCPOMATIC_SIZER_GAP / 2);
 
-	left_sizer->Add (spl_header, 0, wxLEFT | wxRIGHT | wxEXPAND, DCPOMATIC_SIZER_GAP);
-	left_sizer->Add (_spl_view, 1, wxLEFT | wxRIGHT | wxBOTTOM | wxEXPAND, DCPOMATIC_SIZER_GAP);
+	left_sizer->Add(spl_header, 0, wxLEFT | wxRIGHT | wxEXPAND, DCPOMATIC_SIZER_GAP);
+	left_sizer->Add(_spl_view, 1, wxLEFT | wxRIGHT | wxBOTTOM | wxEXPAND, DCPOMATIC_SIZER_GAP);
 
-	_content_view = new ContentView (this);
+	_content_view = new ContentView(this);
 
 	auto content_header = new wxBoxSizer(wxHORIZONTAL);
 	{
 		auto m = new StaticText(this, _("Content"));
-		m->SetFont (subheading_font);
-		content_header->Add (m, 1, wxALIGN_CENTER_VERTICAL);
+		m->SetFont(subheading_font);
+		content_header->Add(m, 1, wxALIGN_CENTER_VERTICAL);
 	}
 	_refresh_content_view = new Button(this, _("Refresh"));
-	content_header->Add (_refresh_content_view, 0, wxBOTTOM, DCPOMATIC_SIZER_GAP / 2);
+	content_header->Add(_refresh_content_view, 0, wxBOTTOM, DCPOMATIC_SIZER_GAP / 2);
 
-	left_sizer->Add (content_header, 0, wxTOP | wxLEFT | wxRIGHT | wxEXPAND, DCPOMATIC_SIZER_GAP);
-	left_sizer->Add (_content_view, 1, wxLEFT | wxRIGHT | wxBOTTOM | wxEXPAND, DCPOMATIC_SIZER_GAP);
+	left_sizer->Add(content_header, 0, wxTOP | wxLEFT | wxRIGHT | wxEXPAND, DCPOMATIC_SIZER_GAP);
+	left_sizer->Add(_content_view, 1, wxLEFT | wxRIGHT | wxBOTTOM | wxEXPAND, DCPOMATIC_SIZER_GAP);
 
-	_current_spl_view = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER);
+	_current_spl_view = new wxListCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER);
 	_current_spl_view->AppendColumn({}, wxLIST_FORMAT_LEFT, 500);
 	_current_spl_view->AppendColumn({}, wxLIST_FORMAT_LEFT, 80);
-	e_sizer->Add (left_sizer, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
-	e_sizer->Add (_current_spl_view, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
-
-	_v_sizer->Add (e_sizer, 1, wxEXPAND);
-
-	_play_button->Bind     (wxEVT_BUTTON, boost::bind(&PlaylistControls::play_clicked,  this));
-	_pause_button->Bind    (wxEVT_BUTTON, boost::bind(&PlaylistControls::pause_clicked, this));
-	_stop_button->Bind     (wxEVT_BUTTON, boost::bind(&PlaylistControls::stop_clicked,  this));
-	_next_button->Bind     (wxEVT_BUTTON, boost::bind(&PlaylistControls::next_clicked,  this));
-	_previous_button->Bind (wxEVT_BUTTON, boost::bind(&PlaylistControls::previous_clicked,  this));
-	_spl_view->Bind        (wxEVT_LIST_ITEM_SELECTED,   boost::bind(&PlaylistControls::spl_selection_changed, this));
-	_spl_view->Bind        (wxEVT_LIST_ITEM_DESELECTED, boost::bind(&PlaylistControls::spl_selection_changed, this));
+	e_sizer->Add(left_sizer, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
+	e_sizer->Add(_current_spl_view, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
+
+	_v_sizer->Add(e_sizer, 1, wxEXPAND);
+
+	_play_button->Bind    (wxEVT_BUTTON, boost::bind(&PlaylistControls::play_clicked,  this));
+	_pause_button->Bind   (wxEVT_BUTTON, boost::bind(&PlaylistControls::pause_clicked, this));
+	_stop_button->Bind    (wxEVT_BUTTON, boost::bind(&PlaylistControls::stop_clicked,  this));
+	_next_button->Bind    (wxEVT_BUTTON, boost::bind(&PlaylistControls::next_clicked,  this));
+	_previous_button->Bind(wxEVT_BUTTON, boost::bind(&PlaylistControls::previous_clicked,  this));
+	_spl_view->Bind       (wxEVT_LIST_ITEM_SELECTED,   boost::bind(&PlaylistControls::spl_selection_changed, this));
+	_spl_view->Bind       (wxEVT_LIST_ITEM_DESELECTED, boost::bind(&PlaylistControls::spl_selection_changed, this));
 	_viewer.Finished.connect(boost::bind(&PlaylistControls::viewer_finished, this));
-	_refresh_spl_view->Bind (wxEVT_BUTTON, boost::bind(&PlaylistControls::update_playlist_directory, this));
-	_refresh_content_view->Bind (wxEVT_BUTTON, boost::bind(&ContentView::update, _content_view));
+	_refresh_spl_view->Bind(wxEVT_BUTTON, boost::bind(&PlaylistControls::update_playlist_directory, this));
+	_refresh_content_view->Bind(wxEVT_BUTTON, boost::bind(&ContentView::update, _content_view));
 
-	_content_view->update ();
-	update_playlist_directory ();
+	_content_view->update();
+	update_playlist_directory();
 }
 
 void
-PlaylistControls::started ()
+PlaylistControls::started()
 {
-	Controls::started ();
-	_play_button->Enable (false);
-	_pause_button->Enable (true);
+	Controls::started();
+	_play_button->Enable(false);
+	_pause_button->Enable(true);
 }
 
 /** Called when the viewer finishes a single piece of content, or it is explicitly stopped */
 void
-PlaylistControls::stopped ()
+PlaylistControls::stopped()
 {
-	Controls::stopped ();
-	_play_button->Enable (true);
-	_pause_button->Enable (false);
+	Controls::stopped();
+	_play_button->Enable(true);
+	_pause_button->Enable(false);
 }
 
 void
-PlaylistControls::deselect_playlist ()
+PlaylistControls::deselect_playlist()
 {
-	long int const selected = _spl_view->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+	long int const selected = _spl_view->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 	if (selected != -1) {
 		_selected_playlist = boost::none;
-		_spl_view->SetItemState (selected, 0, wxLIST_STATE_SELECTED);
+		_spl_view->SetItemState(selected, 0, wxLIST_STATE_SELECTED);
 	}
 	ResetFilm(std::make_shared<Film>(optional<boost::filesystem::path>()), {});
 }
 
 void
-PlaylistControls::play_clicked ()
+PlaylistControls::play_clicked()
 {
 	_viewer.start();
 }
 
 void
-PlaylistControls::setup_sensitivity ()
+PlaylistControls::setup_sensitivity()
 {
-	Controls::setup_sensitivity ();
+	Controls::setup_sensitivity();
 	bool const active_job = _active_job && *_active_job != "examine_content";
 	bool const c = _film && !_film->content().empty() && !active_job;
 	_play_button->Enable(c && !_viewer.playing());
 	_pause_button->Enable(_viewer.playing());
 	_spl_view->Enable(!_viewer.playing());
-	_next_button->Enable (can_do_next());
-	_previous_button->Enable (can_do_previous());
+	_next_button->Enable(can_do_next());
+	_previous_button->Enable(can_do_previous());
 }
 
 void
-PlaylistControls::pause_clicked ()
+PlaylistControls::pause_clicked()
 {
 	_viewer.stop();
 }
 
 void
-PlaylistControls::stop_clicked ()
+PlaylistControls::stop_clicked()
 {
 	_viewer.stop();
 	_viewer.seek(DCPTime(), true);
 	if (_selected_playlist) {
 		_selected_playlist_position = 0;
-		update_current_content ();
+		update_current_content();
 	}
-	deselect_playlist ();
+	deselect_playlist();
 }
 
 bool
-PlaylistControls::can_do_previous ()
+PlaylistControls::can_do_previous()
 {
 	return _selected_playlist && (_selected_playlist_position - 1) >= 0;
 }
 
 void
-PlaylistControls::previous_clicked ()
+PlaylistControls::previous_clicked()
 {
-	if (!can_do_previous ()) {
+	if (!can_do_previous()) {
 		return;
 	}
 
 	_selected_playlist_position--;
-	update_current_content ();
+	update_current_content();
 }
 
 bool
-PlaylistControls::can_do_next ()
+PlaylistControls::can_do_next()
 {
 	return _selected_playlist && (_selected_playlist_position + 1) < int(_playlists[*_selected_playlist].get().size());
 }
 
 void
-PlaylistControls::next_clicked ()
+PlaylistControls::next_clicked()
 {
-	if (!can_do_next ()) {
+	if (!can_do_next()) {
 		return;
 	}
 
 	_selected_playlist_position++;
-	update_current_content ();
+	update_current_content();
 }
 
 
 void
-PlaylistControls::add_playlist_to_list (SPL spl)
+PlaylistControls::add_playlist_to_list(SPL spl)
 {
 	int const N = _spl_view->GetItemCount();
 
@@ -237,8 +237,8 @@ PlaylistControls::add_playlist_to_list (SPL spl)
 	if (spl.missing()) {
 		t += " (content missing)";
 	}
-	it.SetText (std_to_wx(t));
-	_spl_view->InsertItem (it);
+	it.SetText(std_to_wx(t));
+	_spl_view->InsertItem(it);
 }
 
 struct SPLComparator
@@ -249,40 +249,40 @@ struct SPLComparator
 };
 
 void
-PlaylistControls::update_playlist_directory ()
+PlaylistControls::update_playlist_directory()
 {
 	using namespace boost::filesystem;
 
-	_spl_view->DeleteAllItems ();
+	_spl_view->DeleteAllItems();
 	optional<path> dir = Config::instance()->player_playlist_directory();
 	if (!dir) {
 		return;
 	}
 
-	_playlists.clear ();
+	_playlists.clear();
 
 	for (directory_iterator i = directory_iterator(*dir); i != directory_iterator(); ++i) {
 		try {
 			if (is_regular_file(i->path()) && i->path().extension() == ".xml") {
 				SPL spl;
-				spl.read (i->path(), _content_view);
-				_playlists.push_back (spl);
+				spl.read(i->path(), _content_view);
+				_playlists.push_back(spl);
 			}
 		} catch (exception& e) {
 			/* Never mind */
 		}
 	}
 
-	sort (_playlists.begin(), _playlists.end(), SPLComparator());
+	sort(_playlists.begin(), _playlists.end(), SPLComparator());
 	for (auto i: _playlists) {
-		add_playlist_to_list (i);
+		add_playlist_to_list(i);
 	}
 
 	_selected_playlist = boost::none;
 }
 
 optional<dcp::EncryptedKDM>
-PlaylistControls::get_kdm_from_directory (shared_ptr<DCPContent> dcp)
+PlaylistControls::get_kdm_from_directory(shared_ptr<DCPContent> dcp)
 {
 	using namespace boost::filesystem;
 	optional<path> kdm_dir = Config::instance()->player_kdm_directory();
@@ -292,7 +292,7 @@ PlaylistControls::get_kdm_from_directory (shared_ptr<DCPContent> dcp)
 	for (directory_iterator i = directory_iterator(*kdm_dir); i != directory_iterator(); ++i) {
 		try {
 			if (file_size(i->path()) < MAX_KDM_SIZE) {
-				dcp::EncryptedKDM kdm (dcp::file_to_string(i->path()));
+				dcp::EncryptedKDM kdm(dcp::file_to_string(i->path()));
 				if (kdm.cpl_id() == dcp->cpl()) {
 					return kdm;
 				}
@@ -305,18 +305,18 @@ PlaylistControls::get_kdm_from_directory (shared_ptr<DCPContent> dcp)
 }
 
 void
-PlaylistControls::spl_selection_changed ()
+PlaylistControls::spl_selection_changed()
 {
-	long int selected = _spl_view->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+	long int selected = _spl_view->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 	if (selected == -1) {
-		_current_spl_view->DeleteAllItems ();
+		_current_spl_view->DeleteAllItems();
 		_selected_playlist = boost::none;
 		return;
 	}
 
 	if (_playlists[selected].missing()) {
 		error_dialog(this, _("This playlist cannot be loaded as some content is missing."));
-		deselect_playlist ();
+		deselect_playlist();
 		return;
 	}
 
@@ -325,23 +325,23 @@ PlaylistControls::spl_selection_changed ()
 		return;
 	}
 
-	select_playlist (selected, 0);
+	select_playlist(selected, 0);
 }
 
 void
-PlaylistControls::select_playlist (int selected, int position)
+PlaylistControls::select_playlist(int selected, int position)
 {
 	wxProgressDialog dialog(variant::wx::dcpomatic(), _("Loading playlist and KDMs"));
 
 	for (auto const& i: _playlists[selected].get()) {
-		dialog.Pulse ();
-		shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (i.content);
+		dialog.Pulse();
+		shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent>(i.content);
 		if (dcp && dcp->needs_kdm()) {
 			optional<dcp::EncryptedKDM> kdm;
-			kdm = get_kdm_from_directory (dcp);
+			kdm = get_kdm_from_directory(dcp);
 			if (kdm) {
 				try {
-					dcp->add_kdm (*kdm);
+					dcp->add_kdm(*kdm);
 					dcp->examine(_film, shared_ptr<Job>(), true);
 				} catch (KDMError& e) {
 					error_dialog(this, _("Could not load KDM."));
@@ -350,36 +350,36 @@ PlaylistControls::select_playlist (int selected, int position)
 			if (dcp->needs_kdm()) {
 				/* We didn't get a KDM for this */
 				error_dialog(this, _("This playlist cannot be loaded as a KDM is missing or incorrect."));
-				deselect_playlist ();
+				deselect_playlist();
 				return;
 			}
 		}
 	}
 
-	_current_spl_view->DeleteAllItems ();
+	_current_spl_view->DeleteAllItems();
 
 	int N = 0;
 	for (auto i: _playlists[selected].get()) {
 		wxListItem it;
-		it.SetId (N);
-		it.SetColumn (0);
-		it.SetText (std_to_wx(i.name));
-		_current_spl_view->InsertItem (it);
+		it.SetId(N);
+		it.SetColumn(0);
+		it.SetText(std_to_wx(i.name));
+		_current_spl_view->InsertItem(it);
 		++N;
 	}
 
 	_selected_playlist = selected;
 	_selected_playlist_position = position;
- 	dialog.Pulse ();
-	reset_film ();
- 	dialog.Pulse ();
-	update_current_content ();
+ 	dialog.Pulse();
+	reset_film();
+ 	dialog.Pulse();
+	update_current_content();
 }
 
 void
-PlaylistControls::reset_film ()
+PlaylistControls::reset_film()
 {
-	DCPOMATIC_ASSERT (_selected_playlist);
+	DCPOMATIC_ASSERT(_selected_playlist);
 	auto film = std::make_shared<Film>(optional<boost::filesystem::path>());
 	auto entry = _playlists[*_selected_playlist].get(_selected_playlist_position);
 	film->add_content(vector<shared_ptr<Content>>{entry.content});
@@ -387,33 +387,33 @@ PlaylistControls::reset_film ()
 }
 
 void
-PlaylistControls::config_changed (int property)
+PlaylistControls::config_changed(int property)
 {
-	Controls::config_changed (property);
+	Controls::config_changed(property);
 
 	if (property == Config::PLAYER_CONTENT_DIRECTORY) {
-		_content_view->update ();
+		_content_view->update();
 	} else if (property == Config::PLAYER_PLAYLIST_DIRECTORY) {
-		update_playlist_directory ();
+		update_playlist_directory();
 	}
 }
 
 
 void
-PlaylistControls::update_current_content ()
+PlaylistControls::update_current_content()
 {
-	DCPOMATIC_ASSERT (_selected_playlist);
+	DCPOMATIC_ASSERT(_selected_playlist);
 
 	wxProgressDialog dialog(variant::wx::dcpomatic(), _("Loading content"));
 
-	setup_sensitivity ();
-	dialog.Pulse ();
-	reset_film ();
+	setup_sensitivity();
+	dialog.Pulse();
+	reset_film();
 }
 
 /** One piece of content in our SPL has finished playing */
 void
-PlaylistControls::viewer_finished ()
+PlaylistControls::viewer_finished()
 {
 	if (!_selected_playlist) {
 		return;
@@ -422,25 +422,25 @@ PlaylistControls::viewer_finished ()
 	_selected_playlist_position++;
 	if (_selected_playlist_position < int(_playlists[*_selected_playlist].get().size())) {
 		/* Next piece of content on the SPL */
-		update_current_content ();
+		update_current_content();
 		_viewer.start();
 	} else {
 		/* Finished the whole SPL */
 		_selected_playlist_position = 0;
 		ResetFilm(std::make_shared<Film>(optional<boost::filesystem::path>()), {});
-		_play_button->Enable (true);
-		_pause_button->Enable (false);
+		_play_button->Enable(true);
+		_pause_button->Enable(false);
 	}
 }
 
 void
-PlaylistControls::play ()
+PlaylistControls::play()
 {
-	play_clicked ();
+	play_clicked();
 }
 
 void
-PlaylistControls::stop ()
+PlaylistControls::stop()
 {
-	stop_clicked ();
+	stop_clicked();
 }
diff --git a/src/wx/playlist_controls.h b/src/wx/playlist_controls.h
index d3f9c038e..e99e54b65 100644
--- a/src/wx/playlist_controls.h
+++ b/src/wx/playlist_controls.h
@@ -37,32 +37,32 @@ public:
 	*/
 	boost::signals2::signal<void (std::weak_ptr<Film>, boost::optional<float>)> ResetFilm;
 
-	void play () override;
-	void stop () override;
+	void play() override;
+	void stop() override;
 
 private:
-	void play_clicked ();
-	void pause_clicked ();
-	void stop_clicked ();
-	void next_clicked ();
-	void previous_clicked ();
-	void add_playlist_to_list (SPL spl);
-	void update_content_directory ();
-	void update_playlist_directory ();
-	void spl_selection_changed ();
-	void select_playlist (int selected, int position);
-	void started () override;
-	void stopped () override;
-	void setup_sensitivity () override;
-	void config_changed (int) override;
-	void viewer_finished ();
-	void reset_film ();
-	void update_current_content ();
-	bool can_do_previous ();
-	bool can_do_next ();
-	void deselect_playlist ();
-
-	boost::optional<dcp::EncryptedKDM> get_kdm_from_directory (std::shared_ptr<DCPContent> dcp);
+	void play_clicked();
+	void pause_clicked();
+	void stop_clicked();
+	void next_clicked();
+	void previous_clicked();
+	void add_playlist_to_list(SPL spl);
+	void update_content_directory();
+	void update_playlist_directory();
+	void spl_selection_changed();
+	void select_playlist(int selected, int position);
+	void started() override;
+	void stopped() override;
+	void setup_sensitivity() override;
+	void config_changed(int) override;
+	void viewer_finished();
+	void reset_film();
+	void update_current_content();
+	bool can_do_previous();
+	bool can_do_next();
+	void deselect_playlist();
+
+	boost::optional<dcp::EncryptedKDM> get_kdm_from_directory(std::shared_ptr<DCPContent> dcp);
 
 	wxButton* _play_button;
 	wxButton* _pause_button;