Merge branch '1.0' of ssh://carlh.dyndns.org/home/carl/git/dvdomatic into 1.0

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

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 9a9ba2906155b99c1d9703b321bc49ae5a7e8677..80c35d3d86cb8c9bfdac7e07a3206288f409d7f2 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 */
        
@@ -72,24 +73,29 @@ private:
        void connect_to_widgets ();
        
        /* Handle changes to the view */
-       void name_changed (wxCommandEvent &);
-       void use_dci_name_toggled (wxCommandEvent &);
-       void edit_dci_button_clicked (wxCommandEvent &);
-       void content_selection_changed (wxListEvent &);
-       void content_add_clicked (wxCommandEvent &);
-       void content_remove_clicked (wxCommandEvent &);
-       void container_changed (wxCommandEvent &);
-       void dcp_content_type_changed (wxCommandEvent &);
-       void scaler_changed (wxCommandEvent &);
-       void j2k_bandwidth_changed (wxCommandEvent &);
-       void dcp_frame_rate_changed (wxCommandEvent &);
-       void best_dcp_frame_rate_clicked (wxCommandEvent &);
-       void content_timeline_clicked (wxCommandEvent &);
-       void dcp_audio_channels_changed (wxCommandEvent &);
-       void dcp_resolution_changed (wxCommandEvent &);
-       void sequence_video_changed (wxCommandEvent &);
+       void name_changed ();
+       void use_dci_name_toggled ();
+       void edit_dci_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 best_frame_rate_clicked ();
+       void content_timeline_clicked ();
+       void audio_channels_changed ();
+       void resolution_changed ();
+       void sequence_video_changed ();
        void content_right_click (wxListEvent &);
-       void dcp_3d_changed ();
+       void three_d_changed ();
+       void standard_changed ();
+       void encrypted_toggled ();
 
        /* Handle changes to the model */
        void film_changed (Film::Property);
@@ -123,7 +129,8 @@ private:
        wxCheckBox* _use_dci_name;
        wxChoice* _container;
        wxListCtrl* _content;
-       wxButton* _content_add;
+       wxButton* _content_add_file;
+       wxButton* _content_add_folder;
        wxButton* _content_remove;
        wxButton* _content_earlier;
        wxButton* _content_later;
@@ -133,11 +140,13 @@ private:
        wxChoice* _scaler;
        wxSpinCtrl* _j2k_bandwidth;
        wxChoice* _dcp_content_type;
-       wxChoice* _dcp_frame_rate;
-       wxSpinCtrl* _dcp_audio_channels;
-       wxButton* _best_dcp_frame_rate;
-       wxCheckBox* _dcp_3d;
-       wxChoice* _dcp_resolution;
+       wxChoice* _frame_rate;
+       wxSpinCtrl* _audio_channels;
+       wxButton* _best_frame_rate;
+       wxCheckBox* _three_d;
+       wxChoice* _resolution;
+       wxChoice* _standard;
+       wxCheckBox* _encrypted;
 
        ContentMenu _menu;