summaryrefslogtreecommitdiff
path: root/src/wx/playlist_controls.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/wx/playlist_controls.cc')
-rw-r--r--src/wx/playlist_controls.cc25
1 files changed, 14 insertions, 11 deletions
diff --git a/src/wx/playlist_controls.cc b/src/wx/playlist_controls.cc
index 3be47ad97..da7976b8d 100644
--- a/src/wx/playlist_controls.cc
+++ b/src/wx/playlist_controls.cc
@@ -18,33 +18,36 @@
*/
-#include "playlist_controls.h"
-#include "film_viewer.h"
-#include "wx_util.h"
+
#include "content_view.h"
#include "dcpomatic_button.h"
+#include "film_viewer.h"
+#include "playlist_controls.h"
#include "static_text.h"
-#include "lib/player_video.h"
-#include "lib/dcp_content.h"
+#include "wx_util.h"
+#include "lib/compose.hpp"
#include "lib/cross.h"
-#include "lib/scoped_temporary.h"
-#include "lib/internet.h"
+#include "lib/dcp_content.h"
#include "lib/ffmpeg_content.h"
-#include "lib/compose.hpp"
+#include "lib/internet.h"
+#include "lib/player_video.h"
+#include "lib/scoped_temporary.h"
#include <dcp/raw_convert.h>
#include <dcp/exceptions.h>
#include <wx/listctrl.h>
#include <wx/progdlg.h>
-using std::string;
+
using std::cout;
+using std::dynamic_pointer_cast;
using std::exception;
-using std::sort;
using std::shared_ptr;
-using std::dynamic_pointer_cast;
+using std::sort;
+using std::string;
using boost::optional;
using namespace dcpomatic;
+
PlaylistControls::PlaylistControls (wxWindow* parent, shared_ptr<FilmViewer> viewer)
: Controls (parent, viewer, false)
, _play_button (new Button(this, _("Play")))