Bump version

[dcpomatic.git] / src / wx / film_viewer.cc

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 5770c5b70e5066e30b0bd0b7631a2163cd3f8b17..4f2985a061db3677ebfb6d0ed5c89bf2fd25c9f8 100644 (file)
--- 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;
@@ -410,7 +410,7 @@ FilmViewer::process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle> s
        _got_frame = true;
 
        double const fps = _decoders.video->frames_per_second ();
-       _frame->SetLabel (wxString::Format ("%d", int (rint (t * fps))));
+       _frame->SetLabel (wxString::Format (wxT("%d"), int (rint (t * fps))));
 
        double w = t;
        int const h = (w / 3600);
@@ -420,7 +420,7 @@ FilmViewer::process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle> s
        int const s = floor (w);
        w -= s;
        int const f = rint (w * fps);
-       _timecode->SetLabel (wxString::Format ("%02d:%02d:%02d:%02d", h, m, s, f));
+       _timecode->SetLabel (wxString::Format (wxT("%02d:%02d:%02d:%02d"), h, m, s, f));
 }
 
 void