mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-26 02:14:22 +00:00
Code Activity

Endianness fix for header magic in VST FXB file reading/writing.

Browse source
This commit is contained in:
jules 2014-12-15 13:17:29 +00:00
parent 5eb98197b8
commit 2cab1f54de
1 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

25
modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
View file

@ -135,7 +135,14 @@ namespace
char chunk[8]; // variable
};
static VstInt32 fxbName (const char* name) noexcept { return (VstInt32) ByteOrder::bigEndianInt (name); }
// Compares a magic value in either endianness.
static bool compareMagic (VstInt32 magic, const char* name) noexcept
{
return magic == (VstInt32) ByteOrder::littleEndianInt (name)
|| magic == (VstInt32) ByteOrder::bigEndianInt (name);
}
static VstInt32 fxbName (const char* name) noexcept { return (VstInt32) ByteOrder::littleEndianInt (name); }
static VstInt32 fxbSwap (const VstInt32 x) noexcept { return (VstInt32) ByteOrder::swapIfLittleEndian ((uint32) x); }
static float fxbSwapFloat (const float x) noexcept
@ -1432,11 +1439,10 @@ public:
const fxSet* const set = (const fxSet*) data;
if ((set->chunkMagic != fxbName ("CcnK") && set->chunkMagic != fxbName ("KncC"))
|| fxbSwap (set->version) > fxbVersionNum)
if ((! compareMagic (set->chunkMagic, "CcnK")) || fxbSwap (set->version) > fxbVersionNum)
return false;
if (set->fxMagic == fxbName ("FxBk"))
if (compareMagic (set->fxMagic, "FxBk"))
{
// bank of programs
if (fxbSwap (set->numPrograms) >= 0)
@ -1472,12 +1478,12 @@ public:
return false;
}
}
else if (set->fxMagic == fxbName ("FxCk"))
else if (compareMagic (set->fxMagic, "FxCk"))
{
// single program
const fxProgram* const prog = (const fxProgram*) data;
if (prog->chunkMagic != fxbName ("CcnK"))
if (! compareMagic (prog->chunkMagic, "CcnK"))
return false;
changeProgramName (getCurrentProgram(), prog->prgName);
@ -1485,7 +1491,7 @@ public:
for (int i = 0; i < fxbSwap (prog->numParams); ++i)
setParameter (i, fxbSwapFloat (prog->params[i]));
}
else if (set->fxMagic == fxbName ("FBCh") || set->fxMagic == fxbName ("hCBF"))
else if (compareMagic (set->fxMagic, "FBCh"))
{
// non-preset chunk
const fxChunkSet* const cset = (const fxChunkSet*) data;
@ -1495,7 +1501,7 @@ public:
setChunkData (cset->chunk, fxbSwap (cset->chunkSize), false);
}
else if (set->fxMagic == fxbName ("FPCh") || set->fxMagic == fxbName ("hCPF"))
else if (compareMagic (set->fxMagic, "FPCh"))
{
// preset chunk
const fxProgramSet* const cset = (const fxProgramSet*) data;
@ -1671,7 +1677,8 @@ private:
bool restoreProgramSettings (const fxProgram* const prog)
{
if (prog->chunkMagic == fxbName ("CcnK") && prog->fxMagic == fxbName ("FxCk"))
if (compareMagic (prog->chunkMagic, "CcnK")
&& compareMagic (prog->fxMagic, "FxCk"))
{
changeProgramName (getCurrentProgram(), prog->prgName);