Browse Source

Vst code update, incomplete

tags/1.9.4
falkTX 11 years ago
parent
commit
c483806f3c
10 changed files with 447 additions and 557 deletions
  1. +3
    -3
      source/backend/CarlaPlugin.hpp
  2. +3
    -1
      source/backend/plugin/BridgePlugin.cpp
  3. +1
    -1
      source/backend/plugin/CarlaPlugin.cpp
  4. +3
    -1
      source/backend/plugin/DssiPlugin.cpp
  5. +3
    -1
      source/backend/plugin/FluidSynthPlugin.cpp
  6. +3
    -1
      source/backend/plugin/LadspaPlugin.cpp
  7. +2
    -0
      source/backend/plugin/LinuxSamplerPlugin.cpp
  8. +2
    -0
      source/backend/plugin/Lv2Plugin.cpp
  9. +3
    -1
      source/backend/plugin/NativePlugin.cpp
  10. +424
    -548
      source/backend/plugin/VstPlugin.cpp

+ 3
- 3
source/backend/CarlaPlugin.hpp View File

@@ -195,7 +195,7 @@ public:
/*! /*!
* Get the plugin's category (delay, filter, synth, etc). * Get the plugin's category (delay, filter, synth, etc).
*/ */
virtual PluginCategory category() const
virtual PluginCategory category()
{ {
return PLUGIN_CATEGORY_NONE; return PLUGIN_CATEGORY_NONE;
} }
@@ -612,7 +612,7 @@ public:
* \param sendCallback Send message change to registered callback * \param sendCallback Send message change to registered callback
* \param block Block the audio callback * \param block Block the audio callback
*/ */
virtual void setProgram(const int32_t index, const bool sendGui, const bool sendOsc, const bool sendCallback);
virtual void setProgram(int32_t index, const bool sendGui, const bool sendOsc, const bool sendCallback);


/*! /*!
* Change the current MIDI plugin program to \a index. * Change the current MIDI plugin program to \a index.
@@ -626,7 +626,7 @@ public:
* \param sendCallback Send message change to registered callback * \param sendCallback Send message change to registered callback
* \param block Block the audio callback * \param block Block the audio callback
*/ */
virtual void setMidiProgram(const int32_t index, const bool sendGui, const bool sendOsc, const bool sendCallback);
virtual void setMidiProgram(int32_t index, const bool sendGui, const bool sendOsc, const bool sendCallback);


