Merge master.

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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 39755ed35e57958cc6d38c53a463c1c7ab576586..950758f61c9f401cd63e28a4473f013e8ab18785 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 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
@@ -28,26 +28,10 @@ class wxToggleButton;
 class FFmpegPlayer;
 class Image;
 class RGBPlusAlphaImage;
+class PlayerVideoFrame;
 
 /** @class FilmViewer
  *  @brief A wx widget to view a preview of a Film.
- *
- *  The film takes the following path through the viewer:
- *
- *  1.  get_frame() asks our _player to decode some data.  If it does, process_video()
- *      will be called.
- *
- *  2.  process_video() takes the image from the decoder (_raw_frame) and calls raw_to_display().
- * 
- *  3.  raw_to_display() copies _raw_frame to _display_frame, processing it and scaling it.
- *
- *  4.  calling _panel->Refresh() and _panel->Update() results in paint_panel() being called;
- *      this creates frame_bitmap from _display_frame and blits it to the display.
- *
- * update_from_decoder() asks the player to re-emit its current frame on the next pass(), and then
- * starts from step #1.
- *
- * update_from_raw() starts at step #3, then calls _panel->Refresh and _panel->Update.
  */
 class FilmViewer : public wxPanel
 {
@@ -57,23 +41,19 @@ public:
        void set_film (boost::shared_ptr<Film>);
 
 private:
-       void film_changed (Film::Property);
-       void film_content_changed (boost::weak_ptr<Content>, int);
-       void paint_panel (wxPaintEvent &);
+       void paint_panel ();
        void panel_sized (wxSizeEvent &);
-       void slider_moved (wxScrollEvent &);
-       void play_clicked (wxCommandEvent &);
-       void timer (wxTimerEvent &);
-       void process_video (boost::shared_ptr<const Image>, bool, Time);
+       void slider_moved ();
+       void play_clicked ();
+       void timer ();
        void calculate_sizes ();
        void check_play_state ();
-       void update_from_raw ();
-       void update_from_decoder ();
-       void raw_to_display ();
-       void get_frame ();
        void active_jobs_changed (bool);
-       void back_clicked (wxCommandEvent &);
-       void forward_clicked (wxCommandEvent &);
+       void back_clicked ();
+       void forward_clicked ();
+       void player_changed (bool);
+       void set_position_text ();
+       void get (DCPTime, bool);
 
        boost::shared_ptr<Film> _film;
        boost::shared_ptr<Player> _player;
@@ -83,23 +63,16 @@ private:
        wxSlider* _slider;
        wxButton* _back_button;
        wxButton* _forward_button;
-       wxStaticText* _frame;
+       wxStaticText* _frame_number;
        wxStaticText* _timecode;
        wxToggleButton* _play_button;
        wxTimer _timer;
 
-       boost::shared_ptr<const Image> _raw_frame;
-       boost::shared_ptr<const 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;
-       bool _got_frame;
+       boost::shared_ptr<const Image> _frame;
+       DCPTime _position;
 
        /** 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;
+       dcp::Size _out_size;
        /** Size of the panel that we have available */
-       libdcp::Size _panel_size;
+       dcp::Size _panel_size;
 };