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

Necessary changes for the previous API/UTF-8 changes.

Browse Source
This commit is contained in:
Moritz Bunkus 2005-01-01 19:37:26 +00:00
parent 6377a9c4ef
commit 7b9392f0c7
3 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/mmg/mmg.cpp
View File

@ -431,24 +431,33 @@ strip(vector<wxString> &v,
string string
to_utf8(const wxString &src) { to_utf8(const wxString &src) {
char *utf8;
string retval; string retval;
#if WXUNICODE #if WXUNICODE
char *utf8;
int len; int len;
len = wxConvUTF8.WC2MB(NULL, src.c_str(), 0); len = wxConvUTF8.WC2MB(NULL, src.c_str(), 0);
utf8 = (char *)safemalloc(len + 1); utf8 = (char *)safemalloc(len + 1);
wxConvUTF8.WC2MB(utf8, src.c_str(), len + 1); wxConvUTF8.WC2MB(utf8, src.c_str(), len + 1);
#else
utf8 = to_utf8_c(cc_local_utf8, src);
#endif
retval = utf8; retval = utf8;
safefree(utf8); safefree(utf8);
#else
retval = to_utf8(cc_local_utf8, src.c_str());
#endif
return retval; return retval;
} }
wxString
from_utf8(const wxString &src) {
#if WXUNICODE
return src;
#else
return wxString(from_utf8(cc_local_utf8, src.c_str()).c_str());
#endif
}
wxString wxString
unescape(const wxString &src) { unescape(const wxString &src) {
wxString dst; wxString dst;

1
src/mmg/mmg.h
View File

@ -92,6 +92,7 @@ wxString join(const wxString &pattern, vector<wxString> &strings);
wxString &strip(wxString &s, bool newlines = false); wxString &strip(wxString &s, bool newlines = false);
vector<wxString> & strip(vector<wxString> &v, bool newlines = false); vector<wxString> & strip(vector<wxString> &v, bool newlines = false);
string to_utf8(const wxString &src); string to_utf8(const wxString &src);
wxString from_utf8(const wxString &src);
wxString UTFstring_to_wxString(const UTFstring &u); wxString UTFstring_to_wxString(const UTFstring &u);
wxString unescape(const wxString &src); wxString unescape(const wxString &src);
wxString format_date_time(time_t date_time); wxString format_date_time(time_t date_time);

15
src/mmg/tab_input.cpp
View File

@ -634,21 +634,6 @@ tab_input::enable_ar_controls(mmg_track_t *track) {
rb_display_dimensions->SetValue(!ar_enabled); rb_display_dimensions->SetValue(!ar_enabled);
} }
static wxString
from_utf8(const wxString &src) {
#if WXUNICODE
return src;
#else
wxString retval;
char *local;
local = from_utf8_c(cc_local_utf8, src.c_str());
retval = local;
safefree(local);
return retval;
#endif
}
void void
tab_input::on_add_file(wxCommandEvent &evt) { tab_input::on_add_file(wxCommandEvent &evt) {
wxString media_files; wxString media_files;