Try to fix left-over frame when making a new filme.

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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index ae0633cd21629a05f77063c7b4b0f50c53fea082..784434f6b60c2a198ce4c29edbd97575eba5b475 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -18,45 +18,69 @@
 */
 
 /** @file  src/film_viewer.h
- *  @brief A GTK widget to view `thumbnails' of a Film.
+ *  @brief A wx widget to view `thumbnails' of a Film.
  */
 
-#include <gtkmm.h>
+#include <wx/wx.h>
 #include "lib/film.h"
+#include "lib/decoder_factory.h"
+
+class wxToggleButton;
+class FFmpegPlayer;
+class Image;
+class RGBPlusAlphaImage;
+class Subtitle;
 
 /** @class FilmViewer
- *  @brief A GTK widget to view `thumbnails' of a Film.
+ *  @brief A wx widget to view a preview of a Film.
  */
-class FilmViewer
+class FilmViewer : public wxPanel
 {
 public:
-       FilmViewer (Film *);
-
-       Gtk::Widget& widget () {
-               return _vbox;
-       }
+       FilmViewer (boost::shared_ptr<Film>, wxWindow *);
 
-       void set_film (Film *);
-       void setup_visibility ();
+       void set_film (boost::shared_ptr<Film>);
 
 private:
-       void position_slider_changed ();
-       void update_thumbs ();
-       std::string format_position_slider_value (double) const;
-       void load_thumbnail (int);
        void film_changed (Film::Property);
-       void reload_current_thumbnail ();
-       void update_scaled_pixbuf ();
-       std::pair<int, int> scaled_pixbuf_size () const;
-       void scroller_size_allocate (Gtk::Allocation);
-
-       Film* _film;
-       Gtk::VBox _vbox;
-       Gtk::ScrolledWindow _scroller;
-       Gtk::Image _image;
-       Glib::RefPtr<Gdk::Pixbuf> _pixbuf;
-       Glib::RefPtr<Gdk::Pixbuf> _cropped_pixbuf;
-       Glib::RefPtr<Gdk::Pixbuf> _scaled_pixbuf;
-       Gtk::HScale _position_slider;
-       Gtk::Allocation _last_scroller_allocation;
+       void paint_panel (wxPaintEvent &);
+       void panel_sized (wxSizeEvent &);
+       void slider_moved (wxScrollEvent &);
+       void play_clicked (wxCommandEvent &);
+       void timer (wxTimerEvent &);
+       void process_video (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>);
+       void calculate_sizes ();
+       void check_play_state ();
+       void update_from_raw ();
+       void decoder_changed ();
+       void raw_to_display ();
+       void get_frame ();
+       void active_jobs_changed (bool);
+
+       boost::shared_ptr<Film> _film;
+
+       wxSizer* _v_sizer;
+       wxPanel* _panel;
+       wxSlider* _slider;
+       wxToggleButton* _play_button;
+       wxTimer _timer;
+
+       Decoders _decoders;
+       boost::shared_ptr<Image> _raw_frame;
+       boost::shared_ptr<Subtitle> _raw_sub;
+       boost::shared_ptr<Image> _display_frame;
+       /* The x offset at which we display the actual film content; this corresponds
+          to the film's padding converted to our coordinates.
+       */
+       int _display_frame_x;
+       boost::shared_ptr<RGBPlusAlphaImage> _display_sub;
+       Position _display_sub_position;
+       bool _got_frame;
+
+       /** Size of our output (including padding if we have any) */
+       libdcp::Size _out_size;
+       /** Size that we will make our film (equal to _out_size unless we have padding) */
+       libdcp::Size _film_size;
+       /** Size of the panel that we have available */
+       libdcp::Size _panel_size;
 };