Various small fixes.

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

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index f9f15e2acaa8117aa9f435867a3d14d471b3da7b..23c87e6784510288c54c8e9e96484b520e05bccc 100644 (file)
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -37,6 +37,7 @@ class TimelineDialog;
 class Ratio;
 class Timecode;
 class FilmEditorPanel;
+class SubtitleContent;
 
 /** @class FilmEditor
  *  @brief A wx widget to edit a film's metadata, and perform various functions.
@@ -49,7 +50,7 @@ public:
        void set_film (boost::shared_ptr<Film>);
        void set_selection (boost::weak_ptr<Content>);
 
-       boost::signals2::signal<void (std::string)> FileChanged;
+       boost::signals2::signal<void (boost::filesystem::path)> FileChanged;
 
        /* Stuff for panels */
        
@@ -61,10 +62,11 @@ public:
                return _film;
        }
 
-       boost::shared_ptr<Content> selected_content ();
-       boost::shared_ptr<VideoContent> selected_video_content ();
-       boost::shared_ptr<AudioContent> selected_audio_content ();
-       boost::shared_ptr<SubtitleContent> selected_subtitle_content ();
+       ContentList selected_content ();
+       VideoContentList selected_video_content ();
+       AudioContentList selected_audio_content ();
+       SubtitleContentList selected_subtitle_content ();
+       FFmpegContentList selected_ffmpeg_content ();
        
 private:
        void make_dcp_panel ();
@@ -79,6 +81,8 @@ private:
        void content_add_file_clicked ();
        void content_add_folder_clicked ();
        void content_remove_clicked ();
+       void content_earlier_clicked ();
+       void content_later_clicked ();
        void container_changed ();
        void dcp_content_type_changed ();
        void scaler_changed ();
@@ -91,10 +95,13 @@ private:
        void sequence_video_changed ();
        void content_right_click (wxListEvent &);
        void three_d_changed ();
+       void standard_changed ();
+       void signed_toggled ();
+       void encrypted_toggled ();
 
        /* 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 ();
@@ -140,6 +147,9 @@ private:
        wxButton* _best_frame_rate;
        wxCheckBox* _three_d;
        wxChoice* _resolution;
+       wxChoice* _standard;
+       wxCheckBox* _signed;
+       wxCheckBox* _encrypted;
 
        ContentMenu _menu;