projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Basic grunt-work, untested and unfinished, but it compiles.
[dcpomatic.git]
/
src
/
wx
/
film_viewer.h
diff --git
a/src/wx/film_viewer.h
b/src/wx/film_viewer.h
index aa588b92607d9a3922c1d7a03f70a19a348d603b..563178ac341f4f2b0d8d44b2e7a1d6757ccb3115 100644
(file)
--- a/
src/wx/film_viewer.h
+++ b/
src/wx/film_viewer.h
@@
-67,7
+67,9
@@
private:
void player_changed (bool);
void update_position_label ();
void update_position_slider ();
void player_changed (bool);
void update_position_label ();
void update_position_slider ();
- void get (DCPTime, bool);
+ void video (boost::shared_ptr<PlayerVideo>);
+ void get ();
+ void seek (DCPTime t, bool accurate);
void refresh_panel ();
void setup_sensitivity ();
void film_changed (Film::Property);
void refresh_panel ();
void setup_sensitivity ();
void film_changed (Film::Property);
@@
-75,6
+77,7
@@
private:
void timecode_clicked ();
void frame_number_clicked ();
void go_to (DCPTime t);
void timecode_clicked ();
void frame_number_clicked ();
void go_to (DCPTime t);
+ void jump_to_selected_clicked ();
boost::shared_ptr<Film> _film;
boost::shared_ptr<Player> _player;
boost::shared_ptr<Film> _film;
boost::shared_ptr<Player> _player;
@@
-84,6
+87,7
@@
private:
wxCheckBox* _outline_content;
wxRadioButton* _left_eye;
wxRadioButton* _right_eye;
wxCheckBox* _outline_content;
wxRadioButton* _left_eye;
wxRadioButton* _right_eye;
+ wxCheckBox* _jump_to_selected;
wxSlider* _slider;
wxButton* _back_button;
wxButton* _forward_button;
wxSlider* _slider;
wxButton* _back_button;
wxButton* _forward_button;
@@
-103,12
+107,11
@@
private:
dcp::Size _out_size;
/** Size of the panel that we have available */
dcp::Size _panel_size;
dcp::Size _out_size;
/** Size of the panel that we have available */
dcp::Size _panel_size;
- /** true if the last call to
::get
() was specified to be accurate;
+ /** true if the last call to
Player::seek
() was specified to be accurate;
* this is used so that when re-fetching the current frame we
* can get the same one that we got last time.
*/
* this is used so that when re-fetching the current frame we
* can get the same one that we got last time.
*/
- bool _last_get_accurate;
-
+ bool _last_seek_accurate;
boost::signals2::scoped_connection _film_connection;
boost::signals2::scoped_connection _player_connection;
};
boost::signals2::scoped_connection _film_connection;
boost::signals2::scoped_connection _player_connection;
};