X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=04f8b9f7abcb2bfae7910d1d0ac6efbfe58ce62f;hb=740977ac39b3b1ae64bd06efce0a3bf9d188dd67;hp=02d862ca0c42472dd8cefb6de594b116725e6a68;hpb=92cafb6fc686a041354da2eabde6bcb2f6846e1d;p=dcpomatic.git

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 02d862ca0..04f8b9f7a 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-2016 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,84 +28,81 @@ class wxToggleButton;
 class FFmpegPlayer;
 class Image;
 class RGBPlusAlphaImage;
-class Subtitle;
+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.  get_frame() asks our _player to decode some data.  If it does, process_video()
- *      will be called.
- *
- *  2.  process_video() takes the image and subtitle from the decoder (_raw_frame and _raw_sub)
- *      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.  It also
- *      blits the subtitle, if required.
- *
- * 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
 {
 public:
-	FilmViewer (boost::shared_ptr<Film>, wxWindow *);
+	FilmViewer (wxWindow *);
 
 	void set_film (boost::shared_ptr<Film>);
 
+	DCPTime position () const {
+		return _position;
+	}
+
+	void set_position (DCPTime p);
+	void set_coalesce_player_changes (bool c);
+
+	void refresh ();
+
+	boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
+
 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, boost::shared_ptr<Subtitle>, double);
+	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 active_jobs_changed (boost::optional<std::string>);
+	void back_clicked ();
+	void forward_clicked ();
+	void player_changed (bool);
+	void update_position_label ();
+	void update_position_slider ();
+	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;
+	wxRadioButton* _left_eye;
+	wxRadioButton* _right_eye;
 	wxSlider* _slider;
 	wxButton* _back_button;
 	wxButton* _forward_button;
-	wxStaticText* _frame;
+	wxStaticText* _frame_number;
 	wxStaticText* _timecode;
 	wxToggleButton* _play_button;
 	wxTimer _timer;
+	bool _coalesce_player_changes;
+	bool _pending_player_change;
 
-	boost::shared_ptr<const Image> _raw_frame;
-	boost::shared_ptr<Subtitle> _raw_sub;
-	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;
-	boost::shared_ptr<RGBPlusAlphaImage> _display_sub;
-	Position _display_sub_position;
-	bool _got_frame;
+	boost::shared_ptr<const Image> _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;
-	/** 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;
+	/** 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;
 };