Change re{set,fresh}_metadata to take a film and a size from the player.

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

diff --git a/src/wx/subtitle_appearance_dialog.h b/src/wx/subtitle_appearance_dialog.h
index 0b3c661326c95feb81b9800f643b6f9c8e35b508..b0dd8d30723775a852eb66234e7f25968c382e28 100644 (file)
--- a/src/wx/subtitle_appearance_dialog.h
+++ b/src/wx/subtitle_appearance_dialog.h
@@ -20,7 +20,10 @@
 
 #include "timecode.h"
 #include "lib/rgba.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 
@@ -58,9 +61,9 @@ private:
        wxCheckBox* _force_effect_colour;
        wxColourPickerCtrl* _effect_colour;
        wxCheckBox* _force_fade_in;
-       Timecode<ContentTime>* _fade_in;
+       Timecode<dcpomatic::ContentTime>* _fade_in;
        wxCheckBox* _force_fade_out;
-       Timecode<ContentTime>* _fade_out;
+       Timecode<dcpomatic::ContentTime>* _fade_out;
        wxSpinCtrl* _outline_width;
        wxGridBagSizer* _table;
        std::map<RGBA, RGBAColourPicker*> _pickers;