1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-20 22:30:05 +02:00

Merge branch 'master' of github.com:audacity/audacity

This commit is contained in:
Paul Licameli 2016-03-02 12:44:24 -05:00
commit 2f6af8bfd5
2 changed files with 6 additions and 4 deletions

View File

@ -20,7 +20,7 @@ done
#
cd ${TOPLEVEL}
mkdir -p mac/build
eval $(gcc -E -dM src/Audacity.h | awk '/#define *AUDACITY_(VERSION|RELEASE|REVISION|MODLEVEL) /{print $2 "=" $3}')
eval $(g++ -E -dM src/Audacity.h | awk '/#define *AUDACITY_(VERSION|RELEASE|REVISION|MODLEVEL) /{print $2 "=" $3}')
cat >mac/build/Info.plist.h <<EOF
#define AUDACITY_EXECUTABLE Audacity
#define AUDACITY_VERSION ${AUDACITY_VERSION}

View File

@ -2335,7 +2335,7 @@ bool VSTEffect::LoadParameters(const wxString & group)
{
wxString value;
VstPatchChunkInfo info = {1, mAEffect->uniqueID, mAEffect->version, mAEffect->numParams};
VstPatchChunkInfo info = {1, mAEffect->uniqueID, mAEffect->version, mAEffect->numParams, ""};
mHost->GetPrivateConfig(group, wxT("UniqueID"), info.pluginUniqueID, info.pluginUniqueID);
mHost->GetPrivateConfig(group, wxT("Version"), info.pluginVersion, info.pluginVersion);
mHost->GetPrivateConfig(group, wxT("Elements"), info.numElements, info.numElements);
@ -3130,7 +3130,8 @@ bool VSTEffect::LoadFXB(const wxFileName & fn)
1,
wxINT32_SWAP_ON_LE(iptr[4]),
wxINT32_SWAP_ON_LE(iptr[5]),
wxINT32_SWAP_ON_LE(iptr[6])
wxINT32_SWAP_ON_LE(iptr[6]),
""
};
// Ensure this program looks to belong to the current plugin
@ -3324,7 +3325,8 @@ bool VSTEffect::LoadFXProgram(unsigned char **bptr, ssize_t & len, int index, bo
1,
wxINT32_SWAP_ON_LE(iptr[4]),
wxINT32_SWAP_ON_LE(iptr[5]),
wxINT32_SWAP_ON_LE(iptr[6])
wxINT32_SWAP_ON_LE(iptr[6]),
""
};
// Ensure this program looks to belong to the current plugin