X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=207004f29715b6a5958b478df586f24fb5124719;hb=854f2e5bbb7ffb9758b823af87034033033f3cb8;hp=784434f6b60c2a198ce4c29edbd97575eba5b475;hpb=62f86da8d2b0daa2237e33653a3e837e6f395573;p=dcpomatic.git

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 784434f6b..207004f29 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
@@ -23,13 +23,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 PlayerImage;
 
 /** @class FilmViewer
  *  @brief A wx widget to view a preview of a Film.
@@ -42,45 +41,38 @@ public:
 	void set_film (boost::shared_ptr<Film>);
 
 private:
-	void film_changed (Film::Property);
-	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<Image>, bool, 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 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;
 
 	wxSizer* _v_sizer;
 	wxPanel* _panel;
 	wxSlider* _slider;
+	wxButton* _back_button;
+	wxButton* _forward_button;
+	wxStaticText* _frame_number;
+	wxStaticText* _timecode;
 	wxToggleButton* _play_button;
 	wxTimer _timer;
 
-	Decoders _decoders;
-	boost::shared_ptr<Image> _raw_frame;
-	boost::shared_ptr<Subtitle> _raw_sub;
-	boost::shared_ptr<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;
 
 	/** 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;
 };