Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-02-05 11:13:16 +01:00
Code Issues Releases Wiki Activity

Apply patch from Joel Bouchat to improve WAV tag importing and exporting for non-ASCII characters, making sure that it works in UTF-8 locales

Browse Source
This commit is contained in:
RichardAsh1981@gmail.com
2013-07-31 10:21:41 +00:00
parent ac6eaeeb70
commit d571ece7e6
2 changed files with 52 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/import/ImportPCM.cpp
View File

@@ -107,8 +107,8 @@ private:
sampleFormat mFormat;
};
void GetPCMImportPlugin(ImportPluginList *importPluginList,
UnusableImportPluginList *unusableImportPluginList)
void GetPCMImportPlugin(ImportPluginList * importPluginList,
UnusableImportPluginList * WXUNUSED(unusableImportPluginList))
{
importPluginList->Append(new PCMImportPlugin);
}
@@ -506,7 +506,8 @@ int PCMImportFileHandle::Import(TrackFactory *trackFactory,
}
#if defined(USE_LIBID3TAG)
if ((mInfo.format & SF_FORMAT_TYPEMASK) == SF_FORMAT_AIFF) {
if (((mInfo.format & SF_FORMAT_TYPEMASK) == SF_FORMAT_AIFF) ||
((mInfo.format & SF_FORMAT_TYPEMASK) == SF_FORMAT_WAV)) {
wxFFile f(mFilename, wxT("rb"));
if (f.IsOpened()) {
char id[5];
@@ -522,9 +523,10 @@ int PCMImportFileHandle::Import(TrackFactory *trackFactory,
break;
}
f.Read(&len, 4);
len = wxUINT32_SWAP_ON_LE(len);
if((mInfo.format & SF_FORMAT_TYPEMASK) == SF_FORMAT_AIFF)
len = wxUINT32_SWAP_ON_LE(len);
if (strcmp(id, "ID3 ") != 0) {
if (Stricmp(id, "ID3 ") != 0) { // must be case insensitive
f.Seek(len + (len & 0x01), wxFromCurrent);
continue;
}