Hoepfully fix end trimming, and fix noise on end of audio when resampling.

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

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index ac9a5fb3196f78534e1d3e726fdc6811c63ee444..e9f8d35e5ca349e1bdaed1ecf19826847366bc9d 100644 (file)
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -24,7 +24,8 @@
 #include <wx/wx.h>
 #include <wx/spinctrl.h>
 #include <wx/filepicker.h>
-#include "lib/trim_action.h"
+#include <wx/collpane.h>
+#include <boost/signals2.hpp>
 #include "lib/film.h"
 
 class Film;
@@ -35,30 +36,37 @@ class Film;
 class FilmEditor : public wxPanel
 {
 public:
-       FilmEditor (Film *, wxWindow *);
+       FilmEditor (boost::shared_ptr<Film>, wxWindow *);
 
-       void set_film (Film *);
+       void set_film (boost::shared_ptr<Film>);
        void setup_visibility ();
 
-       sigc::signal1<void, std::string> FileChanged;
+       boost::signals2::signal<void (std::string)> FileChanged;
 
 private:
        /* Handle changes to the view */
        void name_changed (wxCommandEvent &);
+       void use_dci_name_toggled (wxCommandEvent &);
+       void edit_dci_button_clicked (wxCommandEvent &);
        void left_crop_changed (wxCommandEvent &);
        void right_crop_changed (wxCommandEvent &);
        void top_crop_changed (wxCommandEvent &);
        void bottom_crop_changed (wxCommandEvent &);
        void content_changed (wxCommandEvent &);
        void format_changed (wxCommandEvent &);
-       void dcp_range_changed (int, TrimAction);
+       void dcp_range_changed (int, int);
        void dcp_content_type_changed (wxCommandEvent &);
        void dcp_ab_toggled (wxCommandEvent &);
        void scaler_changed (wxCommandEvent &);
        void audio_gain_changed (wxCommandEvent &);
        void audio_gain_calculate_button_clicked (wxCommandEvent &);
        void audio_delay_changed (wxCommandEvent &);
+       void with_subtitles_toggled (wxCommandEvent &);
+       void subtitle_offset_changed (wxCommandEvent &);
+       void subtitle_scale_changed (wxCommandEvent &);
        void still_duration_changed (wxCommandEvent &);
+       void audio_stream_changed (wxCommandEvent &);
+       void subtitle_stream_changed (wxCommandEvent &);
 
        /* Handle changes to the model */
        void film_changed (Film::Property);
@@ -68,16 +76,25 @@ private:
        void change_dcp_range_clicked (wxCommandEvent &);
 
        void set_things_sensitive (bool);
-
+       void setup_formats ();
+       void setup_subtitle_button ();
+       void setup_streams ();
+       void setup_audio_details ();
+       
        wxControl* video_control (wxControl *);
        wxControl* still_control (wxControl *);
 
+       void active_jobs_changed (bool);
+
        Film::Property _ignore_changes;
 
        /** The film we are editing */
-       Film* _film;
+       boost::shared_ptr<Film> _film;
        /** The Film's name */
        wxTextCtrl* _name;
+       wxStaticText* _dcp_name;
+       wxCheckBox* _use_dci_name;
+       wxButton* _edit_dci_button;
        /** The Film's format */
        wxComboBox* _format;
        /** The Film's content file */
@@ -96,12 +113,17 @@ private:
        wxButton* _filters_button;
        /** The Film's scaler */
        wxComboBox* _scaler;
+       wxComboBox* _audio_stream;
        /** The Film's audio gain */
        wxSpinCtrl* _audio_gain;
        /** A button to open the gain calculation dialogue */
        wxButton* _audio_gain_calculate_button;
        /** The Film's audio delay */
        wxSpinCtrl* _audio_delay;
+       wxCheckBox* _with_subtitles;
+       wxComboBox* _subtitle_stream;
+       wxSpinCtrl* _subtitle_offset;
+       wxSpinCtrl* _subtitle_scale;
        /** The Film's DCP content type */
        wxComboBox* _dcp_content_type;
        /** The Film's frames per second */
@@ -125,5 +147,7 @@ private:
        std::list<wxControl*> _video_controls;
        std::list<wxControl*> _still_controls;
 
+       std::vector<Format const *> _formats;
+
        wxSizer* _sizer;
 };