C++11 tidying.

[dcpomatic.git] / src / wx / standard_controls.cc

diff --git a/src/wx/standard_controls.cc b/src/wx/standard_controls.cc
index e9a31c86b059d94fb2c802b5f46d63ae8488e421..1e4ecc8d7fc74e5469c76759272110d209f42f1d 100644 (file)
--- a/src/wx/standard_controls.cc
+++ b/src/wx/standard_controls.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,21 +18,25 @@
 
 */
 
-#include "standard_controls.h"
+
 #include "film_viewer.h"
-#include <wx/wx.h>
+#include "standard_controls.h"
 #include <wx/tglbtn.h>
+#include <wx/wx.h>
+
+
+using std::shared_ptr;
 
-using boost::shared_ptr;
 
 StandardControls::StandardControls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor_controls)
        : Controls (parent, viewer, editor_controls)
        , _play_button (new wxToggleButton(this, wxID_ANY, _("Play")))
 {
-       _button_sizer->Add (_play_button, 0, wxEXPAND);
+       _button_sizer->Add (_play_button, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2);
        _play_button->Bind (wxEVT_TOGGLEBUTTON, boost::bind(&StandardControls::play_clicked, this));
 }
 
+
 void
 StandardControls::started ()
 {
@@ -40,6 +44,7 @@ StandardControls::started ()
        _play_button->SetValue (true);
 }
 
+
 void
 StandardControls::stopped ()
 {
@@ -47,12 +52,14 @@ StandardControls::stopped ()
        _play_button->SetValue (false);
 }
 
+
 void
 StandardControls::play_clicked ()
 {
        check_play_state ();
 }
 
+
 void
 StandardControls::check_play_state ()
 {
@@ -67,6 +74,7 @@ StandardControls::check_play_state ()
        }
 }
 
+
 void
 StandardControls::setup_sensitivity ()
 {
@@ -75,7 +83,7 @@ StandardControls::setup_sensitivity ()
        _play_button->Enable (_film && !_film->content().empty() && !active_job);
 }
 
-#ifdef DCPOMATIC_PLAYER_STRESS_TEST
+
 void
 StandardControls::play ()
 {
@@ -83,10 +91,10 @@ StandardControls::play ()
        play_clicked ();
 }
 
+
 void
 StandardControls::stop ()
 {
        _play_button->SetValue (false);
        play_clicked ();
 }
-#endif