X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fwx%2Ffilm_viewer.h;h=0e5c49c6d8ad91968e439a011ebea6844f7b2472;hb=a78b741c43830c84bcb4d18e3147746f13a668e5;hp=723214ed10b8ab9541bd20e42f0679538382806b;hpb=602fd58eff38fdfccc489b9f77b3ff0ca0009566;p=dcpomatic.git

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 723214ed1..d01e00290 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -23,13 +24,12 @@
 
 #include <wx/wx.h>
 #include "lib/film.h"
-#include "lib/decoder_factory.h"
 
 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.
@@ -37,42 +37,79 @@ class Subtitle;
 class FilmViewer : public wxPanel
 {
 public:
-	FilmViewer (boost::shared_ptr<Film>, wxWindow *);
+	FilmViewer (wxWindow *);
 
 	void set_film (boost::shared_ptr<Film>);
 
+	/** @return our `playhead' position; this may not lie exactly on a frame boundary */
+	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 paint_panel (wxPaintEvent &);
+	void paint_panel ();
 	void panel_sized (wxSizeEvent &);
-	void slider_moved (wxCommandEvent &);
-	void play_clicked (wxCommandEvent &);
-	void timer (wxTimerEvent &);
-	void process_video (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>);
+	void slider_moved ();
+	void play_clicked ();
+	void timer ();
 	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);
+	void active_jobs_changed (boost::optional<std::string>);
+	void back_clicked (wxMouseEvent &);
+	void forward_clicked (wxMouseEvent &);
+	void player_changed (bool);
+	void update_position_label ();
+	void update_position_slider ();
+	void video (boost::shared_ptr<PlayerVideo>, DCPTime time);
+	void get ();
+	void seek (DCPTime t, bool accurate);
+	void refresh_panel ();
+	void setup_sensitivity ();
+	void film_changed (Film::Property);
+	DCPTime nudge_amount (wxMouseEvent &);
+	void timecode_clicked ();
+	void frame_number_clicked ();
+	void go_to (DCPTime t);
+	void jump_to_selected_clicked ();
 
 	boost::shared_ptr<Film> _film;
-	
+	boost::shared_ptr<Player> _player;
+
+	wxSizer* _v_sizer;
 	wxPanel* _panel;
+	wxCheckBox* _outline_content;
+	wxRadioButton* _left_eye;
+	wxRadioButton* _right_eye;
+	wxCheckBox* _jump_to_selected;
 	wxSlider* _slider;
+	wxButton* _back_button;
+	wxButton* _forward_button;
+	wxStaticText* _frame_number;
+	wxStaticText* _timecode;
 	wxToggleButton* _play_button;
 	wxTimer _timer;
+	bool _coalesce_player_changes;
+	bool _pending_player_change;
+
+	boost::shared_ptr<const Image> _frame;
+	DCPTime _position;
+	Position<int> _inter_position;
+	dcp::Size _inter_size;
 
-	Decoders _decoders;
-	boost::shared_ptr<Image> _raw_frame;
-	boost::shared_ptr<Subtitle> _raw_sub;
-	boost::shared_ptr<Image> _display_frame;
-	boost::shared_ptr<RGBPlusAlphaImage> _display_sub;
-	Position _display_sub_position;
-
-	int _out_width;
-	int _out_height;
-	int _panel_width;
-	int _panel_height;
+	/** Size of our output (including padding if we have any) */
+	dcp::Size _out_size;
+	/** Size of the panel that we have available */
+	dcp::Size _panel_size;
+	/** true if the last call to Player::seek() 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_seek_accurate;
 };