Merge master.

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

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 3f72642964415324093f8770f1ccfb1b97bbf774..705eb16af9b98f6305a3d28d4d7d251f339e56fc 100644 (file)
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -35,7 +35,8 @@ class Film;
 class AudioDialog;
 class TimelineDialog;
 class AudioMappingView;
-class Format;
+class Ratio;
+class Timecode;
 
 /** @class FilmEditor
  *  @brief A wx widget to edit a film's metadata, and perform various functions.
@@ -46,6 +47,7 @@ public:
        FilmEditor (boost::shared_ptr<Film>, wxWindow *);
 
        void set_film (boost::shared_ptr<Film>);
+       void set_selection (boost::weak_ptr<Content>);
 
        boost::signals2::signal<void (std::string)> FileChanged;
 
@@ -55,6 +57,7 @@ private:
        void make_video_panel ();
        void make_audio_panel ();
        void make_subtitle_panel ();
+       void make_timing_panel ();
        void connect_to_widgets ();
        
        /* Handle changes to the view */
@@ -91,13 +94,18 @@ private:
        void audio_stream_changed (wxCommandEvent &);
        void subtitle_stream_changed (wxCommandEvent &);
        void audio_mapping_changed (AudioMapping);
+       void start_changed ();
+       void length_changed ();
+       void ratio_changed (wxCommandEvent &);
+       void pad_with_silence_toggled (wxCommandEvent &);
+       void minimum_audio_channels_changed (wxCommandEvent &);
 
        /* Handle changes to the model */
        void film_changed (Film::Property);
        void film_content_changed (boost::weak_ptr<Content>, int);
 
        void set_things_sensitive (bool);
-       void setup_formats ();
+       void setup_ratios ();
        void setup_subtitle_control_sensitivity ();
        void setup_dcp_name ();
        void setup_show_audio_sensitivity ();
@@ -105,13 +113,14 @@ private:
        void setup_main_notebook_size ();
        void setup_content ();
        void setup_container ();
-       void setup_content_button_sensitivity ();
+       void setup_content_sensitivity ();
        void setup_loop_sensitivity ();
-       void setup_content_properties ();
+       void setup_minimum_audio_channels ();
        
        void active_jobs_changed (bool);
        boost::shared_ptr<Content> selected_content ();
        boost::shared_ptr<VideoContent> selected_video_content ();
+       boost::shared_ptr<AudioContent> selected_audio_content ();
 
        wxNotebook* _main_notebook;
        wxNotebook* _content_notebook;
@@ -120,11 +129,9 @@ private:
        wxPanel* _content_panel;
        wxSizer* _content_sizer;
        wxPanel* _video_panel;
-       wxSizer* _video_sizer;
        wxPanel* _audio_panel;
-       wxSizer* _audio_sizer;
        wxPanel* _subtitle_panel;
-       wxSizer* _subtitle_sizer;
+       wxPanel* _timing_panel;
 
        /** The film we are editing */
        boost::shared_ptr<Film> _film;
@@ -141,8 +148,8 @@ private:
        wxCheckBox* _loop_content;
        wxSpinCtrl* _loop_count;
        wxButton* _edit_dci_button;
-       wxChoice* _format;
-       wxStaticText* _format_description;
+       wxChoice* _ratio;
+       wxStaticText* _ratio_description;
        wxStaticText* _scaling_description;
        wxSpinCtrl* _left_crop;
        wxSpinCtrl* _right_crop;
@@ -163,12 +170,16 @@ private:
        wxChoice* _dcp_content_type;
        wxChoice* _dcp_frame_rate;
        wxButton* _best_dcp_frame_rate;
+       wxCheckBox* _pad_with_silence;
+       wxSpinCtrl* _minimum_audio_channels;
        wxChoice* _audio_stream;
        wxStaticText* _audio_description;
        wxChoice* _subtitle_stream;
        AudioMappingView* _audio_mapping;
+       Timecode* _start;
+       Timecode* _length;
 
-       std::vector<Format const *> _formats;
+       std::vector<Ratio const *> _ratios;
 
        bool _generally_sensitive;
        AudioDialog* _audio_dialog;