projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Untested merge of master.
[dcpomatic.git]
/
src
/
wx
/
film_viewer.h
diff --git
a/src/wx/film_viewer.h
b/src/wx/film_viewer.h
index c81c65acd782d4deb26cb1e7c37c1c540e308955..814a095af374753ac17a596651e9397211b0b5e0 100644
(file)
--- a/
src/wx/film_viewer.h
+++ b/
src/wx/film_viewer.h
@@
-67,7
+67,7
@@
private:
void slider_moved (wxScrollEvent &);
void play_clicked (wxCommandEvent &);
void timer (wxTimerEvent &);
void slider_moved (wxScrollEvent &);
void play_clicked (wxCommandEvent &);
void timer (wxTimerEvent &);
- void process_video (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>);
+ void process_video (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>
, double
);
void calculate_sizes ();
void check_play_state ();
void update_from_raw ();
void calculate_sizes ();
void check_play_state ();
void update_from_raw ();
@@
-75,6
+75,8
@@
private:
void raw_to_display ();
void get_frame ();
void active_jobs_changed (bool);
void raw_to_display ();
void get_frame ();
void active_jobs_changed (bool);
+ void back_clicked (wxCommandEvent &);
+ void forward_clicked (wxCommandEvent &);
boost::shared_ptr<Film> _film;
boost::shared_ptr<Player> _player;
boost::shared_ptr<Film> _film;
boost::shared_ptr<Player> _player;
@@
-82,6
+84,10
@@
private:
wxSizer* _v_sizer;
wxPanel* _panel;
wxSlider* _slider;
wxSizer* _v_sizer;
wxPanel* _panel;
wxSlider* _slider;
+ wxButton* _back_button;
+ wxButton* _forward_button;
+ wxStaticText* _frame;
+ wxStaticText* _timecode;
wxToggleButton* _play_button;
wxTimer _timer;
wxToggleButton* _play_button;
wxTimer _timer;