Merge master.
[dcpomatic.git] / src / wx / film_editor.h
index bc6b045c409999ae073d518487f88d8b77623c7b..705eb16af9b98f6305a3d28d4d7d251f339e56fc 100644 (file)
@@ -33,7 +33,10 @@ class wxListCtrl;
 class wxListEvent;
 class Film;
 class AudioDialog;
+class TimelineDialog;
 class AudioMappingView;
+class Ratio;
+class Timecode;
 
 /** @class FilmEditor
  *  @brief A wx widget to edit a film's metadata, and perform various functions.
@@ -44,15 +47,17 @@ 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;
 
 private:
-       void make_film_panel ();
+       void make_dcp_panel ();
        void make_content_panel ();
        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 */
@@ -65,18 +70,11 @@ private:
        void bottom_crop_changed (wxCommandEvent &);
        void trust_content_headers_changed (wxCommandEvent &);
        void content_selection_changed (wxListEvent &);
-       void content_activated (wxListEvent &);
        void content_add_clicked (wxCommandEvent &);
        void content_remove_clicked (wxCommandEvent &);
-       void content_edit_clicked (wxCommandEvent &);
-       void content_earlier_clicked (wxCommandEvent &);
-       void content_later_clicked (wxCommandEvent &);
        void imagemagick_video_length_changed (wxCommandEvent &);
-       void format_changed (wxCommandEvent &);
-       void trim_start_changed (wxCommandEvent &);
-       void trim_end_changed (wxCommandEvent &);
+       void container_changed (wxCommandEvent &);
        void dcp_content_type_changed (wxCommandEvent &);
-       void ab_toggled (wxCommandEvent &);
        void scaler_changed (wxCommandEvent &);
        void audio_gain_changed (wxCommandEvent &);
        void audio_gain_calculate_button_clicked (wxCommandEvent &);
@@ -87,62 +85,72 @@ private:
        void subtitle_scale_changed (wxCommandEvent &);
        void colour_lut_changed (wxCommandEvent &);
        void j2k_bandwidth_changed (wxCommandEvent &);
-       void ffmpeg_audio_stream_changed (wxCommandEvent &);
-       void ffmpeg_subtitle_stream_changed (wxCommandEvent &);
        void dcp_frame_rate_changed (wxCommandEvent &);
        void best_dcp_frame_rate_clicked (wxCommandEvent &);
        void edit_filters_clicked (wxCommandEvent &);
+       void loop_content_toggled (wxCommandEvent &);
+       void loop_count_changed (wxCommandEvent &);
+       void content_timeline_clicked (wxCommandEvent &);
+       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_streams ();
-       void setup_audio_details ();
        void setup_dcp_name ();
        void setup_show_audio_sensitivity ();
+       void setup_scaling_description ();
+       void setup_main_notebook_size ();
        void setup_content ();
-       void setup_content_button_sensitivity ();
-       void setup_length ();
-       void setup_format ();
-       void setup_content_information ();
+       void setup_container ();
+       void setup_content_sensitivity ();
+       void setup_loop_sensitivity ();
+       void setup_minimum_audio_channels ();
        
        void active_jobs_changed (bool);
        boost::shared_ptr<Content> selected_content ();
-       void edit_content (boost::shared_ptr<Content>);
+       boost::shared_ptr<VideoContent> selected_video_content ();
+       boost::shared_ptr<AudioContent> selected_audio_content ();
 
-       wxNotebook* _notebook;
-       wxPanel* _film_panel;
-       wxSizer* _film_sizer;
+       wxNotebook* _main_notebook;
+       wxNotebook* _content_notebook;
+       wxPanel* _dcp_panel;
+       wxSizer* _dcp_sizer;
        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;
-       /** The Film's name */
        wxTextCtrl* _name;
        wxStaticText* _dcp_name;
        wxCheckBox* _use_dci_name;
+       wxChoice* _container;
        wxListCtrl* _content;
        wxButton* _content_add;
        wxButton* _content_remove;
-       wxButton* _content_edit;
        wxButton* _content_earlier;
        wxButton* _content_later;
-       wxTextCtrl* _content_information;
+       wxButton* _content_timeline;
+       wxCheckBox* _loop_content;
+       wxSpinCtrl* _loop_count;
        wxButton* _edit_dci_button;
-       wxChoice* _format;
-       wxStaticText* _format_description;
-       wxCheckBox* _trust_content_headers;
+       wxChoice* _ratio;
+       wxStaticText* _ratio_description;
+       wxStaticText* _scaling_description;
        wxSpinCtrl* _left_crop;
        wxSpinCtrl* _right_crop;
        wxSpinCtrl* _top_crop;
@@ -154,10 +162,7 @@ private:
        wxButton* _audio_gain_calculate_button;
        wxButton* _show_audio;
        wxSpinCtrl* _audio_delay;
-       wxChoice* _ffmpeg_audio_stream;
-       AudioMappingView* _audio_mapping;
        wxCheckBox* _with_subtitles;
-       wxChoice* _ffmpeg_subtitle_stream;
        wxSpinCtrl* _subtitle_offset;
        wxSpinCtrl* _subtitle_scale;
        wxChoice* _colour_lut;
@@ -165,18 +170,18 @@ private:
        wxChoice* _dcp_content_type;
        wxChoice* _dcp_frame_rate;
        wxButton* _best_dcp_frame_rate;
-       wxStaticText* _frame_rate_description;
-       wxStaticText* _length;
-       /** The Film's audio details */
-       wxStaticText* _audio;
-
-       wxSpinCtrl* _trim_start;
-       wxSpinCtrl* _trim_end;
-       /** Selector to generate an A/B comparison DCP */
-       wxCheckBox* _ab;
+       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;
+       TimelineDialog* _timeline_dialog;
 };