Some basics of AudioMapping.

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

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 685e7864f0fe3d012cf7baa0ea9164073dd55150..4bdba9979b1f53d3f0032cd04359547b1f5acf5a 100644 (file)
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -33,7 +33,6 @@ class wxListCtrl;
 class wxListEvent;
 class Film;
 class AudioDialog;
-class AudioMappingView;
 class TimelineDialog;
 
 /** @class FilmEditor
@@ -69,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 &);
@@ -94,7 +89,7 @@ private:
        void edit_filters_clicked (wxCommandEvent &);
        void loop_content_toggled (wxCommandEvent &);
        void loop_count_changed (wxCommandEvent &);
-       void timeline_clicked (wxCommandEvent &);
+       void content_timeline_clicked (wxCommandEvent &);
 
        /* Handle changes to the model */
        void film_changed (Film::Property);
@@ -117,7 +112,7 @@ private:
        
        void active_jobs_changed (bool);
        boost::shared_ptr<Content> selected_content ();
-       void edit_content (boost::shared_ptr<Content>);
+       void content_properties (boost::shared_ptr<Content>);
 
        wxNotebook* _notebook;
        wxPanel* _film_panel;
@@ -140,13 +135,13 @@ 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;
-       wxButton* _timeline_button;
        wxButton* _edit_dci_button;
        wxChoice* _format;
        wxStaticText* _format_description;
@@ -163,7 +158,6 @@ private:
        wxButton* _audio_gain_calculate_button;
        wxButton* _show_audio;
        wxSpinCtrl* _audio_delay;
-       AudioMappingView* _audio_mapping;
        wxCheckBox* _with_subtitles;
        wxSpinCtrl* _subtitle_offset;
        wxSpinCtrl* _subtitle_scale;
@@ -177,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;