Separate audio panel out.

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

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index fdc6e077dbc7d48ed7a810daf90bc45047cfd428..ff9198be42a60fc910110ea88b52ca054596097b 100644 (file)
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -27,16 +27,18 @@
 #include <wx/collpane.h>
 #include <boost/signals2.hpp>
 #include "lib/film.h"
+#include "content_menu.h"
 
 class wxNotebook;
 class wxListCtrl;
 class wxListEvent;
 class Film;
-class AudioDialog;
 class TimelineDialog;
-class AudioMappingView;
 class Ratio;
 class Timecode;
+class TimingPanel;
+class SubtitlePanel;
+class AudioPanel;
 
 /** @class FilmEditor
  *  @brief A wx widget to edit a film's metadata, and perform various functions.
@@ -51,13 +53,29 @@ public:
 
        boost::signals2::signal<void (std::string)> FileChanged;
 
+       /* Stuff for panels */
+       
+       wxNotebook* content_notebook () const {
+               return _content_notebook;
+       }
+
+       boost::shared_ptr<Film> film () const {
+               return _film;
+       }
+
+       boost::shared_ptr<Content> selected_content ();
+       boost::shared_ptr<VideoContent> selected_video_content ();
+       boost::shared_ptr<AudioContent> selected_audio_content ();
+       boost::shared_ptr<SubtitleContent> selected_subtitle_content ();
+       
+       bool generally_sensitive () const {
+               return _generally_sensitive;
+       }
+
 private:
        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 */
@@ -76,27 +94,16 @@ private:
        void container_changed (wxCommandEvent &);
        void dcp_content_type_changed (wxCommandEvent &);
        void scaler_changed (wxCommandEvent &);
-       void audio_gain_changed (wxCommandEvent &);
-       void audio_gain_calculate_button_clicked (wxCommandEvent &);
-       void show_audio_clicked (wxCommandEvent &);
-       void audio_delay_changed (wxCommandEvent &);
-       void with_subtitles_toggled (wxCommandEvent &);
-       void subtitle_offset_changed (wxCommandEvent &);
-       void subtitle_scale_changed (wxCommandEvent &);
-       void colour_lut_changed (wxCommandEvent &);
        void j2k_bandwidth_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 dcp_audio_channels_changed (wxCommandEvent &);
+       void dcp_resolution_changed (wxCommandEvent &);
+       void sequence_video_changed (wxCommandEvent &);
+       void content_right_click (wxListEvent &);
 
        /* Handle changes to the model */
        void film_changed (Film::Property);
@@ -104,21 +111,17 @@ private:
 
        void set_things_sensitive (bool);
        void setup_ratios ();
-       void setup_subtitle_control_sensitivity ();
        void setup_dcp_name ();
-       void setup_show_audio_sensitivity ();
        void setup_scaling_description ();
-       void setup_main_notebook_size ();
        void setup_content ();
        void setup_container ();
        void setup_content_sensitivity ();
-       void setup_loop_sensitivity ();
        
        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 ();
-       boost::shared_ptr<SubtitleContent> selected_subtitle_content ();
+
+       AudioPanel* _audio_panel;
+       SubtitlePanel* _subtitle_panel;
+       TimingPanel* _timing_panel;
 
        wxNotebook* _main_notebook;
        wxNotebook* _content_notebook;
@@ -127,9 +130,6 @@ private:
        wxPanel* _content_panel;
        wxSizer* _content_sizer;
        wxPanel* _video_panel;
-       wxPanel* _audio_panel;
-       wxPanel* _subtitle_panel;
-       wxPanel* _timing_panel;
 
        /** The film we are editing */
        boost::shared_ptr<Film> _film;
@@ -143,8 +143,7 @@ private:
        wxButton* _content_earlier;
        wxButton* _content_later;
        wxButton* _content_timeline;
-       wxCheckBox* _loop_content;
-       wxSpinCtrl* _loop_count;
+       wxCheckBox* _sequence_video;
        wxButton* _edit_dci_button;
        wxChoice* _ratio;
        wxStaticText* _ratio_description;
@@ -156,28 +155,17 @@ private:
        wxStaticText* _filters;
        wxButton* _filters_button;
        wxChoice* _scaler;
-       wxSpinCtrl* _audio_gain;
-       wxButton* _audio_gain_calculate_button;
-       wxButton* _show_audio;
-       wxSpinCtrl* _audio_delay;
-       wxCheckBox* _with_subtitles;
-       wxSpinCtrl* _subtitle_offset;
-       wxSpinCtrl* _subtitle_scale;
-       wxChoice* _colour_lut;
-       wxSpinCtrl* _j2k_bandwidth;
+       wxSpinCtrl* _j2k_bandwidth;
        wxChoice* _dcp_content_type;
        wxChoice* _dcp_frame_rate;
+       wxSpinCtrl* _dcp_audio_channels;
        wxButton* _best_dcp_frame_rate;
-       wxChoice* _audio_stream;
-       wxStaticText* _audio_description;
-       wxChoice* _subtitle_stream;
-       AudioMappingView* _audio_mapping;
-       Timecode* _start;
-       Timecode* _length;
+       wxChoice* _dcp_resolution;
+
+       ContentMenu _menu;
 
        std::vector<Ratio const *> _ratios;
 
        bool _generally_sensitive;
-       AudioDialog* _audio_dialog;
        TimelineDialog* _timeline_dialog;
 };