projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
[dcpomatic.git]
/
src
/
wx
/
film_viewer.h
diff --git
a/src/wx/film_viewer.h
b/src/wx/film_viewer.h
index 4c7e3ba33c4d8a606c0a4ca92c1230311ce157b9..a67820a8ca21229e2b7ef8f40dfaaba7cf617596 100644
(file)
--- a/
src/wx/film_viewer.h
+++ b/
src/wx/film_viewer.h
@@
-1,19
+1,20
@@
/*
/*
- 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
+ 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.
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
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/>.
*/
*/
@@
-45,7
+46,7
@@
public:
}
void set_position (DCPTime p);
}
void set_position (DCPTime p);
- void set_
ignore_player_changes (bool i
);
+ void set_
coalesce_player_changes (bool c
);
void refresh ();
void refresh ();
@@
-60,8
+61,8
@@
private:
void calculate_sizes ();
void check_play_state ();
void active_jobs_changed (boost::optional<std::string>);
void calculate_sizes ();
void check_play_state ();
void active_jobs_changed (boost::optional<std::string>);
- void back_clicked ();
- void forward_clicked ();
+ void back_clicked (
wxMouseEvent &
);
+ void forward_clicked (
wxMouseEvent &
);
void player_changed (bool);
void update_position_label ();
void update_position_slider ();
void player_changed (bool);
void update_position_label ();
void update_position_slider ();
@@
-69,6
+70,10
@@
private:
void refresh_panel ();
void setup_sensitivity ();
void film_changed (Film::Property);
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);
boost::shared_ptr<Film> _film;
boost::shared_ptr<Player> _player;
boost::shared_ptr<Film> _film;
boost::shared_ptr<Player> _player;
@@
-76,6
+81,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;
@@
-83,7
+90,8
@@
private:
wxStaticText* _timecode;
wxToggleButton* _play_button;
wxTimer _timer;
wxStaticText* _timecode;
wxToggleButton* _play_button;
wxTimer _timer;
- bool _ignore_player_changes;
+ bool _coalesce_player_changes;
+ bool _pending_player_change;
boost::shared_ptr<const Image> _frame;
DCPTime _position;
boost::shared_ptr<const Image> _frame;
DCPTime _position;