Merge master.

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

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index bb217211ca7719c0e58ba4a8cb22854726ec8961..dadb583ae07b028f1c8324b1a0f30db6513c426e 100644 (file)
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -33,9 +33,9 @@ class wxNotebook;
 class wxListCtrl;
 class wxListEvent;
 class Film;
-class TimelineDialog;
+class DCPTimelineDialog;
 class Ratio;
-class Timecode;
+class DCPTimecode;
 class FilmEditorPanel;
 class SubtitleContent;
 
@@ -50,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 */
        
@@ -62,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 ();
@@ -80,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 ();
@@ -93,11 +96,12 @@ private:
        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 ();
@@ -144,6 +148,7 @@ private:
        wxCheckBox* _three_d;
        wxChoice* _resolution;
        wxChoice* _standard;
+       wxCheckBox* _signed;
        wxCheckBox* _encrypted;
 
        ContentMenu _menu;
@@ -151,5 +156,5 @@ private:
        std::vector<Ratio const *> _ratios;
 
        bool _generally_sensitive;
-       TimelineDialog* _timeline_dialog;
+       DCPTimelineDialog* _timeline_dialog;
 };