projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add option to preview left or right eye (#809).
[dcpomatic.git]
/
src
/
wx
/
film_viewer.h
diff --git
a/src/wx/film_viewer.h
b/src/wx/film_viewer.h
index 0235d225fc030eb125b48b96fbb7a2bf6eb60b07..04f8b9f7abcb2bfae7910d1d0ac6efbfe58ce62f 100644
(file)
--- a/
src/wx/film_viewer.h
+++ b/
src/wx/film_viewer.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
6
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
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
@@
-36,10
+36,21
@@
class PlayerVideo;
class FilmViewer : public wxPanel
{
public:
class FilmViewer : public wxPanel
{
public:
- FilmViewer (
boost::shared_ptr<Film>,
wxWindow *);
+ FilmViewer (wxWindow *);
void set_film (boost::shared_ptr<Film>);
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 paint_panel ();
void panel_sized (wxSizeEvent &);
private:
void paint_panel ();
void panel_sized (wxSizeEvent &);
@@
-48,11
+59,12
@@
private:
void timer ();
void calculate_sizes ();
void check_play_state ();
void timer ();
void calculate_sizes ();
void check_play_state ();
- void active_jobs_changed (boo
l
);
+ void active_jobs_changed (boo
st::optional<std::string>
);
void back_clicked ();
void forward_clicked ();
void player_changed (bool);
void back_clicked ();
void forward_clicked ();
void player_changed (bool);
- void set_position_text ();
+ void update_position_label ();
+ void update_position_slider ();
void get (DCPTime, bool);
void refresh_panel ();
void setup_sensitivity ();
void get (DCPTime, bool);
void refresh_panel ();
void setup_sensitivity ();
@@
-64,6
+76,8
@@
private:
wxSizer* _v_sizer;
wxPanel* _panel;
wxCheckBox* _outline_content;
wxSizer* _v_sizer;
wxPanel* _panel;
wxCheckBox* _outline_content;
+ wxRadioButton* _left_eye;
+ wxRadioButton* _right_eye;
wxSlider* _slider;
wxButton* _back_button;
wxButton* _forward_button;
wxSlider* _slider;
wxButton* _back_button;
wxButton* _forward_button;
@@
-71,6
+85,8
@@
private:
wxStaticText* _timecode;
wxToggleButton* _play_button;
wxTimer _timer;
wxStaticText* _timecode;
wxToggleButton* _play_button;
wxTimer _timer;
+ bool _coalesce_player_changes;
+ bool _pending_player_change;
boost::shared_ptr<const Image> _frame;
DCPTime _position;
boost::shared_ptr<const Image> _frame;
DCPTime _position;