projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
wx
/
film_editor.cc
diff --git
a/src/wx/film_editor.cc
b/src/wx/film_editor.cc
index feb49ed78a394b392f93e118ae604fe3e2948ce9..a197a7490b4b2b7f7f36d5fa8be29fc04c36d99a 100644
(file)
--- a/
src/wx/film_editor.cc
+++ b/
src/wx/film_editor.cc
@@
-795,10
+795,10
@@
FilmEditor::setup_frame_rate_description ()
_film->target_audio_sample_rate()
);
} else {
_film->target_audio_sample_rate()
);
} else {
- d <<
"\n"
;
+ d <<
wxT ("\n")
;
}
#else
}
#else
- d <<
"\n"
;
+ d <<
wxT ("\n")
;
#endif
}
#endif
}
@@
-1182,9
+1182,9
@@
FilmEditor::setup_audio_details ()
if (_film->audio_channels() == 1) {
s << _("1 channel");
} else {
if (_film->audio_channels() == 1) {
s << _("1 channel");
} else {
- s << _film->audio_channels() <<
" "
<< _("channels");
+ s << _film->audio_channels() <<
wxT (" ")
<< _("channels");
}
}
- s <<
", "
<< _film->audio_frame_rate() << _("Hz");
+ s <<
wxT (", ")
<< _film->audio_frame_rate() << _("Hz");
_audio->SetLabel (s);
}
_audio->SetLabel (s);
}
@@
-1444,7
+1444,7
@@
FilmEditor::setup_scaling_description ()
}
for (int i = lines; i < 4; ++i) {
}
for (int i = lines; i < 4; ++i) {
- d <<
" \n"
;
+ d <<
wxT (" \n")
;
}
_scaling_description->SetLabel (d);
}
_scaling_description->SetLabel (d);