Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-24 11:54:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mkvmerge's output is already UTF-8 and must be converted accordingly.

Browse Source
This commit is contained in:
Moritz Bunkus 2005-02-26 22:27:54 +00:00
parent 496347d885
commit d4c93c07c4
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,5 +1,12 @@
2005-02-26 Moritz Bunkus <moritz@bunkus.org> 2005-02-26 Moritz Bunkus <moritz@bunkus.org>
* mmg: bug fix: mkvmerge's output during muxing was not converted
from UTF-8.
* mmg: bug fix: The default extension added when the user doesn't
give one is different in wxWidgets 2.4.x and 2.5.x. It should
always be .mkv and not .mka.
* Released v1.4.0. * Released v1.4.0.
2005-02-19 Moritz Bunkus <moritz@bunkus.org> 2005-02-19 Moritz Bunkus <moritz@bunkus.org>

4
src/mmg/jobs.cpp
View File

@ -227,9 +227,9 @@ job_run_dialog::process_input() {
if (got_char && ((c == '\n') || (c == '\r') || out->Eof())) { if (got_char && ((c == '\n') || (c == '\r') || out->Eof())) {
#if WXUNICODE #if WXUNICODE
wx_line = wxU(to_utf8(cc_local_utf8, line).c_str()); wx_line = wxU(line.c_str());
#else #else
wx_line = line.c_str(); wx_line = from_utf8(cc_local_utf8, line).c_str();
#endif #endif
if (wx_line.Find(wxT("progress")) == 0) { if (wx_line.Find(wxT("progress")) == 0) {
if (wx_line.Find(wxT("%")) != 0) { if (wx_line.Find(wxT("%")) != 0) {

4
src/mmg/mux_dialog.cpp
View File

@ -158,9 +158,9 @@ mux_dialog::mux_dialog(wxWindow *parent):
if ((c == '\n') || (c == '\r') || out->Eof()) { if ((c == '\n') || (c == '\r') || out->Eof()) {
#if WXUNICODE #if WXUNICODE
wx_line = wxU(to_utf8(cc_local_utf8, line).c_str()); wx_line = wxU(line.c_str());
#else #else
wx_line = line.c_str(); wx_line = from_utf8(cc_local_utf8, line).c_str();
#endif #endif
log += wx_line + wxT("\n"); log += wx_line + wxT("\n");
if (wx_line.Find(wxT("Warning:")) == 0) if (wx_line.Find(wxT("Warning:")) == 0)