projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use std::vector for add_files.
[dcpomatic.git]
/
src
/
wx
/
standard_controls.h
diff --git
a/src/wx/standard_controls.h
b/src/wx/standard_controls.h
index f79e4a17896443a367b1d9fb37f516ffda855063..191924509b1a09aac1d45e23ebcd4403deb30a7d 100644
(file)
--- a/
src/wx/standard_controls.h
+++ b/
src/wx/standard_controls.h
@@
-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.
This file is part of DCP-o-matic.
@@
-18,17
+18,17
@@
*/
*/
+
#include "controls.h"
#include "controls.h"
+
class StandardControls : public Controls
{
public:
class StandardControls : public Controls
{
public:
- StandardControls (wxWindow* parent,
boost
::shared_ptr<FilmViewer> viewer, bool editor_controls);
+ StandardControls (wxWindow* parent,
std
::shared_ptr<FilmViewer> viewer, bool editor_controls);
-#ifdef DCPOMATIC_PLAYER_STRESS_TEST
void play ();
void stop ();
void play ();
void stop ();
-#endif
private:
void check_play_state ();
private:
void check_play_state ();