diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-05-01 22:45:16 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-05-06 21:31:09 +0100 |
| commit | f986fd6be17b1f84c12e1fd1ecb9185d84c3fa1b (patch) | |
| tree | b4db1a0cc21feafa1550f43379e2df13b7d1ef6c | |
| parent | 194f4ebcf79cbe4824375d7e3d18675143b81dda (diff) | |
Build fixes.
| -rw-r--r-- | src/lib/audio_ring_buffers.h | 2 | ||||
| -rw-r--r-- | src/wx/closed_captions_dialog.h | 2 | ||||
| -rw-r--r-- | src/wx/film_viewer.cc | 1 | ||||
| -rw-r--r-- | src/wx/gl_view.h | 1 | ||||
| -rw-r--r-- | test/silence_padding_test.cc | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/audio_ring_buffers.h b/src/lib/audio_ring_buffers.h index 88cf8d308..bfaad5ec9 100644 --- a/src/lib/audio_ring_buffers.h +++ b/src/lib/audio_ring_buffers.h @@ -35,7 +35,7 @@ public: void put (boost::shared_ptr<const AudioBuffers> data, dcpomatic::DCPTime time, int frame_rate); boost::optional<dcpomatic::DCPTime> get (float* out, int channels, int frames); - boost::optional<dcpomatic:DCPTime> peek () const; + boost::optional<dcpomatic::DCPTime> peek () const; void clear (); Frame size () const; diff --git a/src/wx/closed_captions_dialog.h b/src/wx/closed_captions_dialog.h index 1366018c9..fb4e9d59b 100644 --- a/src/wx/closed_captions_dialog.h +++ b/src/wx/closed_captions_dialog.h @@ -47,5 +47,5 @@ private: std::vector<wxString> _lines; std::vector<DCPTextTrack> _tracks; boost::weak_ptr<Butler> _butler; - DCPTime _last_update; + dcpomatic::DCPTime _last_update; }; diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 29e84aa79..1a311349a 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -318,7 +318,6 @@ bool #ifdef DCPOMATIC_VARIANT_SWAROOP FilmViewer::maybe_draw_background_image (wxPaintDC& dc) { -#ifdef DCPOMATIC_VARIANT_SWAROOP XXX optional<boost::filesystem::path> bg = Config::instance()->player_background_image(); if (bg) { diff --git a/src/wx/gl_view.h b/src/wx/gl_view.h index 42d3ae8c8..dc1d409ad 100644 --- a/src/wx/gl_view.h +++ b/src/wx/gl_view.h @@ -24,6 +24,7 @@ #include <boost/shared_ptr.hpp> #undef None +#undef Success class Image; diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc index 070cb235d..b15f4691b 100644 --- a/test/silence_padding_test.cc +++ b/test/silence_padding_test.cc @@ -141,7 +141,7 @@ BOOST_AUTO_TEST_CASE (silence_padding_test2) BOOST_REQUIRE (!wait_for_jobs()); film->set_video_frame_rate (24); - content->set_trim_start (ContentTime(4003)); + content->set_trim_start (dcpomatic::ContentTime(4003)); film->make_dcp (); BOOST_REQUIRE (!wait_for_jobs()); |