diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-09-29 12:33:08 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-09-30 00:49:35 +0200 |
| commit | a855b3030e511c130992dec8894e0d96fc811d97 (patch) | |
| tree | 7e22531163d8313747fa6eb8ea743eed116a4956 /src/wx/film_viewer.cc | |
| parent | 9751270721fe4560eae0f53ac1e42ad0ebc80028 (diff) | |
Only support GLVideoView when building with wxWidgets >= 3.1.0.
Diffstat (limited to 'src/wx/film_viewer.cc')
| -rw-r--r-- | src/wx/film_viewer.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 0131aa294..22de7b593 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -88,6 +88,7 @@ FilmViewer::FilmViewer (wxWindow* p) : _audio (DCPOMATIC_RTAUDIO_API) , _closed_captions_dialog (new ClosedCaptionsDialog(p, this)) { +#if wxCHECK_VERSION(3, 1, 0) switch (Config::instance()->video_view_type()) { case Config::VIDEO_VIEW_OPENGL: _video_view = std::make_shared<GLVideoView>(this, p); @@ -96,6 +97,9 @@ FilmViewer::FilmViewer (wxWindow* p) _video_view = std::make_shared<SimpleVideoView>(this, p); break; } +#else + _video_view = std::make_shared<SimpleVideoView>(this, p); +#endif _video_view->Sized.connect (boost::bind(&FilmViewer::video_view_sized, this)); _video_view->TooManyDropped.connect (boost::bind(boost::ref(TooManyDropped))); @@ -208,7 +212,11 @@ FilmViewer::recreate_butler () return; } +#if wxCHECK_VERSION(3, 1, 0) auto const j2k_gl_optimised = dynamic_pointer_cast<GLVideoView>(_video_view) && _optimise_for_j2k; +#else + auto const j2k_gl_optimised = false; +#endif _butler = std::make_shared<Butler>( _film, |