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 2439b01dd652b0379015aef2ab5812df21c62f32..e9f8d35e5ca349e1bdaed1ecf19826847366bc9d 100644 (file)
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -25,7 +25,7 @@
 #include <wx/spinctrl.h>
 #include <wx/filepicker.h>
 #include <wx/collpane.h>
-#include "lib/trim_action.h"
+#include <boost/signals2.hpp>
 #include "lib/film.h"
 
 class Film;
@@ -36,12 +36,12 @@ 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 */
@@ -54,7 +54,7 @@ private:
        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 &);
@@ -69,7 +69,7 @@ private:
        void subtitle_stream_changed (wxCommandEvent &);
 
        /* Handle changes to the model */
-       void film_changed (FilmState::Property);
+       void film_changed (Film::Property);
 
        /* Button clicks */
        void edit_filters_clicked (wxCommandEvent &);
@@ -79,14 +79,17 @@ private:
        void setup_formats ();
        void setup_subtitle_button ();
        void setup_streams ();
+       void setup_audio_details ();
        
        wxControl* video_control (wxControl *);
        wxControl* still_control (wxControl *);
 
-       FilmState::Property _ignore_changes;
+       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;