Use ISDCF rather than DCI when talking about the digital cinema

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

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index bb217211ca7719c0e58ba4a8cb22854726ec8961..96cae3900d66d1b9aea29a4043e285f28dc81f2a 100644 (file)
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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 ();
@@ -74,17 +75,20 @@ private:
        
        /* Handle changes to the view */
        void name_changed ();
-       void use_dci_name_toggled ();
-       void edit_dci_button_clicked ();
+       void use_isdcf_name_toggled ();
+       void edit_isdcf_button_clicked ();
        void content_selection_changed ();
        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 ();
        void j2k_bandwidth_changed ();
-       void frame_rate_changed ();
+       void frame_rate_choice_changed ();
+       void frame_rate_spin_changed ();
        void best_frame_rate_clicked ();
        void content_timeline_clicked ();
        void audio_channels_changed ();
@@ -93,19 +97,22 @@ 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 ();
        void setup_content ();
        void setup_container ();
        void setup_content_sensitivity ();
+       void setup_frame_rate_widget ();
        
        void active_jobs_changed (bool);
+       void config_changed ();
 
        FilmEditorPanel* _video_panel;
        FilmEditorPanel* _audio_panel;
@@ -124,7 +131,7 @@ private:
        boost::shared_ptr<Film> _film;
        wxTextCtrl* _name;
        wxStaticText* _dcp_name;
-       wxCheckBox* _use_dci_name;
+       wxCheckBox* _use_isdcf_name;
        wxChoice* _container;
        wxListCtrl* _content;
        wxButton* _content_add_file;
@@ -134,16 +141,19 @@ private:
        wxButton* _content_later;
        wxButton* _content_timeline;
        wxCheckBox* _sequence_video;
-       wxButton* _edit_dci_button;
+       wxButton* _edit_isdcf_button;
        wxChoice* _scaler;
        wxSpinCtrl* _j2k_bandwidth;
        wxChoice* _dcp_content_type;
-       wxChoice* _frame_rate;
+       wxChoice* _frame_rate_choice;
+       wxSpinCtrl* _frame_rate_spin;
+       wxSizer* _frame_rate_sizer;
        wxSpinCtrl* _audio_channels;
        wxButton* _best_frame_rate;
        wxCheckBox* _three_d;
        wxChoice* _resolution;
        wxChoice* _standard;
+       wxCheckBox* _signed;
        wxCheckBox* _encrypted;
 
        ContentMenu _menu;