Stop using static initialisation so that dcpomatic::write() can be called more than...

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

diff --git a/src/wx/markers_dialog.h b/src/wx/markers_dialog.h
index a3f3532e5b53a9d666f54cb86b06688e0a0b4c43..22af7126e29d348d1559b6cb3bd38a02020e8809 100644 (file)
--- a/src/wx/markers_dialog.h
+++ b/src/wx/markers_dialog.h
@@ -19,10 +19,10 @@
 */
 
 
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <list>
 #include <memory>
 
@@ -37,6 +37,6 @@ public:
        MarkersDialog (wxWindow* parent, std::weak_ptr<Film> film, std::weak_ptr<FilmViewer> viewer);
 
 private:
-       std::list<std::shared_ptr<Marker> > _markers;
+       std::list<std::shared_ptr<Marker>> _markers;
        std::weak_ptr<Film> _film;
 };