projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add unfinished timing tab; fix crash on reconstruction of timeline; fix lack of black...
[dcpomatic.git]
/
src
/
wx
/
film_viewer.h
diff --git
a/src/wx/film_viewer.h
b/src/wx/film_viewer.h
index 814a095af374753ac17a596651e9397211b0b5e0..68d51bfbded2accec2137ad088f2d173267f59e1 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>, doubl
e);
+ void process_video (boost::shared_ptr<
const Image>, bool, boost::shared_ptr<Subtitle>, Tim
e);
void calculate_sizes ();
void check_play_state ();
void update_from_raw ();
void calculate_sizes ();
void check_play_state ();
void update_from_raw ();
@@
-91,9
+91,9
@@
private:
wxToggleButton* _play_button;
wxTimer _timer;
wxToggleButton* _play_button;
wxTimer _timer;
- boost::shared_ptr<Image> _raw_frame;
+ boost::shared_ptr<
const
Image> _raw_frame;
boost::shared_ptr<Subtitle> _raw_sub;
boost::shared_ptr<Subtitle> _raw_sub;
- boost::shared_ptr<Image> _display_frame;
+ boost::shared_ptr<
const
Image> _display_frame;
/* The x offset at which we display the actual film content; this corresponds
to the film's padding converted to our coordinates.
*/
/* The x offset at which we display the actual film content; this corresponds
to the film's padding converted to our coordinates.
*/