X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=d01e002906be3522bad6ee72595987d55ee3b7fc;hb=a78b741c43830c84bcb4d18e3147746f13a668e5;hp=e502c6f45cd2922e3d9fe90c32fe7553c67d83a6;hpb=c6c082c4a8016f85ba4207f4b8ccee1d5770e4a4;p=dcpomatic.git

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index e502c6f45..d01e00290 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012-2014 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/>.
 
 */
 
@@ -40,6 +41,18 @@ public:
 
 	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 paint_panel ();
 	void panel_sized (wxSizeEvent &);
@@ -48,15 +61,23 @@ private:
 	void timer ();
 	void calculate_sizes ();
 	void check_play_state ();
-	void active_jobs_changed (bool);
-	void back_clicked ();
-	void forward_clicked ();
+	void active_jobs_changed (boost::optional<std::string>);
+	void back_clicked (wxMouseEvent &);
+	void forward_clicked (wxMouseEvent &);
 	void player_changed (bool);
-	void set_position_text ();
-	void get (DCPTime, 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;
@@ -64,6 +85,9 @@ private:
 	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;
@@ -71,6 +95,8 @@ private:
 	wxStaticText* _timecode;
 	wxToggleButton* _play_button;
 	wxTimer _timer;
+	bool _coalesce_player_changes;
+	bool _pending_player_change;
 
 	boost::shared_ptr<const Image> _frame;
 	DCPTime _position;
@@ -81,12 +107,9 @@ private:
 	dcp::Size _out_size;
 	/** Size of the panel that we have available */
 	dcp::Size _panel_size;
-	/** true if the last call to ::get() was specified to be accurate;
+	/** 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_get_accurate;
-
-	boost::signals2::scoped_connection _film_connection;
-	boost::signals2::scoped_connection _player_connection;
+	bool _last_seek_accurate;
 };