Various incomplete hacks on regions / audio mapping.

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

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 5944633a8cbbe13b7ba91db070a0b66fe0384a19..c74d631ad82088cb7a2f55517b3dec97c4d469e7 100644 (file)
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -33,7 +33,7 @@ class wxListCtrl;
 class wxListEvent;
 class Film;
 class AudioDialog;
-class AudioMappingView;
+class TimelineDialog;
 
 /** @class FilmEditor
  *  @brief A wx widget to edit a film's metadata, and perform various functions.
@@ -68,13 +68,9 @@ private:
        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 content_properties_clicked (wxCommandEvent &);
        void imagemagick_video_length_changed (wxCommandEvent &);
        void format_changed (wxCommandEvent &);
-       void trim_start_changed (wxCommandEvent &);
-       void trim_end_changed (wxCommandEvent &);
        void trim_type_changed (wxCommandEvent &);
        void dcp_content_type_changed (wxCommandEvent &);
        void ab_toggled (wxCommandEvent &);
@@ -88,13 +84,12 @@ 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 &);
 
        /* Handle changes to the model */
        void film_changed (Film::Property);
@@ -103,8 +98,6 @@ private:
        void set_things_sensitive (bool);
        void setup_formats ();
        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 ();
@@ -118,8 +111,8 @@ private:
        void setup_loop_sensitivity ();
        
        void active_jobs_changed (bool);
-       boost::shared_ptr<Content> selected_content ();
-       void edit_content (boost::shared_ptr<Content>);
+       boost::shared_ptr<Playlist::Region> selected_region ();
+       void region_properties (boost::shared_ptr<Playlist::Region>);
 
        wxNotebook* _notebook;
        wxPanel* _film_panel;
@@ -142,9 +135,10 @@ private:
        wxListCtrl* _content;
        wxButton* _content_add;
        wxButton* _content_remove;
-       wxButton* _content_edit;
+       wxButton* _content_properties;
        wxButton* _content_earlier;
        wxButton* _content_later;
+       wxButton* _content_timeline;
        wxTextCtrl* _content_information;
        wxCheckBox* _loop_content;
        wxSpinCtrl* _loop_count;
@@ -164,10 +158,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;
@@ -180,8 +171,6 @@ private:
        /** The Film's audio details */
        wxStaticText* _audio;
 
-       wxSpinCtrl* _trim_start;
-       wxSpinCtrl* _trim_end;
        wxChoice* _trim_type;
        /** Selector to generate an A/B comparison DCP */
        wxCheckBox* _ab;
@@ -190,4 +179,5 @@ private:
 
        bool _generally_sensitive;
        AudioDialog* _audio_dialog;
+       TimelineDialog* _timeline_dialog;
 };