X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=e502c6f45cd2922e3d9fe90c32fe7553c67d83a6;hp=1e5b6d34d119f2c3a160ea5cbd2822756453fb19;hb=3e12c68dc0451e73b5bc1a84d1d70f4999f7b4b5;hpb=5c09a82e483593fb37da0cad20679be735887613

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 1e5b6d34d..e502c6f45 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,28 +28,15 @@ class wxToggleButton;
 class FFmpegPlayer;
 class Image;
 class RGBPlusAlphaImage;
-class PlayerVideoFrame;
+class PlayerVideo;
 
 /** @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
 {
 public:
-	FilmViewer (boost::shared_ptr<Film>, wxWindow *);
+	FilmViewer (wxWindow *);
 
 	void set_film (boost::shared_ptr<Film>);
 
@@ -59,22 +46,24 @@ private:
 	void slider_moved ();
 	void play_clicked ();
 	void timer ();
-	void process_video (boost::shared_ptr<PlayerVideoFrame>, Time);
 	void calculate_sizes ();
 	void check_play_state ();
-	void fetch_current_frame_again ();
-	void fetch_next_frame ();
 	void active_jobs_changed (bool);
 	void back_clicked ();
 	void forward_clicked ();
 	void player_changed (bool);
-	void set_position_text (Time);
+	void set_position_text ();
+	void get (DCPTime, bool);
+	void refresh_panel ();
+	void setup_sensitivity ();
+	void film_changed (Film::Property);
 
 	boost::shared_ptr<Film> _film;
 	boost::shared_ptr<Player> _player;
 
 	wxSizer* _v_sizer;
 	wxPanel* _panel;
+	wxCheckBox* _outline_content;
 	wxSlider* _slider;
 	wxButton* _back_button;
 	wxButton* _forward_button;
@@ -84,10 +73,20 @@ private:
 	wxTimer _timer;
 
 	boost::shared_ptr<const Image> _frame;
-	bool _got_frame;
+	DCPTime _position;
+	Position<int> _inter_position;
+	dcp::Size _inter_size;
 
 	/** 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;
+	dcp::Size _panel_size;
+	/** true if the last call to ::get() was specified to be accurate;
+	 *  this is used so that when re-fetching the current frame we
+	 *  can get the same one that we got last time.
+	 */
+	bool _last_get_accurate;
+
+	boost::signals2::scoped_connection _film_connection;
+	boost::signals2::scoped_connection _player_connection;
 };