Merge branch '1.0' into 1.0-multiple-selection

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

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 9808e0d2f8f76aaa7f2729d53bfb27135d5833c7..7fd61e5fc5650e7e31e0ad585d566c5362c8e460 100644 (file)
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -66,6 +66,7 @@ public:
        VideoContentList selected_video_content ();
        AudioContentList selected_audio_content ();
        SubtitleContentList selected_subtitle_content ();
+       FFmpegContentList selected_ffmpeg_content ();
        
 private:
        void make_dcp_panel ();
@@ -99,7 +100,7 @@ private:
 
        /* Handle changes to the model */
        void film_changed (Film::Property);
-       void film_content_changed (boost::weak_ptr<Content>, int);
+       void film_content_changed (int);
 
        void set_general_sensitivity (bool);
        void setup_dcp_name ();