From f1ef1a7178edf388e7de00926dacb894837054aa Mon Sep 17 00:00:00 2001 From: jules Date: Wed, 27 Feb 2013 16:29:56 +0000 Subject: [PATCH] MSVC function call convention fixes. AAX compile fix. --- .../buffers/juce_AudioSampleBuffer.cpp | 4 ++-- .../buffers/juce_FloatVectorOperations.cpp | 22 +++++++++---------- .../buffers/juce_FloatVectorOperations.h | 22 +++++++++---------- .../AAX/juce_AAX_Wrapper.cpp | 3 ++- .../processors/juce_AudioProcessor.cpp | 2 +- .../processors/juce_AudioProcessor.h | 2 +- 6 files changed, 28 insertions(+), 27 deletions(-) diff --git a/modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.cpp b/modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.cpp index 3a411fc0d3..6d8b24be93 100644 --- a/modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.cpp +++ b/modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.cpp @@ -58,7 +58,7 @@ void AudioSampleBuffer::allocateData() chan += size; } - channels [numChannels] = 0; + channels [numChannels] = nullptr; } AudioSampleBuffer::AudioSampleBuffer (float* const* dataToReferTo, @@ -120,7 +120,7 @@ void AudioSampleBuffer::allocateChannels (float* const* const dataToReferTo, int channels[i] = dataToReferTo[i] + offset; } - channels [numChannels] = 0; + channels [numChannels] = nullptr; } AudioSampleBuffer& AudioSampleBuffer::operator= (const AudioSampleBuffer& other) noexcept diff --git a/modules/juce_audio_basics/buffers/juce_FloatVectorOperations.cpp b/modules/juce_audio_basics/buffers/juce_FloatVectorOperations.cpp index 49f41757f1..14c5b36685 100644 --- a/modules/juce_audio_basics/buffers/juce_FloatVectorOperations.cpp +++ b/modules/juce_audio_basics/buffers/juce_FloatVectorOperations.cpp @@ -105,7 +105,7 @@ namespace FloatVectorHelpers #define JUCE_PERFORM_SSE_OP_SRC_DEST(normalOp, sseOp, locals, increment) for (int i = 0; i < num; ++i) normalOp; #endif -void FloatVectorOperations::clear (float* dest, const int num) noexcept +void JUCE_CALLTYPE FloatVectorOperations::clear (float* dest, int num) noexcept { #if JUCE_USE_VDSP_FRAMEWORK vDSP_vclr (dest, 1, num); @@ -114,7 +114,7 @@ void FloatVectorOperations::clear (float* dest, const int num) noexcept #endif } -void FloatVectorOperations::fill (float* dest, float valueToFill, int num) noexcept +void JUCE_CALLTYPE FloatVectorOperations::fill (float* dest, float valueToFill, int num) noexcept { #if JUCE_USE_VDSP_FRAMEWORK vDSP_vfill (&valueToFill, dest, 1, num); @@ -127,12 +127,12 @@ void FloatVectorOperations::fill (float* dest, float valueToFill, int num) noexc #endif } -void FloatVectorOperations::copy (float* dest, const float* src, const int num) noexcept +void JUCE_CALLTYPE FloatVectorOperations::copy (float* dest, const float* src, int num) noexcept { memcpy (dest, src, num * sizeof (float)); } -void FloatVectorOperations::copyWithMultiply (float* dest, const float* src, float multiplier, int num) noexcept +void JUCE_CALLTYPE FloatVectorOperations::copyWithMultiply (float* dest, const float* src, float multiplier, int num) noexcept { #if JUCE_USE_VDSP_FRAMEWORK vDSP_vsmul (src, 1, &multiplier, dest, 1, num); @@ -147,7 +147,7 @@ void FloatVectorOperations::copyWithMultiply (float* dest, const float* src, flo #endif } -void FloatVectorOperations::add (float* dest, const float* src, int num) noexcept +void JUCE_CALLTYPE FloatVectorOperations::add (float* dest, const float* src, int num) noexcept { #if JUCE_USE_VDSP_FRAMEWORK vDSP_vadd (src, 1, dest, 1, dest, 1, num); @@ -158,7 +158,7 @@ void FloatVectorOperations::add (float* dest, const float* src, int num) noexcep #endif } -void FloatVectorOperations::add (float* dest, float amount, int num) noexcept +void JUCE_CALLTYPE FloatVectorOperations::add (float* dest, float amount, int num) noexcept { #if JUCE_USE_SSE_INTRINSICS const __m128 amountToAdd = _mm_load1_ps (&amount); @@ -169,7 +169,7 @@ void FloatVectorOperations::add (float* dest, float amount, int num) noexcept JUCE_LOAD_DEST) } -void FloatVectorOperations::addWithMultiply (float* dest, const float* src, float multiplier, int num) noexcept +void JUCE_CALLTYPE FloatVectorOperations::addWithMultiply (float* dest, const float* src, float multiplier, int num) noexcept { #if JUCE_USE_SSE_INTRINSICS const __m128 mult = _mm_load1_ps (&multiplier); @@ -180,7 +180,7 @@ void FloatVectorOperations::addWithMultiply (float* dest, const float* src, floa JUCE_LOAD_SRC_DEST, JUCE_INCREMENT_SRC_DEST) } -void FloatVectorOperations::multiply (float* dest, const float* src, int num) noexcept +void JUCE_CALLTYPE FloatVectorOperations::multiply (float* dest, const float* src, int num) noexcept { #if JUCE_USE_VDSP_FRAMEWORK vDSP_vmul (src, 1, dest, 1, dest, 1, num); @@ -191,7 +191,7 @@ void FloatVectorOperations::multiply (float* dest, const float* src, int num) no #endif } -void FloatVectorOperations::multiply (float* dest, float multiplier, int num) noexcept +void JUCE_CALLTYPE FloatVectorOperations::multiply (float* dest, float multiplier, int num) noexcept { #if JUCE_USE_VDSP_FRAMEWORK vDSP_vsmul (dest, 1, &multiplier, dest, 1, num); @@ -206,7 +206,7 @@ void FloatVectorOperations::multiply (float* dest, float multiplier, int num) no #endif } -void FloatVectorOperations::convertFixedToFloat (float* dest, const int* src, float multiplier, int num) noexcept +void JUCE_CALLTYPE FloatVectorOperations::convertFixedToFloat (float* dest, const int* src, float multiplier, int num) noexcept { #if JUCE_USE_SSE_INTRINSICS const __m128 mult = _mm_load1_ps (&multiplier); @@ -217,7 +217,7 @@ void FloatVectorOperations::convertFixedToFloat (float* dest, const int* src, fl JUCE_LOAD_NONE, JUCE_INCREMENT_SRC_DEST) } -void FloatVectorOperations::findMinAndMax (const float* src, int num, float& minResult, float& maxResult) noexcept +void JUCE_CALLTYPE FloatVectorOperations::findMinAndMax (const float* src, int num, float& minResult, float& maxResult) noexcept { #if JUCE_USE_SSE_INTRINSICS const int numLongOps = num / 4; diff --git a/modules/juce_audio_basics/buffers/juce_FloatVectorOperations.h b/modules/juce_audio_basics/buffers/juce_FloatVectorOperations.h index 533baed665..5d51b72698 100644 --- a/modules/juce_audio_basics/buffers/juce_FloatVectorOperations.h +++ b/modules/juce_audio_basics/buffers/juce_FloatVectorOperations.h @@ -37,37 +37,37 @@ class JUCE_API FloatVectorOperations public: //============================================================================== /** Clears a vector of floats. */ - static void clear (float* dest, int numValues) noexcept; + static void JUCE_CALLTYPE clear (float* dest, int numValues) noexcept; /** Copies a repeated value into a vector of floats. */ - static void fill (float* dest, float valueToFill, int numValues) noexcept; + static void JUCE_CALLTYPE fill (float* dest, float valueToFill, int numValues) noexcept; /** Copies a vector of floats. */ - static void copy (float* dest, const float* src, int numValues) noexcept; + static void JUCE_CALLTYPE copy (float* dest, const float* src, int numValues) noexcept; /** Copies a vector of floats, multiplying each value by a given multiplier */ - static void copyWithMultiply (float* dest, const float* src, float multiplier, int numValues) noexcept; + static void JUCE_CALLTYPE copyWithMultiply (float* dest, const float* src, float multiplier, int numValues) noexcept; /** Adds the source values to the destination values. */ - static void add (float* dest, const float* src, int numValues) noexcept; + static void JUCE_CALLTYPE add (float* dest, const float* src, int numValues) noexcept; /** Adds a fixed value to the destination values. */ - static void add (float* dest, float amount, int numValues) noexcept; + static void JUCE_CALLTYPE add (float* dest, float amount, int numValues) noexcept; /** Multiplies each source value by the given multiplier, then adds it to the destination value. */ - static void addWithMultiply (float* dest, const float* src, float multiplier, int numValues) noexcept; + static void JUCE_CALLTYPE addWithMultiply (float* dest, const float* src, float multiplier, int numValues) noexcept; /** Multiplies the destination values by the source values. */ - static void multiply (float* dest, const float* src, int numValues) noexcept; + static void JUCE_CALLTYPE multiply (float* dest, const float* src, int numValues) noexcept; /** Multiplies each of the destination values by a fixed multiplier. */ - static void multiply (float* dest, float multiplier, int numValues) noexcept; + static void JUCE_CALLTYPE multiply (float* dest, float multiplier, int numValues) noexcept; /** Converts a stream of integers to floats, multiplying each one by the given multiplier. */ - static void convertFixedToFloat (float* dest, const int* src, float multiplier, int numValues) noexcept; + static void JUCE_CALLTYPE convertFixedToFloat (float* dest, const int* src, float multiplier, int numValues) noexcept; /** Finds the miniumum and maximum values in the given array. */ - static void findMinAndMax (const float* src, int numValues, float& minResult, float& maxResult) noexcept; + static void JUCE_CALLTYPE findMinAndMax (const float* src, int numValues, float& minResult, float& maxResult) noexcept; }; diff --git a/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp b/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp index 1eec72edfd..53d2e4c168 100644 --- a/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp @@ -678,7 +678,8 @@ struct AAXClasses AudioProcessor& audioProcessor = getPluginInstance(); const AAX_CSampleRate sampleRate = getSampleRate(); - audioProcessor.setPlayConfigDetails (numberOfInputChannels, numberOfOutputChannels, sampleRate, 0); + const int bufferSize = 0; // how to get this? + audioProcessor.setPlayConfigDetails (numberOfInputChannels, numberOfOutputChannels, sampleRate, bufferSize); audioProcessor.prepareToPlay (sampleRate, bufferSize); check (Controller()->SetSignalLatency (audioProcessor.getLatencySamples())); diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessor.cpp b/modules/juce_audio_processors/processors/juce_AudioProcessor.cpp index bb7ac74be5..23ad5f4ec9 100644 --- a/modules/juce_audio_processors/processors/juce_AudioProcessor.cpp +++ b/modules/juce_audio_processors/processors/juce_AudioProcessor.cpp @@ -25,7 +25,7 @@ static ThreadLocalValue wrapperTypeBeingCreated; -void AudioProcessor::setTypeOfNextNewPlugin (AudioProcessor::WrapperType type) +void JUCE_CALLTYPE AudioProcessor::setTypeOfNextNewPlugin (AudioProcessor::WrapperType type) { wrapperTypeBeingCreated = type; } diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessor.h b/modules/juce_audio_processors/processors/juce_AudioProcessor.h index 8b7e53634e..74104d1ac0 100644 --- a/modules/juce_audio_processors/processors/juce_AudioProcessor.h +++ b/modules/juce_audio_processors/processors/juce_AudioProcessor.h @@ -591,7 +591,7 @@ public: WrapperType wrapperType; /** @internal */ - static void setTypeOfNextNewPlugin (WrapperType); + static void JUCE_CALLTYPE setTypeOfNextNewPlugin (WrapperType); protected: //==============================================================================