projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix up SimpleVideoView.
[dcpomatic.git]
/
src
/
wx
/
film_viewer.cc
diff --git
a/src/wx/film_viewer.cc
b/src/wx/film_viewer.cc
index 1f718fa581c8a348b977b6587983a411d50a4115..5b2c5ff95abc78f21a9cbf47314bb9cef4f3eed5 100644
(file)
--- a/
src/wx/film_viewer.cc
+++ b/
src/wx/film_viewer.cc
@@
-28,6
+28,7
@@
#include "wx_util.h"
#include "closed_captions_dialog.h"
#include "gl_video_view.h"
#include "wx_util.h"
#include "closed_captions_dialog.h"
#include "gl_video_view.h"
+#include "simple_video_view.h"
#include "lib/film.h"
#include "lib/ratio.h"
#include "lib/util.h"
#include "lib/film.h"
#include "lib/ratio.h"
#include "lib/util.h"
@@
-79,7
+80,8
@@
rtaudio_callback (void* out, void *, unsigned int frames, double, RtAudioStreamS
FilmViewer::FilmViewer (wxWindow* p)
/* XXX: make this configurable */
FilmViewer::FilmViewer (wxWindow* p)
/* XXX: make this configurable */
- : _video_view (new GLVideoView(p))
+// : _video_view (new GLVideoView(p))
+ : _video_view (new SimpleVideoView(this, p))
, _coalesce_player_changes (false)
, _audio (DCPOMATIC_RTAUDIO_API)
, _audio_channels (0)
, _coalesce_player_changes (false)
, _audio (DCPOMATIC_RTAUDIO_API)
, _audio_channels (0)