projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Just call it the Combiner not the DCP Combiner.
[dcpomatic.git]
/
src
/
wx
/
standard_controls.cc
diff --git
a/src/wx/standard_controls.cc
b/src/wx/standard_controls.cc
index 1e4ecc8d7fc74e5469c76759272110d209f42f1d..de63c2fce8da83ab32e74aa6708ff3eca3c07960 100644
(file)
--- a/
src/wx/standard_controls.cc
+++ b/
src/wx/standard_controls.cc
@@
-21,14
+21,17
@@
#include "film_viewer.h"
#include "standard_controls.h"
#include "film_viewer.h"
#include "standard_controls.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/tglbtn.h>
#include <wx/wx.h>
#include <wx/tglbtn.h>
#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
using std::shared_ptr;
using std::shared_ptr;
-StandardControls::StandardControls
(wxWindow* parent, shared_ptr<FilmViewer>
viewer, bool editor_controls)
+StandardControls::StandardControls
(wxWindow* parent, FilmViewer&
viewer, bool editor_controls)
: Controls (parent, viewer, editor_controls)
, _play_button (new wxToggleButton(this, wxID_ANY, _("Play")))
{
: Controls (parent, viewer, editor_controls)
, _play_button (new wxToggleButton(this, wxID_ANY, _("Play")))
{
@@
-68,9
+71,9
@@
StandardControls::check_play_state ()
}
if (_play_button->GetValue()) {
}
if (_play_button->GetValue()) {
- _viewer
->start
();
+ _viewer
.start
();
} else {
} else {
- _viewer
->stop
();
+ _viewer
.stop
();
}
}
}
}