From d4c93c07c4e8f0e983bb9391718a771fea8cf6e9 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sat, 26 Feb 2005 22:27:54 +0000 Subject: [PATCH] mkvmerge's output is already UTF-8 and must be converted accordingly. --- ChangeLog | 7 +++++++ src/mmg/jobs.cpp | 4 ++-- src/mmg/mux_dialog.cpp | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9fd18487..c01becefa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2005-02-26 Moritz Bunkus + * 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. 2005-02-19 Moritz Bunkus diff --git a/src/mmg/jobs.cpp b/src/mmg/jobs.cpp index 773b24289..5bae068d9 100644 --- a/src/mmg/jobs.cpp +++ b/src/mmg/jobs.cpp @@ -227,9 +227,9 @@ job_run_dialog::process_input() { if (got_char && ((c == '\n') || (c == '\r') || out->Eof())) { #if WXUNICODE - wx_line = wxU(to_utf8(cc_local_utf8, line).c_str()); + wx_line = wxU(line.c_str()); #else - wx_line = line.c_str(); + wx_line = from_utf8(cc_local_utf8, line).c_str(); #endif if (wx_line.Find(wxT("progress")) == 0) { if (wx_line.Find(wxT("%")) != 0) { diff --git a/src/mmg/mux_dialog.cpp b/src/mmg/mux_dialog.cpp index 2ea2dd3a7..859f7f8b6 100644 --- a/src/mmg/mux_dialog.cpp +++ b/src/mmg/mux_dialog.cpp @@ -158,9 +158,9 @@ mux_dialog::mux_dialog(wxWindow *parent): if ((c == '\n') || (c == '\r') || out->Eof()) { #if WXUNICODE - wx_line = wxU(to_utf8(cc_local_utf8, line).c_str()); + wx_line = wxU(line.c_str()); #else - wx_line = line.c_str(); + wx_line = from_utf8(cc_local_utf8, line).c_str(); #endif log += wx_line + wxT("\n"); if (wx_line.Find(wxT("Warning:")) == 0)