macOS / new boost build fixes.

[dcpomatic.git] / src / wx / text_view.h

diff --git a/src/wx/text_view.h b/src/wx/text_view.h
index 1fe07a99919f14b588edcc37ffe69351d02aad85..d360838a834327ea5063d6d821dd1c6e65774691 100644 (file)
--- a/src/wx/text_view.h
+++ b/src/wx/text_view.h
@@ -19,7 +19,10 @@
 */
 
 #include "lib/content_text.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
@@ -42,14 +45,14 @@ public:
 
 private:
        void data_start (ContentStringText cts);
-       void data_stop (ContentTime time);
+       void data_stop (dcpomatic::ContentTime time);
        void subtitle_selected (wxListEvent &);
 
        wxListCtrl* _list;
        int _subs;
        boost::optional<FrameRateChange> _frc;
        boost::optional<int> _last_count;
-       std::vector<ContentTime> _start_times;
+       std::vector<dcpomatic::ContentTime> _start_times;
        boost::weak_ptr<Content> _content;
        boost::weak_ptr<FilmViewer> _film_viewer;
 };