projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op; fix GPL address and use the explicit-program-name version.
[dcpomatic.git]
/
src
/
wx
/
film_viewer.h
diff --git
a/src/wx/film_viewer.h
b/src/wx/film_viewer.h
index f6ab1a567efed8e56be5c685aac38f61c88adc7b..0bb22d4227548de40af590d1a1f445cb12647e77 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/>.
*/
*/
@@
-44,6
+45,13
@@
public:
return _position;
}
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 &);
@@
-52,7
+60,7
@@
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);
@@
-69,6
+77,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;
@@
-76,6
+86,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;