Merge 1.0 in.

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

diff --git a/src/wx/subtitle_panel.h b/src/wx/subtitle_panel.h
index 98c82b7c5463c7e4ff50225995bbdd45ef4e97cd..3f795189593dba1972715760686d4149c7b7db48 100644 (file)
--- a/src/wx/subtitle_panel.h
+++ b/src/wx/subtitle_panel.h
@@ -28,20 +28,16 @@ public:
        SubtitlePanel (FilmEditor *);
 
        void film_changed (Film::Property);
-       void film_content_changed (
-               boost::shared_ptr<Content>,
-               boost::shared_ptr<AudioContent>,
-               boost::shared_ptr<SubtitleContent>,
-               boost::shared_ptr<FFmpegContent>,
-               int);
-
-       void setup_control_sensitivity ();
+       void film_content_changed (boost::shared_ptr<Content>, int);
+
        
 private:
-       void with_subtitles_toggled (wxCommandEvent &);
-       void offset_changed (wxCommandEvent &);
-       void scale_changed (wxCommandEvent &);
-       void stream_changed (wxCommandEvent &);
+       void with_subtitles_toggled ();
+       void offset_changed ();
+       void scale_changed ();
+       void stream_changed ();
+
+       void setup_sensitivity ();
        
        wxCheckBox* _with_subtitles;
        wxSpinCtrl* _offset;