/*! /*!
* This is an overloaded call to setMidiProgram().\n * This is an overloaded call to setMidiProgram().\n


+ 3
- 1
source/backend/plugin/BridgePlugin.cpp View File

@@ -114,7 +114,7 @@ public:
return fPluginType; return fPluginType;
} }


PluginCategory category() const
PluginCategory category()
{ {
return fInfo.category; return fInfo.category;
} }
@@ -984,6 +984,8 @@ private:
} fInfo; } fInfo;


BridgeParamInfo* fParams; BridgeParamInfo* fParams;

CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(BridgePlugin)
}; };


CARLA_BACKEND_END_NAMESPACE CARLA_BACKEND_END_NAMESPACE


+ 1
- 1
source/backend/plugin/CarlaPlugin.cpp View File

@@ -1200,7 +1200,7 @@ void CarlaPlugin::setChunkData(const char* const stringData)
(void)stringData; (void)stringData;
} }


void CarlaPlugin::setProgram(const int32_t index, const bool sendGui, const bool sendOsc, const bool sendCallback)
void CarlaPlugin::setProgram(int32_t index, const bool sendGui, const bool sendOsc, const bool sendCallback)
{ {
CARLA_ASSERT(index >= -1 && index < static_cast<int32_t>(kData->prog.count)); CARLA_ASSERT(index >= -1 && index < static_cast<int32_t>(kData->prog.count));




+ 3
- 1
source/backend/plugin/DssiPlugin.cpp View File

@@ -103,7 +103,7 @@ public:
return PLUGIN_DSSI; return PLUGIN_DSSI;
} }


PluginCategory category() const
PluginCategory category()
{ {
if (fHints & PLUGIN_IS_SYNTH) if (fHints & PLUGIN_IS_SYNTH)
return PLUGIN_CATEGORY_SYNTH; return PLUGIN_CATEGORY_SYNTH;
@@ -1823,6 +1823,8 @@ private:
float* fParamBuffers; float* fParamBuffers;
snd_seq_event_t fMidiEvents[MAX_MIDI_EVENTS]; snd_seq_event_t fMidiEvents[MAX_MIDI_EVENTS];
QByteArray fChunk; QByteArray fChunk;

CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(DssiPlugin)
}; };


CARLA_BACKEND_END_NAMESPACE CARLA_BACKEND_END_NAMESPACE


+ 3
- 1
source/backend/plugin/FluidSynthPlugin.cpp View File

@@ -88,7 +88,7 @@ public:
return PLUGIN_SF2; return PLUGIN_SF2;
} }


PluginCategory category() const
PluginCategory category()
{ {
return PLUGIN_CATEGORY_SYNTH; return PLUGIN_CATEGORY_SYNTH;
} }
@@ -1427,6 +1427,8 @@ private:


float** fAudio16Buffers; float** fAudio16Buffers;
double fParamBuffers[FluidSynthParametersMax]; double fParamBuffers[FluidSynthParametersMax];

CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(FluidSynthPlugin)
}; };


CARLA_BACKEND_END_NAMESPACE CARLA_BACKEND_END_NAMESPACE


+ 3
- 1
source/backend/plugin/LadspaPlugin.cpp View File

@@ -86,7 +86,7 @@ public:
return PLUGIN_LADSPA; return PLUGIN_LADSPA;
} }


PluginCategory category() const
PluginCategory category()
{ {
if (fRdfDescriptor != nullptr) if (fRdfDescriptor != nullptr)
{ {
@@ -1387,6 +1387,8 @@ private:
float** fAudioInBuffers; float** fAudioInBuffers;
float** fAudioOutBuffers; float** fAudioOutBuffers;
float* fParamBuffers; float* fParamBuffers;

CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(LadspaPlugin)
}; };


CARLA_BACKEND_END_NAMESPACE CARLA_BACKEND_END_NAMESPACE


+ 2
- 0
source/backend/plugin/LinuxSamplerPlugin.cpp View File

@@ -1018,6 +1018,8 @@ private:


LinuxSampler::InstrumentManager* fInstrument; LinuxSampler::InstrumentManager* fInstrument;
std::vector<LinuxSampler::InstrumentManager::instrument_id_t> fInstrumentIds; std::vector<LinuxSampler::InstrumentManager::instrument_id_t> fInstrumentIds;

CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(LinuxSamplerPlugin)
}; };


CarlaPlugin* LinuxSamplerPlugin::newLinuxSampler(const Initializer& init, const bool isGIG, const bool use16Outs) CarlaPlugin* LinuxSamplerPlugin::newLinuxSampler(const Initializer& init, const bool isGIG, const bool use16Outs)


+ 2
- 0
source/backend/plugin/Lv2Plugin.cpp View File

@@ -4595,6 +4595,8 @@ private:
LV2_State_Map_Path* stateMapPath; LV2_State_Map_Path* stateMapPath;
} ft; } ft;
#endif #endif

CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(Lv2Plugin)
}; };


// ------------------------------------------------------------------- // -------------------------------------------------------------------


+ 3
- 1
source/backend/plugin/NativePlugin.cpp View File

@@ -175,7 +175,7 @@ public:
return PLUGIN_INTERNAL; return PLUGIN_INTERNAL;
} }


PluginCategory category() const
PluginCategory category()
{ {
CARLA_ASSERT(fDescriptor != nullptr); CARLA_ASSERT(fDescriptor != nullptr);


@@ -2034,6 +2034,8 @@ private:
} }


#undef handlePtr #undef handlePtr

CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(NativePlugin)
}; };


NonRtList<const PluginDescriptor*> NativePlugin::sPluginDescriptors; NonRtList<const PluginDescriptor*> NativePlugin::sPluginDescriptors;


+ 424
- 548
source/backend/plugin/VstPlugin.cpp
File diff suppressed because it is too large
View File


Loading…
Cancel
Save