diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-26 23:49:54 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-26 23:49:54 +0100 |
| commit | 87a709a4ea5dffaadaf35ef94edb4b578eb3b56c (patch) | |
| tree | f8a5aa8e9a2e16ebe4a38b917fd5bc9654866789 /src/wx | |
| parent | ccc07eebc492d74c351c235584fd708c46b5b656 (diff) | |
| parent | 86011ad6b4ea0004a51c59b0563cf89c0947546d (diff) | |
Merge master.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/film_viewer.cc | 4 | ||||
| -rw-r--r-- | src/wx/film_viewer.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 8508ec2a2..4f2985a06 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -308,7 +308,7 @@ FilmViewer::raw_to_display () return; } - boost::shared_ptr<Image> input = _raw_frame; + boost::shared_ptr<const Image> input = _raw_frame; pair<string, string> const s = Filter::ffmpeg_strings (_film->filters()); if (!s.second.empty ()) { @@ -400,7 +400,7 @@ FilmViewer::check_play_state () } void -FilmViewer::process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle> sub, double t) +FilmViewer::process_video (shared_ptr<const Image> image, bool, shared_ptr<Subtitle> sub, double t) { _raw_frame = image; _raw_sub = sub; diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h index a78c772a4..ed5874fbc 100644 --- a/src/wx/film_viewer.h +++ b/src/wx/film_viewer.h @@ -48,7 +48,7 @@ private: void slider_moved (wxScrollEvent &); void play_clicked (wxCommandEvent &); void timer (wxTimerEvent &); - void process_video (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>, double); + void process_video (boost::shared_ptr<const Image>, bool, boost::shared_ptr<Subtitle>, double); void calculate_sizes (); void check_play_state (); void update_from_raw (); @@ -72,9 +72,9 @@ private: wxTimer _timer; Decoders _decoders; - boost::shared_ptr<Image> _raw_frame; + boost::shared_ptr<const Image> _raw_frame; 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. */ |