Browse Source

carla-discovery: Fix build without vst force deprecated

tags/v0.9.0
falkTX 12 years ago
parent
commit
ab70483dfe
1 changed files with 11 additions and 2 deletions
  1. +11
    -2
      c++/carla-discovery/carla-discovery.cpp

+ 11
- 2
c++/carla-discovery/carla-discovery.cpp View File

@@ -135,10 +135,12 @@ intptr_t VSTCALLBACK vstHostCallback(AEffect* const effect, const int32_t opcode
ret = vstCurrentUniqueId; ret = vstCurrentUniqueId;
break; break;


#if ! VST_FORCE_DEPRECATED
case audioMasterWantMidi: case audioMasterWantMidi:
vstWantsMidi = true; vstWantsMidi = true;
ret = 1; ret = 1;
break; break;
#endif


case audioMasterGetTime: case audioMasterGetTime:
static VstTimeInfo_R timeInfo; static VstTimeInfo_R timeInfo;
@@ -157,8 +159,8 @@ intptr_t VSTCALLBACK vstHostCallback(AEffect* const effect, const int32_t opcode
ret = (intptr_t)&timeInfo; ret = (intptr_t)&timeInfo;
break; break;


#if ! VST_FORCE_DEPRECATED
case audioMasterTempoAt: case audioMasterTempoAt:
// Deprecated in VST SDK 2.4
ret = 120 * 10000; ret = 120 * 10000;
break; break;


@@ -169,6 +171,7 @@ intptr_t VSTCALLBACK vstHostCallback(AEffect* const effect, const int32_t opcode
case audioMasterGetParameterQuantization: case audioMasterGetParameterQuantization:
ret = 1; // full single float precision ret = 1; // full single float precision
break; break;
#endif


case audioMasterGetSampleRate: case audioMasterGetSampleRate:
ret = sampleRate; ret = sampleRate;
@@ -178,9 +181,11 @@ intptr_t VSTCALLBACK vstHostCallback(AEffect* const effect, const int32_t opcode
ret = bufferSize; ret = bufferSize;
break; break;


#if ! VST_FORCE_DEPRECATED
case audioMasterWillReplaceOrAccumulate: case audioMasterWillReplaceOrAccumulate:
ret = 1; // replace ret = 1; // replace
break; break;
#endif


case audioMasterGetCurrentProcessLevel: case audioMasterGetCurrentProcessLevel:
ret = kVstProcessLevelUser; ret = kVstProcessLevelUser;
@@ -904,11 +909,15 @@ void do_vst_check(void* const libHandle, const bool init)
if (midiIns > 0) if (midiIns > 0)
effect->dispatcher(effect, effProcessEvents, 0, 0, &events, 0.0f); effect->dispatcher(effect, effProcessEvents, 0, 0, &events, 0.0f);


#if ! VST_FORCE_DEPRECATED
if ((effect->flags & effFlagsCanReplacing) > 0 && effect->processReplacing != effect->process) if ((effect->flags & effFlagsCanReplacing) > 0 && effect->processReplacing != effect->process)
effect->processReplacing(effect, bufferAudioIn, bufferAudioOut, bufferSize); effect->processReplacing(effect, bufferAudioIn, bufferAudioOut, bufferSize);
#if ! VST_FORCE_DEPRECATED
else else
effect->process(effect, bufferAudioIn, bufferAudioOut, bufferSize); effect->process(effect, bufferAudioIn, bufferAudioOut, bufferSize);
#else
CARLA_ASSERT(effect->flags & effFlagsCanReplacing);
if (effect->flags & effFlagsCanReplacing)
effect->processReplacing(effect, bufferAudioIn, bufferAudioOut, bufferSize);
#endif #endif


effect->dispatcher(effect, effStopProcess, 0, 0, nullptr, 0.0f); effect->dispatcher(effect, effStopProcess, 0, 0, nullptr, 0.0f);


Loading…
Cancel
Save