X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Ffilm_viewer.h;h=0bb22d4227548de40af590d1a1f445cb12647e77;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=f6ab1a567efed8e56be5c685aac38f61c88adc7b;hpb=cea83d339056dbd0213d1eb327accd96ea0c3b46;p=dcpomatic.git

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index f6ab1a567..0bb22d422 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-2016 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/>.
 
 */
 
@@ -44,6 +45,13 @@ public:
 		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 &);
@@ -52,7 +60,7 @@ private:
 	void timer ();
 	void calculate_sizes ();
 	void check_play_state ();
-	void active_jobs_changed (bool);
+	void active_jobs_changed (boost::optional<std::string>);
 	void back_clicked ();
 	void forward_clicked ();
 	void player_changed (bool);
@@ -69,6 +77,8 @@ private:
 	wxSizer* _v_sizer;
 	wxPanel* _panel;
 	wxCheckBox* _outline_content;
+	wxRadioButton* _left_eye;
+	wxRadioButton* _right_eye;
 	wxSlider* _slider;
 	wxButton* _back_button;
 	wxButton* _forward_button;
@@ -76,6 +86,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;