summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-04-20 02:27:27 +0100
committerCarl Hetherington <cth@carlh.net>2013-04-20 02:27:27 +0100
commitd40ebb82f62ab3d826e43e8d1187be9b768e535f (patch)
treea34702b3ca85cdff7101825723e9827483db38f2 /src
parent98499a61e17e68c438e56fd8854081a4c98b15ad (diff)
parent45747c8dce6448cc6b6c797ae04f3e5fc3b741e8 (diff)
Merge branch 'staging' of ssh://houllier/home/carl/git/dvdomatic into staging
Diffstat (limited to 'src')
-rw-r--r--src/wx/film_viewer.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 5770c5b70..8508ec2a2 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -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