X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=950758f61c9f401cd63e28a4473f013e8ab18785;hb=39bc73fe192f932ed6695eb87b19de446e8b4f55;hp=5c8320295c9d8b9c4e3e39019c2bb11501494d99;hpb=d5085584d82c021e924cec6ce00e682a8e63d800;p=dcpomatic.git

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 5c8320295..950758f61 100644
--- 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,22 +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.  fetch_next_frame() asks our _player to decode some data.  If it does, process_video()
- *      will be called.
- *
- *  2.  process_video() takes the image from the player (_frame).
- *
- *  3.  fetch_next_frame() calls _panel->Refresh() and _panel->Update() which results in
- *      paint_panel() being called; this creates frame_bitmap from _frame and blits it to the display.
- *
- * fetch_current_frame_again() asks the player to re-emit its current frame on the next pass(), and then
- * starts from step #1.
  */
 class FilmViewer : public wxPanel
 {
@@ -53,20 +41,19 @@ public:
 	void set_film (boost::shared_ptr<Film>);
 
 private:
-	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>, Time);
+	void slider_moved ();
+	void play_clicked ();
+	void timer ();
 	void calculate_sizes ();
 	void check_play_state ();
-	void fetch_current_frame_again ();
-	void fetch_next_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;
@@ -82,12 +69,10 @@ private:
 	wxTimer _timer;
 
 	boost::shared_ptr<const Image> _frame;
-	bool _got_frame;
+	DCPTime _position;
 
 	/** Size of our output (including padding if we have any) */
-	libdcp::Size _out_size;
+	dcp::Size _out_size;
 	/** Size of the panel that we have available */
-	libdcp::Size _panel_size;
-
-	std::list<std::pair<boost::shared_ptr<const Image>, Time> > _queue;
+	dcp::Size _panel_size;
 };