From 36c99d9263a2a9ae43dbc85c09d24c88803eaa4d Mon Sep 17 00:00:00 2001 From: Dalton Messmer Date: Tue, 31 Dec 2024 03:22:40 -0500 Subject: [PATCH] Rename classes - AudioPluginInterface --> AudioPlugin - detail::AudioProcessorImpl --> detail::AudioPlugin - DefaultEffectPluginInterface --> DefaultEffect - DefaultMidiInstrumentPluginInterface -> DefaultMidiInstrument --- .../{AudioPluginInterface.h => AudioPlugin.h} | 57 ++++++++++--------- include/Instrument.h | 4 +- plugins/Amplifier/Amplifier.cpp | 2 +- plugins/Amplifier/Amplifier.h | 4 +- plugins/BassBooster/BassBooster.cpp | 2 +- plugins/BassBooster/BassBooster.h | 4 +- plugins/Bitcrush/Bitcrush.cpp | 2 +- plugins/Bitcrush/Bitcrush.h | 4 +- plugins/CarlaBase/Carla.cpp | 2 +- plugins/Compressor/Compressor.cpp | 2 +- plugins/Compressor/Compressor.h | 4 +- plugins/CrossoverEQ/CrossoverEQ.cpp | 2 +- plugins/CrossoverEQ/CrossoverEQ.h | 4 +- plugins/Delay/DelayEffect.cpp | 2 +- plugins/Delay/DelayEffect.h | 4 +- plugins/Dispersion/Dispersion.cpp | 2 +- plugins/Dispersion/Dispersion.h | 4 +- plugins/DualFilter/DualFilter.cpp | 2 +- plugins/DualFilter/DualFilter.h | 4 +- .../DynamicsProcessor/DynamicsProcessor.cpp | 2 +- plugins/DynamicsProcessor/DynamicsProcessor.h | 4 +- plugins/Eq/EqEffect.cpp | 2 +- plugins/Eq/EqEffect.h | 4 +- plugins/Flanger/FlangerEffect.cpp | 2 +- plugins/Flanger/FlangerEffect.h | 4 +- .../GranularPitchShifterEffect.cpp | 2 +- .../GranularPitchShifterEffect.h | 4 +- plugins/LOMM/LOMM.cpp | 2 +- plugins/LOMM/LOMM.h | 4 +- plugins/LadspaEffect/LadspaEffect.cpp | 2 +- plugins/LadspaEffect/LadspaEffect.h | 4 +- plugins/Lv2Effect/Lv2Effect.cpp | 2 +- plugins/Lv2Effect/Lv2Effect.h | 4 +- plugins/MultitapEcho/MultitapEcho.cpp | 2 +- plugins/MultitapEcho/MultitapEcho.h | 4 +- .../PeakControllerEffect.cpp | 2 +- .../PeakControllerEffect.h | 4 +- plugins/ReverbSC/ReverbSC.cpp | 2 +- plugins/ReverbSC/ReverbSC.h | 4 +- plugins/Sid/SidInstrument.h | 2 +- plugins/SpectrumAnalyzer/Analyzer.cpp | 2 +- plugins/SpectrumAnalyzer/Analyzer.h | 4 +- plugins/StereoEnhancer/StereoEnhancer.cpp | 2 +- plugins/StereoEnhancer/StereoEnhancer.h | 4 +- plugins/StereoMatrix/StereoMatrix.cpp | 2 +- plugins/StereoMatrix/StereoMatrix.h | 4 +- plugins/Vectorscope/Vectorscope.cpp | 2 +- plugins/Vectorscope/Vectorscope.h | 4 +- plugins/Vestige/Vestige.cpp | 2 +- plugins/Vestige/Vestige.h | 4 +- plugins/VstEffect/VstEffect.cpp | 2 +- plugins/VstEffect/VstEffect.h | 4 +- plugins/WaveShaper/WaveShaper.cpp | 2 +- plugins/WaveShaper/WaveShaper.h | 4 +- plugins/ZynAddSubFx/ZynAddSubFx.cpp | 2 +- plugins/ZynAddSubFx/ZynAddSubFx.h | 4 +- src/tracks/InstrumentTrack.cpp | 2 +- 57 files changed, 112 insertions(+), 111 deletions(-) rename include/{AudioPluginInterface.h => AudioPlugin.h} (88%) diff --git a/include/AudioPluginInterface.h b/include/AudioPlugin.h similarity index 88% rename from include/AudioPluginInterface.h rename to include/AudioPlugin.h index 2d3cd5a64e8..1db78e18579 100644 --- a/include/AudioPluginInterface.h +++ b/include/AudioPlugin.h @@ -1,5 +1,6 @@ /* - * AudioPluginInterface.h - Interface for all audio plugins + * AudioPlugin.h - Interface for audio plugins which provides + * pin connector support and compile-time customizations * * Copyright (c) 2024 Dalton Messmer * @@ -22,8 +23,8 @@ * */ -#ifndef LMMS_AUDIO_PLUGIN_INTERFACE_H -#define LMMS_AUDIO_PLUGIN_INTERFACE_H +#ifndef LMMS_AUDIO_PLUGIN_H +#define LMMS_AUDIO_PLUGIN_H #include "AudioData.h" #include "AudioPluginBuffer.h" @@ -48,7 +49,7 @@ enum class ProcessStatus Sleep }; -//! Compile time customizations for `AudioPluginInterface` to meet the needs of a plugin implementation +//! Compile time customizations for `AudioPlugin` to meet the needs of a plugin implementation struct PluginConfig { //! The audio data layout used by the plugin @@ -73,7 +74,7 @@ namespace detail { //! Provides the correct `processImpl` interface for instruments or effects to implement -template +template class AudioProcessingMethod; //! Instrument specialization @@ -158,16 +159,16 @@ class AudioProcessingMethod virtual auto processImpl() -> ProcessStatus = 0; }; -//! Connects the core audio buses to the instrument or effect using the pin connector -template -class AudioProcessorImpl +//! Connects the core audio channels to the instrument or effect using the pin connector +template +class AudioPlugin { - static_assert(always_false_v, "ChildT must be either Instrument or Effect"); + static_assert(always_false_v, "ParentT must be either Instrument or Effect"); }; //! Instrument specialization template -class AudioProcessorImpl +class AudioPlugin : public Instrument , public AudioProcessingMethod::type, @@ -178,14 +179,14 @@ class AudioProcessorImpl AudioPluginBufferDefaultImpl> { public: - AudioProcessorImpl(const Plugin::Descriptor* desc, InstrumentTrack* parent = nullptr, + AudioPlugin(const Plugin::Descriptor* desc, InstrumentTrack* parent = nullptr, const Plugin::Descriptor::SubPluginFeatures::Key* key = nullptr, Instrument::Flags flags = Instrument::Flag::NoFlags) : Instrument{desc, parent, key, flags} , m_pinConnector{config.inputs, config.outputs, true, this} { connect(&m_pinConnector, &PluginPinConnector::pluginBuffersChanged, - this, &AudioProcessorImpl::updatePluginBuffers); + this, &AudioPlugin::updatePluginBuffers); } auto pinConnector() const -> const PluginPinConnector* final { return &m_pinConnector; } @@ -236,10 +237,10 @@ class AudioProcessorImpl void playNoteImpl(NotePlayHandle* notesToPlay, CoreAudioDataMut inOut) final { /** - * NOTE: Only MIDI-based instruments are currently supported by AudioPluginInterface. + * NOTE: Only MIDI-based instruments are currently supported by AudioPlugin. * NotePlayHandle-based instruments use buffers from their play handles, and more work * would be needed to integrate that system with the AudioPluginBufferInterface system - * used by AudioPluginInterface. AudioPluginBufferInterface is also not thread-safe. + * used by AudioPlugin. AudioPluginBufferInterface is also not thread-safe. * * The `Instrument::playNote()` method is still called for MIDI-based instruments when * notes are played, so this method is a no-op. @@ -264,7 +265,7 @@ class AudioProcessorImpl //! Effect specialization template -class AudioProcessorImpl +class AudioPlugin : public Effect , public AudioProcessingMethod::type, @@ -275,13 +276,13 @@ class AudioProcessorImpl AudioPluginBufferDefaultImpl> { public: - AudioProcessorImpl(const Plugin::Descriptor* desc, Model* parent = nullptr, + AudioPlugin(const Plugin::Descriptor* desc, Model* parent = nullptr, const Plugin::Descriptor::SubPluginFeatures::Key* key = nullptr) : Effect{desc, parent, key} , m_pinConnector{config.inputs, config.outputs, false, this} { connect(&m_pinConnector, &PluginPinConnector::pluginBuffersChanged, - this, &AudioProcessorImpl::updatePluginBuffers); + this, &AudioPlugin::updatePluginBuffers); } auto pinConnector() const -> const PluginPinConnector* final { return &m_pinConnector; } @@ -383,7 +384,7 @@ class AudioProcessorImpl /** - * AudioPluginInterface is the bridge connecting an Instrument/Effect base class used by the Core + * AudioPlugin is the bridge connecting an Instrument/Effect base class used by the Core * with its derived class used by a plugin implementation. * * Pin connector routing and other common tasks are handled here to allow plugin implementations @@ -397,33 +398,33 @@ class AudioProcessorImpl * * A `processImpl` interface method is provided which must be implemented by the plugin implementation. * - * @param ChildT Either `Instrument` or `Effect` + * @param ParentT Either `Instrument` or `Effect` * @param SampleT The plugin's sample type - i.e. float, double, int32_t, `SampleFrame`, etc. - * @param config Compile time configuration to customize `AudioPluginInterface` + * @param config Compile time configuration to customize `AudioPlugin` */ -template -class AudioPluginInterface - : public detail::AudioProcessorImpl +template +class AudioPlugin + : public detail::AudioPlugin { static_assert(!std::is_const_v); static_assert(!std::is_same_v || ((config.inputs == 0 || config.inputs == 2) && (config.outputs == 0 || config.outputs == 2)), "Don't use SampleFrame if more than 2 processor channels are needed"); - using Base = detail::AudioProcessorImpl; + using Base = detail::AudioPlugin; public: - using Base::AudioProcessorImpl; + using Base::AudioPlugin; }; // NOTE: NotePlayHandle-based instruments are not supported yet -using DefaultMidiInstrumentPluginInterface = AudioPluginInterface; -using DefaultEffectPluginInterface = AudioPluginInterface; } // namespace lmms -#endif // LMMS_AUDIO_PLUGIN_INTERFACE_H +#endif // LMMS_AUDIO_PLUGIN_H diff --git a/include/Instrument.h b/include/Instrument.h index dc8aeb4fbe7..076ae4f4836 100644 --- a/include/Instrument.h +++ b/include/Instrument.h @@ -170,10 +170,10 @@ class LMMS_EXPORT Instrument : public Plugin protected: - //! To be implemented by AudioPluginInterface or plugin implementation + //! To be implemented by AudioPlugin or plugin implementation virtual void playImpl(CoreAudioDataMut out) {} - //! To be implemented by AudioPluginInterface or plugin implementation + //! To be implemented by AudioPlugin or plugin implementation virtual void playNoteImpl(NotePlayHandle* notesToPlay, CoreAudioDataMut out) {} // fade in to prevent clicks diff --git a/plugins/Amplifier/Amplifier.cpp b/plugins/Amplifier/Amplifier.cpp index b5b22e0bea8..fd811001645 100644 --- a/plugins/Amplifier/Amplifier.cpp +++ b/plugins/Amplifier/Amplifier.cpp @@ -51,7 +51,7 @@ Plugin::Descriptor PLUGIN_EXPORT amplifier_plugin_descriptor = AmplifierEffect::AmplifierEffect(Model* parent, const Descriptor::SubPluginFeatures::Key* key) : - AudioPluginInterface(&lifier_plugin_descriptor, parent, key), + AudioPlugin(&lifier_plugin_descriptor, parent, key), m_ampControls(this) { } diff --git a/plugins/Amplifier/Amplifier.h b/plugins/Amplifier/Amplifier.h index d65fa6007ed..006e77dfb09 100644 --- a/plugins/Amplifier/Amplifier.h +++ b/plugins/Amplifier/Amplifier.h @@ -26,13 +26,13 @@ #ifndef LMMS_AMPLIFIER_H #define LMMS_AMPLIFIER_H -#include "AudioPluginInterface.h" +#include "AudioPlugin.h" #include "AmplifierControls.h" namespace lmms { -class AmplifierEffect : public DefaultEffectPluginInterface +class AmplifierEffect : public DefaultEffect { public: AmplifierEffect(Model* parent, const Descriptor::SubPluginFeatures::Key* key); diff --git a/plugins/BassBooster/BassBooster.cpp b/plugins/BassBooster/BassBooster.cpp index 87ff73f1897..8470b703cce 100644 --- a/plugins/BassBooster/BassBooster.cpp +++ b/plugins/BassBooster/BassBooster.cpp @@ -52,7 +52,7 @@ Plugin::Descriptor PLUGIN_EXPORT bassbooster_plugin_descriptor = BassBoosterEffect::BassBoosterEffect( Model* parent, const Descriptor::SubPluginFeatures::Key* key ) : - AudioPluginInterface(&bassbooster_plugin_descriptor, parent, key), + AudioPlugin(&bassbooster_plugin_descriptor, parent, key), m_frequencyChangeNeeded( false ), m_bbFX( DspEffectLibrary::FastBassBoost( 70.0f, 1.0f, 2.8f ) ), m_bbControls( this ) diff --git a/plugins/BassBooster/BassBooster.h b/plugins/BassBooster/BassBooster.h index acd3e801886..acc3ba96446 100644 --- a/plugins/BassBooster/BassBooster.h +++ b/plugins/BassBooster/BassBooster.h @@ -26,14 +26,14 @@ #ifndef BASS_BOOSTER_H #define BASS_BOOSTER_H -#include "AudioPluginInterface.h" +#include "AudioPlugin.h" #include "DspEffectLibrary.h" #include "BassBoosterControls.h" namespace lmms { -class BassBoosterEffect : public DefaultEffectPluginInterface +class BassBoosterEffect : public DefaultEffect { public: BassBoosterEffect( Model* parent, const Descriptor::SubPluginFeatures::Key* key ); diff --git a/plugins/Bitcrush/Bitcrush.cpp b/plugins/Bitcrush/Bitcrush.cpp index 4cd2a71f189..7d525b1cbc8 100644 --- a/plugins/Bitcrush/Bitcrush.cpp +++ b/plugins/Bitcrush/Bitcrush.cpp @@ -57,7 +57,7 @@ Plugin::Descriptor PLUGIN_EXPORT bitcrush_plugin_descriptor = } BitcrushEffect::BitcrushEffect( Model * parent, const Descriptor::SubPluginFeatures::Key * key ) : - AudioPluginInterface(&bitcrush_plugin_descriptor, parent, key), + AudioPlugin(&bitcrush_plugin_descriptor, parent, key), m_controls( this ), m_sampleRate( Engine::audioEngine()->outputSampleRate() ), m_filter( m_sampleRate ) diff --git a/plugins/Bitcrush/Bitcrush.h b/plugins/Bitcrush/Bitcrush.h index a12c02d96f8..1f24309a7aa 100644 --- a/plugins/Bitcrush/Bitcrush.h +++ b/plugins/Bitcrush/Bitcrush.h @@ -27,7 +27,7 @@ #ifndef BITCRUSH_H #define BITCRUSH_H -#include "AudioPluginInterface.h" +#include "AudioPlugin.h" #include "BitcrushControls.h" #include "BasicFilters.h" @@ -36,7 +36,7 @@ namespace lmms { -class BitcrushEffect : public DefaultEffectPluginInterface +class BitcrushEffect : public DefaultEffect { public: BitcrushEffect( Model* parent, const Descriptor::SubPluginFeatures::Key* key ); diff --git a/plugins/CarlaBase/Carla.cpp b/plugins/CarlaBase/Carla.cpp index 5a6be003b89..968c2137a06 100644 --- a/plugins/CarlaBase/Carla.cpp +++ b/plugins/CarlaBase/Carla.cpp @@ -193,7 +193,7 @@ CarlaInstrument::CarlaInstrument(InstrumentTrack* const instrumentTrack, const D if (fHandle != nullptr && fDescriptor->activate != nullptr) fDescriptor->activate(fHandle); - // we need a play-handle which cares for calling play(), TODO: Move responsibility for this to AudioPluginInterface + // we need a play-handle which cares for calling play(), TODO: Move responsibility for this to AudioPlugin auto iph = new InstrumentPlayHandle(this, instrumentTrack); Engine::audioEngine()->addPlayHandle( iph ); diff --git a/plugins/Compressor/Compressor.cpp b/plugins/Compressor/Compressor.cpp index 1fcc5749bc3..29b669a5c1c 100755 --- a/plugins/Compressor/Compressor.cpp +++ b/plugins/Compressor/Compressor.cpp @@ -53,7 +53,7 @@ Plugin::Descriptor PLUGIN_EXPORT compressor_plugin_descriptor = CompressorEffect::CompressorEffect(Model* parent, const Descriptor::SubPluginFeatures::Key* key) : - AudioPluginInterface(&compressor_plugin_descriptor, parent, key), + AudioPlugin(&compressor_plugin_descriptor, parent, key), m_compressorControls(this) { m_sampleRate = Engine::audioEngine()->outputSampleRate(); diff --git a/plugins/Compressor/Compressor.h b/plugins/Compressor/Compressor.h index dc14a9a89d5..9eb2b64b1fe 100755 --- a/plugins/Compressor/Compressor.h +++ b/plugins/Compressor/Compressor.h @@ -26,7 +26,7 @@ #ifndef COMPRESSOR_H #define COMPRESSOR_H -#include "AudioPluginInterface.h" +#include "AudioPlugin.h" #include "CompressorControls.h" namespace lmms @@ -35,7 +35,7 @@ namespace lmms constexpr float COMP_LOG = -2.2f; -class CompressorEffect : public DefaultEffectPluginInterface +class CompressorEffect : public DefaultEffect { Q_OBJECT public: diff --git a/plugins/CrossoverEQ/CrossoverEQ.cpp b/plugins/CrossoverEQ/CrossoverEQ.cpp index d6444330fdc..fc8f6dea010 100644 --- a/plugins/CrossoverEQ/CrossoverEQ.cpp +++ b/plugins/CrossoverEQ/CrossoverEQ.cpp @@ -53,7 +53,7 @@ Plugin::Descriptor PLUGIN_EXPORT crossovereq_plugin_descriptor = CrossoverEQEffect::CrossoverEQEffect( Model* parent, const Descriptor::SubPluginFeatures::Key* key ) : - AudioPluginInterface(&crossovereq_plugin_descriptor, parent, key), + AudioPlugin(&crossovereq_plugin_descriptor, parent, key), m_controls( this ), m_sampleRate( Engine::audioEngine()->outputSampleRate() ), m_lp1( m_sampleRate ), diff --git a/plugins/CrossoverEQ/CrossoverEQ.h b/plugins/CrossoverEQ/CrossoverEQ.h index 2656462cdd0..dba3fdf936e 100644 --- a/plugins/CrossoverEQ/CrossoverEQ.h +++ b/plugins/CrossoverEQ/CrossoverEQ.h @@ -27,7 +27,7 @@ #ifndef CROSSOVEREQ_H #define CROSSOVEREQ_H -#include "AudioPluginInterface.h" +#include "AudioPlugin.h" #include "CrossoverEQControls.h" #include "BasicFilters.h" @@ -35,7 +35,7 @@ namespace lmms { -class CrossoverEQEffect : public DefaultEffectPluginInterface +class CrossoverEQEffect : public DefaultEffect { public: CrossoverEQEffect( Model* parent, const Descriptor::SubPluginFeatures::Key* key ); diff --git a/plugins/Delay/DelayEffect.cpp b/plugins/Delay/DelayEffect.cpp index 8acf63366b2..961487286b1 100644 --- a/plugins/Delay/DelayEffect.cpp +++ b/plugins/Delay/DelayEffect.cpp @@ -54,7 +54,7 @@ Plugin::Descriptor PLUGIN_EXPORT delay_plugin_descriptor = DelayEffect::DelayEffect( Model* parent, const Plugin::Descriptor::SubPluginFeatures::Key* key ) : - AudioPluginInterface(&delay_plugin_descriptor, parent, key), + AudioPlugin(&delay_plugin_descriptor, parent, key), m_delayControls( this ) { m_delay = 0; diff --git a/plugins/Delay/DelayEffect.h b/plugins/Delay/DelayEffect.h index b136c1e5281..f973b789a63 100644 --- a/plugins/Delay/DelayEffect.h +++ b/plugins/Delay/DelayEffect.h @@ -25,7 +25,7 @@ #ifndef DELAYEFFECT_H #define DELAYEFFECT_H -#include "AudioPluginInterface.h" +#include "AudioPlugin.h" #include "DelayControls.h" namespace lmms @@ -34,7 +34,7 @@ namespace lmms class Lfo; class StereoDelay; -class DelayEffect : public DefaultEffectPluginInterface +class DelayEffect : public DefaultEffect { public: DelayEffect(Model* parent , const Descriptor::SubPluginFeatures::Key* key ); diff --git a/plugins/Dispersion/Dispersion.cpp b/plugins/Dispersion/Dispersion.cpp index 22298d87fb4..472053de690 100644 --- a/plugins/Dispersion/Dispersion.cpp +++ b/plugins/Dispersion/Dispersion.cpp @@ -50,7 +50,7 @@ Plugin::Descriptor PLUGIN_EXPORT dispersion_plugin_descriptor = DispersionEffect::DispersionEffect(Model* parent, const Descriptor::SubPluginFeatures::Key* key) : - AudioPluginInterface(&dispersion_plugin_descriptor, parent, key), + AudioPlugin(&dispersion_plugin_descriptor, parent, key), m_dispersionControls(this), m_sampleRate(Engine::audioEngine()->outputSampleRate()), m_amountVal(0) diff --git a/plugins/Dispersion/Dispersion.h b/plugins/Dispersion/Dispersion.h index b93bd98c534..19787f5ef6c 100644 --- a/plugins/Dispersion/Dispersion.h +++ b/plugins/Dispersion/Dispersion.h @@ -26,7 +26,7 @@ #ifndef LMMS_DISPERSION_H #define LMMS_DISPERSION_H -#include "AudioPluginInterface.h" +#include "AudioPlugin.h" #include "DispersionControls.h" #include "lmms_math.h" @@ -36,7 +36,7 @@ namespace lmms constexpr inline int MAX_DISPERSION_FILTERS = 999; -class DispersionEffect : public DefaultEffectPluginInterface +class DispersionEffect : public DefaultEffect { public: DispersionEffect(Model* parent, const Descriptor::SubPluginFeatures::Key* key); diff --git a/plugins/DualFilter/DualFilter.cpp b/plugins/DualFilter/DualFilter.cpp index 5c0a43d7ed6..a3d48759b7f 100644 --- a/plugins/DualFilter/DualFilter.cpp +++ b/plugins/DualFilter/DualFilter.cpp @@ -54,7 +54,7 @@ Plugin::Descriptor PLUGIN_EXPORT dualfilter_plugin_descriptor = DualFilterEffect::DualFilterEffect( Model* parent, const Descriptor::SubPluginFeatures::Key* key ) : - AudioPluginInterface(&dualfilter_plugin_descriptor, parent, key), + AudioPlugin(&dualfilter_plugin_descriptor, parent, key), m_dfControls( this ) { m_filter1 = new BasicFilters<2>( Engine::audioEngine()->outputSampleRate() ); diff --git a/plugins/DualFilter/DualFilter.h b/plugins/DualFilter/DualFilter.h index b4a341efaa6..df0a8be85e2 100644 --- a/plugins/DualFilter/DualFilter.h +++ b/plugins/DualFilter/DualFilter.h @@ -27,7 +27,7 @@ #ifndef DUALFILTER_H #define DUALFILTER_H -#include "AudioPluginInterface.h" +#include "AudioPlugin.h" #include "DualFilterControls.h" #include "BasicFilters.h" @@ -35,7 +35,7 @@ namespace lmms { -class DualFilterEffect : public DefaultEffectPluginInterface +class DualFilterEffect : public DefaultEffect { public: DualFilterEffect( Model* parent, const Descriptor::SubPluginFeatures::Key* key ); diff --git a/plugins/DynamicsProcessor/DynamicsProcessor.cpp b/plugins/DynamicsProcessor/DynamicsProcessor.cpp index 872dbdcb1a2..f8078c91b64 100644 --- a/plugins/DynamicsProcessor/DynamicsProcessor.cpp +++ b/plugins/DynamicsProcessor/DynamicsProcessor.cpp @@ -60,7 +60,7 @@ const double DNF_LOG = -1.0; DynProcEffect::DynProcEffect( Model * _parent, const Descriptor::SubPluginFeatures::Key * _key ) : - AudioPluginInterface(&dynamicsprocessor_plugin_descriptor, _parent, _key), + AudioPlugin(&dynamicsprocessor_plugin_descriptor, _parent, _key), m_dpControls( this ) { m_currentPeak[0] = m_currentPeak[1] = DYN_NOISE_FLOOR; diff --git a/plugins/DynamicsProcessor/DynamicsProcessor.h b/plugins/DynamicsProcessor/DynamicsProcessor.h index c4e1414be1c..e02264d9577 100644 --- a/plugins/DynamicsProcessor/DynamicsProcessor.h +++ b/plugins/DynamicsProcessor/DynamicsProcessor.h @@ -27,7 +27,7 @@ #ifndef DYNPROC_H #define DYNPROC_H -#include "AudioPluginInterface.h" +#include "AudioPlugin.h" #include "DynamicsProcessorControls.h" namespace lmms @@ -36,7 +36,7 @@ namespace lmms class RmsHelper; -class DynProcEffect : public DefaultEffectPluginInterface +class DynProcEffect : public DefaultEffect { public: DynProcEffect( Model * _parent, diff --git a/plugins/Eq/EqEffect.cpp b/plugins/Eq/EqEffect.cpp index 4e5734fdcd2..c76bd6565c9 100644 --- a/plugins/Eq/EqEffect.cpp +++ b/plugins/Eq/EqEffect.cpp @@ -54,7 +54,7 @@ Plugin::Descriptor PLUGIN_EXPORT eq_plugin_descriptor = EqEffect::EqEffect( Model *parent, const Plugin::Descriptor::SubPluginFeatures::Key *key) : - AudioPluginInterface(&eq_plugin_descriptor, parent, key), + AudioPlugin(&eq_plugin_descriptor, parent, key), m_eqControls( this ), m_inGain( 1.0 ), m_outGain( 1.0 ) diff --git a/plugins/Eq/EqEffect.h b/plugins/Eq/EqEffect.h index 642e719264e..16cd603f49a 100644 --- a/plugins/Eq/EqEffect.h +++ b/plugins/Eq/EqEffect.h @@ -24,7 +24,7 @@ #ifndef EQEFFECT_H #define EQEFFECT_H -#include "AudioPluginInterface.h" +#include "AudioPlugin.h" #include "EqControls.h" #include "EqFilter.h" @@ -35,7 +35,7 @@ namespace lmms { -class EqEffect : public DefaultEffectPluginInterface +class EqEffect : public DefaultEffect { public: EqEffect( Model * parent , const Descriptor::SubPluginFeatures::Key * key ); diff --git a/plugins/Flanger/FlangerEffect.cpp b/plugins/Flanger/FlangerEffect.cpp index 1841d4e3cb7..dd3424b04cc 100644 --- a/plugins/Flanger/FlangerEffect.cpp +++ b/plugins/Flanger/FlangerEffect.cpp @@ -55,7 +55,7 @@ Plugin::Descriptor PLUGIN_EXPORT flanger_plugin_descriptor = FlangerEffect::FlangerEffect( Model *parent, const Plugin::Descriptor::SubPluginFeatures::Key *key ) : - AudioPluginInterface(&flanger_plugin_descriptor, parent, key), + AudioPlugin(&flanger_plugin_descriptor, parent, key), m_flangerControls( this ) { m_lfo = new QuadratureLfo( Engine::audioEngine()->outputSampleRate() ); diff --git a/plugins/Flanger/FlangerEffect.h b/plugins/Flanger/FlangerEffect.h index 89fa6f061c5..b9beee42be8 100644 --- a/plugins/Flanger/FlangerEffect.h +++ b/plugins/Flanger/FlangerEffect.h @@ -26,7 +26,7 @@ #ifndef FLANGEREFFECT_H #define FLANGEREFFECT_H -#include "AudioPluginInterface.h" +#include "AudioPlugin.h" #include "FlangerControls.h" namespace lmms @@ -36,7 +36,7 @@ class MonoDelay; class QuadratureLfo; -class FlangerEffect : public DefaultEffectPluginInterface +class FlangerEffect : public DefaultEffect { public: FlangerEffect( Model* parent , const Descriptor::SubPluginFeatures::Key* key ); diff --git a/plugins/GranularPitchShifter/GranularPitchShifterEffect.cpp b/plugins/GranularPitchShifter/GranularPitchShifterEffect.cpp index ca3c0e30e83..04611e81aa9 100755 --- a/plugins/GranularPitchShifter/GranularPitchShifterEffect.cpp +++ b/plugins/GranularPitchShifter/GranularPitchShifterEffect.cpp @@ -50,7 +50,7 @@ Plugin::Descriptor PLUGIN_EXPORT granularpitchshifter_plugin_descriptor = GranularPitchShifterEffect::GranularPitchShifterEffect(Model* parent, const Descriptor::SubPluginFeatures::Key* key) : - AudioPluginInterface(&granularpitchshifter_plugin_descriptor, parent, key), + AudioPlugin(&granularpitchshifter_plugin_descriptor, parent, key), m_granularpitchshifterControls(this), m_prefilter({PrefilterLowpass(), PrefilterLowpass()}) { diff --git a/plugins/GranularPitchShifter/GranularPitchShifterEffect.h b/plugins/GranularPitchShifter/GranularPitchShifterEffect.h index 02dde09afc7..8384283949d 100755 --- a/plugins/GranularPitchShifter/GranularPitchShifterEffect.h +++ b/plugins/GranularPitchShifter/GranularPitchShifterEffect.h @@ -25,7 +25,7 @@ #ifndef LMMS_GRANULAR_PITCH_SHIFTER_EFFECT_H #define LMMS_GRANULAR_PITCH_SHIFTER_EFFECT_H -#include "AudioPluginInterface.h" +#include "AudioPlugin.h" #include "GranularPitchShifterControls.h" #include "BasicFilters.h" @@ -43,7 +43,7 @@ constexpr float SatuSafeVol = 16.f; constexpr float SatuStrength = 0.001f; -class GranularPitchShifterEffect : public DefaultEffectPluginInterface +class GranularPitchShifterEffect : public DefaultEffect { public: GranularPitchShifterEffect(Model* parent, const Descriptor::SubPluginFeatures::Key* key); diff --git a/plugins/LOMM/LOMM.cpp b/plugins/LOMM/LOMM.cpp index 447a5dc6839..f131fa01ca8 100644 --- a/plugins/LOMM/LOMM.cpp +++ b/plugins/LOMM/LOMM.cpp @@ -48,7 +48,7 @@ extern "C" LOMMEffect::LOMMEffect(Model* parent, const Descriptor::SubPluginFeatures::Key* key) : - AudioPluginInterface(&lomm_plugin_descriptor, parent, key), + AudioPlugin(&lomm_plugin_descriptor, parent, key), m_lommControls(this), m_sampleRate(Engine::audioEngine()->outputSampleRate()), m_lp1(m_sampleRate), diff --git a/plugins/LOMM/LOMM.h b/plugins/LOMM/LOMM.h index 8afde8bf4c0..7d7ffe17061 100644 --- a/plugins/LOMM/LOMM.h +++ b/plugins/LOMM/LOMM.h @@ -26,7 +26,7 @@ #ifndef LMMS_LOMM_H #define LMMS_LOMM_H -#include "AudioPluginInterface.h" +#include "AudioPlugin.h" #include "LOMMControls.h" #include "BasicFilters.h" @@ -39,7 +39,7 @@ constexpr inline float LOMM_MIN_FLOOR = 0.00012589f;// -72 dBFS constexpr inline float LOMM_MAX_LOOKAHEAD = 20.f; constexpr inline float LOMM_AUTO_TIME_ADJUST = 5.f; -class LOMMEffect : public DefaultEffectPluginInterface +class LOMMEffect : public DefaultEffect { Q_OBJECT public: diff --git a/plugins/LadspaEffect/LadspaEffect.cpp b/plugins/LadspaEffect/LadspaEffect.cpp index f4db3ed632a..e1907fc50b0 100644 --- a/plugins/LadspaEffect/LadspaEffect.cpp +++ b/plugins/LadspaEffect/LadspaEffect.cpp @@ -70,7 +70,7 @@ Plugin::Descriptor PLUGIN_EXPORT ladspaeffect_plugin_descriptor = LadspaEffect::LadspaEffect( Model * _parent, const Descriptor::SubPluginFeatures::Key * _key ) : - AudioPluginInterface(&ladspaeffect_plugin_descriptor, _parent, _key), + AudioPlugin(&ladspaeffect_plugin_descriptor, _parent, _key), m_controls( nullptr ), m_maxSampleRate( 0 ), m_key( LadspaSubPluginFeatures::subPluginKeyToLadspaKey( _key ) ) diff --git a/plugins/LadspaEffect/LadspaEffect.h b/plugins/LadspaEffect/LadspaEffect.h index 79b45c703a9..ea5ca76144c 100644 --- a/plugins/LadspaEffect/LadspaEffect.h +++ b/plugins/LadspaEffect/LadspaEffect.h @@ -28,7 +28,7 @@ #include -#include "AudioPluginInterface.h" +#include "AudioPlugin.h" #include "ladspa.h" #include "LadspaControls.h" #include "LadspaManager.h" @@ -39,7 +39,7 @@ namespace lmms struct port_desc_t; using multi_proc_t = QVector; -class LadspaEffect : public DefaultEffectPluginInterface +class LadspaEffect : public DefaultEffect { Q_OBJECT public: diff --git a/plugins/Lv2Effect/Lv2Effect.cpp b/plugins/Lv2Effect/Lv2Effect.cpp index a28357aa9a2..92df190ad5a 100644 --- a/plugins/Lv2Effect/Lv2Effect.cpp +++ b/plugins/Lv2Effect/Lv2Effect.cpp @@ -59,7 +59,7 @@ Plugin::Descriptor PLUGIN_EXPORT lv2effect_plugin_descriptor = Lv2Effect::Lv2Effect(Model* parent, const Descriptor::SubPluginFeatures::Key *key) : - AudioPluginInterface(&lv2effect_plugin_descriptor, parent, key), + AudioPlugin(&lv2effect_plugin_descriptor, parent, key), m_controls(this, key->attributes["uri"]), m_tmpOutputSmps(Engine::audioEngine()->framesPerPeriod()) { diff --git a/plugins/Lv2Effect/Lv2Effect.h b/plugins/Lv2Effect/Lv2Effect.h index 2e48cb6b2cf..84e3e3baef4 100644 --- a/plugins/Lv2Effect/Lv2Effect.h +++ b/plugins/Lv2Effect/Lv2Effect.h @@ -25,14 +25,14 @@ #ifndef LV2_EFFECT_H #define LV2_EFFECT_H -#include "AudioPluginInterface.h" +#include "AudioPlugin.h" #include "Lv2FxControls.h" namespace lmms { // TODO: Add support for a variable number of audio input/output ports -class Lv2Effect : public DefaultEffectPluginInterface +class Lv2Effect : public DefaultEffect { Q_OBJECT diff --git a/plugins/MultitapEcho/MultitapEcho.cpp b/plugins/MultitapEcho/MultitapEcho.cpp index 4ded944ba82..555db3c7b4b 100644 --- a/plugins/MultitapEcho/MultitapEcho.cpp +++ b/plugins/MultitapEcho/MultitapEcho.cpp @@ -52,7 +52,7 @@ Plugin::Descriptor PLUGIN_EXPORT multitapecho_plugin_descriptor = MultitapEchoEffect::MultitapEchoEffect( Model* parent, const Descriptor::SubPluginFeatures::Key* key ) : - AudioPluginInterface(&multitapecho_plugin_descriptor, parent, key), + AudioPlugin(&multitapecho_plugin_descriptor, parent, key), m_stages( 1 ), m_controls( this ), m_buffer( 16100.0f ), diff --git a/plugins/MultitapEcho/MultitapEcho.h b/plugins/MultitapEcho/MultitapEcho.h index de44c574442..aecd0505c73 100644 --- a/plugins/MultitapEcho/MultitapEcho.h +++ b/plugins/MultitapEcho/MultitapEcho.h @@ -26,7 +26,7 @@ #ifndef MULTITAP_ECHO_H #define MULTITAP_ECHO_H -#include "AudioPluginInterface.h" +#include "AudioPlugin.h" #include "MultitapEchoControls.h" #include "RingBuffer.h" #include "BasicFilters.h" @@ -35,7 +35,7 @@ namespace lmms { -class MultitapEchoEffect : public DefaultEffectPluginInterface +class MultitapEchoEffect : public DefaultEffect { public: MultitapEchoEffect( Model* parent, const Descriptor::SubPluginFeatures::Key* key ); diff --git a/plugins/PeakControllerEffect/PeakControllerEffect.cpp b/plugins/PeakControllerEffect/PeakControllerEffect.cpp index c41345aef0e..bee1ac9cbc2 100644 --- a/plugins/PeakControllerEffect/PeakControllerEffect.cpp +++ b/plugins/PeakControllerEffect/PeakControllerEffect.cpp @@ -65,7 +65,7 @@ Plugin::Descriptor PLUGIN_EXPORT peakcontrollereffect_plugin_descriptor = PeakControllerEffect::PeakControllerEffect( Model * _parent, const Descriptor::SubPluginFeatures::Key * _key ) : - AudioPluginInterface(&peakcontrollereffect_plugin_descriptor, _parent, _key), + AudioPlugin(&peakcontrollereffect_plugin_descriptor, _parent, _key), m_effectId( rand() ), m_peakControls( this ), m_lastSample( 0 ), diff --git a/plugins/PeakControllerEffect/PeakControllerEffect.h b/plugins/PeakControllerEffect/PeakControllerEffect.h index 11e69711781..33123d0c8a2 100644 --- a/plugins/PeakControllerEffect/PeakControllerEffect.h +++ b/plugins/PeakControllerEffect/PeakControllerEffect.h @@ -26,7 +26,7 @@ #ifndef PEAK_CONTROLLER_EFFECT_H #define PEAK_CONTROLLER_EFFECT_H -#include "AudioPluginInterface.h" +#include "AudioPlugin.h" #include "PeakControllerEffectControls.h" namespace lmms @@ -35,7 +35,7 @@ namespace lmms class PeakController; -class PeakControllerEffect : public DefaultEffectPluginInterface +class PeakControllerEffect : public DefaultEffect { public: PeakControllerEffect( Model * parent, diff --git a/plugins/ReverbSC/ReverbSC.cpp b/plugins/ReverbSC/ReverbSC.cpp index 1863dff048a..5036e92e054 100644 --- a/plugins/ReverbSC/ReverbSC.cpp +++ b/plugins/ReverbSC/ReverbSC.cpp @@ -51,7 +51,7 @@ Plugin::Descriptor PLUGIN_EXPORT reverbsc_plugin_descriptor = } ReverbSCEffect::ReverbSCEffect( Model* parent, const Descriptor::SubPluginFeatures::Key* key ) : - AudioPluginInterface(&reverbsc_plugin_descriptor, parent, key), + AudioPlugin(&reverbsc_plugin_descriptor, parent, key), m_reverbSCControls( this ) { sp_create(&sp); diff --git a/plugins/ReverbSC/ReverbSC.h b/plugins/ReverbSC/ReverbSC.h index 15e89d2a6d2..30806d48886 100644 --- a/plugins/ReverbSC/ReverbSC.h +++ b/plugins/ReverbSC/ReverbSC.h @@ -26,7 +26,7 @@ #ifndef REVERBSC_H #define REVERBSC_H -#include "AudioPluginInterface.h" +#include "AudioPlugin.h" #include "ReverbSCControls.h" extern "C" { @@ -40,7 +40,7 @@ namespace lmms { -class ReverbSCEffect : public DefaultEffectPluginInterface +class ReverbSCEffect : public DefaultEffect { public: ReverbSCEffect( Model* parent, const Descriptor::SubPluginFeatures::Key* key ); diff --git a/plugins/Sid/SidInstrument.h b/plugins/Sid/SidInstrument.h index 69ed48107c9..38cc5d91dc9 100644 --- a/plugins/Sid/SidInstrument.h +++ b/plugins/Sid/SidInstrument.h @@ -27,7 +27,7 @@ #ifndef _SID_H #define _SID_H -#include "AudioPluginInterface.h" +#include "AudioPlugin.h" #include "AutomatableModel.h" #include "InstrumentView.h" diff --git a/plugins/SpectrumAnalyzer/Analyzer.cpp b/plugins/SpectrumAnalyzer/Analyzer.cpp index d9f38db70dd..9e392ac10ee 100644 --- a/plugins/SpectrumAnalyzer/Analyzer.cpp +++ b/plugins/SpectrumAnalyzer/Analyzer.cpp @@ -57,7 +57,7 @@ extern "C" { Analyzer::Analyzer(Model *parent, const Plugin::Descriptor::SubPluginFeatures::Key *key) : - AudioPluginInterface(&analyzer_plugin_descriptor, parent, key), + AudioPlugin(&analyzer_plugin_descriptor, parent, key), m_processor(&m_controls), m_controls(this), m_processorThread(m_processor, m_inputBuffer), diff --git a/plugins/SpectrumAnalyzer/Analyzer.h b/plugins/SpectrumAnalyzer/Analyzer.h index 634324d13b9..aaad1473c3c 100644 --- a/plugins/SpectrumAnalyzer/Analyzer.h +++ b/plugins/SpectrumAnalyzer/Analyzer.h @@ -28,7 +28,7 @@ #define ANALYZER_H -#include "AudioPluginInterface.h" +#include "AudioPlugin.h" #include "DataprocLauncher.h" #include "LocklessRingBuffer.h" #include "SaControls.h" @@ -39,7 +39,7 @@ namespace lmms //! Top level class; handles LMMS interface and feeds data to the data processor. -class Analyzer : public DefaultEffectPluginInterface +class Analyzer : public DefaultEffect { public: Analyzer(Model *parent, const Descriptor::SubPluginFeatures::Key *key); diff --git a/plugins/StereoEnhancer/StereoEnhancer.cpp b/plugins/StereoEnhancer/StereoEnhancer.cpp index 9d25b3f2dd4..3cf87bc4be0 100644 --- a/plugins/StereoEnhancer/StereoEnhancer.cpp +++ b/plugins/StereoEnhancer/StereoEnhancer.cpp @@ -56,7 +56,7 @@ Plugin::Descriptor PLUGIN_EXPORT stereoenhancer_plugin_descriptor = StereoEnhancerEffect::StereoEnhancerEffect( Model * _parent, const Descriptor::SubPluginFeatures::Key * _key ) : - AudioPluginInterface(&stereoenhancer_plugin_descriptor, _parent, _key), + AudioPlugin(&stereoenhancer_plugin_descriptor, _parent, _key), m_seFX( DspEffectLibrary::StereoEnhancer( 0.0f ) ), m_delayBuffer( new SampleFrame[DEFAULT_BUFFER_SIZE] ), m_currFrame( 0 ), diff --git a/plugins/StereoEnhancer/StereoEnhancer.h b/plugins/StereoEnhancer/StereoEnhancer.h index 4a04e436972..2a2d0b37c54 100644 --- a/plugins/StereoEnhancer/StereoEnhancer.h +++ b/plugins/StereoEnhancer/StereoEnhancer.h @@ -26,7 +26,7 @@ #ifndef _STEREO_ENHANCER_H #define _STEREO_ENHANCER_H -#include "AudioPluginInterface.h" +#include "AudioPlugin.h" #include "DspEffectLibrary.h" #include "StereoEnhancerControls.h" @@ -34,7 +34,7 @@ namespace lmms { -class StereoEnhancerEffect : public DefaultEffectPluginInterface +class StereoEnhancerEffect : public DefaultEffect { public: StereoEnhancerEffect( Model * parent, diff --git a/plugins/StereoMatrix/StereoMatrix.cpp b/plugins/StereoMatrix/StereoMatrix.cpp index 639f9b0620a..6070dce7249 100644 --- a/plugins/StereoMatrix/StereoMatrix.cpp +++ b/plugins/StereoMatrix/StereoMatrix.cpp @@ -56,7 +56,7 @@ Plugin::Descriptor PLUGIN_EXPORT stereomatrix_plugin_descriptor = StereoMatrixEffect::StereoMatrixEffect( Model * _parent, const Descriptor::SubPluginFeatures::Key * _key ) : - AudioPluginInterface(&stereomatrix_plugin_descriptor, _parent, _key), + AudioPlugin(&stereomatrix_plugin_descriptor, _parent, _key), m_smControls( this ) { } diff --git a/plugins/StereoMatrix/StereoMatrix.h b/plugins/StereoMatrix/StereoMatrix.h index a8dd7fe4abd..f5cb0834242 100644 --- a/plugins/StereoMatrix/StereoMatrix.h +++ b/plugins/StereoMatrix/StereoMatrix.h @@ -26,14 +26,14 @@ #ifndef _STEREO_MATRIX_H #define _STEREO_MATRIX_H -#include "AudioPluginInterface.h" +#include "AudioPlugin.h" #include "StereoMatrixControls.h" namespace lmms { -class StereoMatrixEffect : public DefaultEffectPluginInterface +class StereoMatrixEffect : public DefaultEffect { public: StereoMatrixEffect( Model * parent, diff --git a/plugins/Vectorscope/Vectorscope.cpp b/plugins/Vectorscope/Vectorscope.cpp index cecb43bf11c..0fc5c33d92c 100644 --- a/plugins/Vectorscope/Vectorscope.cpp +++ b/plugins/Vectorscope/Vectorscope.cpp @@ -48,7 +48,7 @@ extern "C" { Vectorscope::Vectorscope(Model *parent, const Plugin::Descriptor::SubPluginFeatures::Key *key) : - AudioPluginInterface(&vectorscope_plugin_descriptor, parent, key), + AudioPlugin(&vectorscope_plugin_descriptor, parent, key), m_controls(this), // Buffer is sized to cover 4* the current maximum LMMS audio buffer size, // so that it has some reserve space in case GUI thresd is busy. diff --git a/plugins/Vectorscope/Vectorscope.h b/plugins/Vectorscope/Vectorscope.h index 23ee96f35e2..4bd73e91597 100644 --- a/plugins/Vectorscope/Vectorscope.h +++ b/plugins/Vectorscope/Vectorscope.h @@ -24,7 +24,7 @@ #ifndef VECTORSCOPE_H #define VECTORSCOPE_H -#include "AudioPluginInterface.h" +#include "AudioPlugin.h" #include "LocklessRingBuffer.h" #include "VecControls.h" @@ -33,7 +33,7 @@ namespace lmms //! Top level class; handles LMMS interface and accumulates data for processing. -class Vectorscope : public DefaultEffectPluginInterface +class Vectorscope : public DefaultEffect { public: Vectorscope(Model *parent, const Descriptor::SubPluginFeatures::Key *key); diff --git a/plugins/Vestige/Vestige.cpp b/plugins/Vestige/Vestige.cpp index c92b3bdb19d..8f804e5d82e 100644 --- a/plugins/Vestige/Vestige.cpp +++ b/plugins/Vestige/Vestige.cpp @@ -154,7 +154,7 @@ class VstInstrumentPlugin : public VstPlugin VestigeInstrument::VestigeInstrument( InstrumentTrack * _instrument_track ) : - AudioPluginInterface(&vestige_plugin_descriptor, _instrument_track, nullptr, Flag::IsSingleStreamed | Flag::IsMidiBased), + AudioPlugin(&vestige_plugin_descriptor, _instrument_track, nullptr, Flag::IsSingleStreamed | Flag::IsMidiBased), m_plugin( nullptr ), m_pluginMutex(), m_subWindow( nullptr ), diff --git a/plugins/Vestige/Vestige.h b/plugins/Vestige/Vestige.h index fefeb010c4c..771841d0a6a 100644 --- a/plugins/Vestige/Vestige.h +++ b/plugins/Vestige/Vestige.h @@ -30,7 +30,7 @@ #include #include -#include "AudioPluginInterface.h" +#include "AudioPlugin.h" #include "InstrumentView.h" @@ -56,7 +56,7 @@ class VestigeInstrumentView; class VestigeInstrument - : public AudioPluginInterface { Q_OBJECT diff --git a/plugins/VstEffect/VstEffect.cpp b/plugins/VstEffect/VstEffect.cpp index 8d9b5b1fbc0..3a03a2a8cff 100644 --- a/plugins/VstEffect/VstEffect.cpp +++ b/plugins/VstEffect/VstEffect.cpp @@ -60,7 +60,7 @@ Plugin::Descriptor PLUGIN_EXPORT vsteffect_plugin_descriptor = VstEffect::VstEffect( Model * _parent, const Descriptor::SubPluginFeatures::Key * _key ) : - AudioPluginInterface(&vsteffect_plugin_descriptor, _parent, _key), + AudioPlugin(&vsteffect_plugin_descriptor, _parent, _key), m_pluginMutex(), m_key( *_key ), m_vstControls( this ) diff --git a/plugins/VstEffect/VstEffect.h b/plugins/VstEffect/VstEffect.h index 642bc713535..c81aba03769 100644 --- a/plugins/VstEffect/VstEffect.h +++ b/plugins/VstEffect/VstEffect.h @@ -28,7 +28,7 @@ #include #include -#include "AudioPluginInterface.h" +#include "AudioPlugin.h" #include "VstEffectControls.h" namespace lmms @@ -37,7 +37,7 @@ namespace lmms class VstPlugin; class VstEffect - : public AudioPluginInterface { public: diff --git a/plugins/WaveShaper/WaveShaper.cpp b/plugins/WaveShaper/WaveShaper.cpp index ecbef2dca92..087c0b8401e 100644 --- a/plugins/WaveShaper/WaveShaper.cpp +++ b/plugins/WaveShaper/WaveShaper.cpp @@ -58,7 +58,7 @@ Plugin::Descriptor PLUGIN_EXPORT waveshaper_plugin_descriptor = WaveShaperEffect::WaveShaperEffect( Model * _parent, const Descriptor::SubPluginFeatures::Key * _key ) : - AudioPluginInterface(&waveshaper_plugin_descriptor, _parent, _key), + AudioPlugin(&waveshaper_plugin_descriptor, _parent, _key), m_wsControls( this ) { } diff --git a/plugins/WaveShaper/WaveShaper.h b/plugins/WaveShaper/WaveShaper.h index 9baca338104..05bae84afd5 100644 --- a/plugins/WaveShaper/WaveShaper.h +++ b/plugins/WaveShaper/WaveShaper.h @@ -27,14 +27,14 @@ #ifndef _WAVESHAPER_H #define _WAVESHAPER_H -#include "AudioPluginInterface.h" +#include "AudioPlugin.h" #include "WaveShaperControls.h" namespace lmms { -class WaveShaperEffect : public DefaultEffectPluginInterface +class WaveShaperEffect : public DefaultEffect { public: WaveShaperEffect( Model * _parent, diff --git a/plugins/ZynAddSubFx/ZynAddSubFx.cpp b/plugins/ZynAddSubFx/ZynAddSubFx.cpp index a0f0246e605..a2643564c65 100644 --- a/plugins/ZynAddSubFx/ZynAddSubFx.cpp +++ b/plugins/ZynAddSubFx/ZynAddSubFx.cpp @@ -121,7 +121,7 @@ void ZynAddSubFxRemotePlugin::updateBuffers(int channelsIn, int channelsOut) ZynAddSubFxInstrument::ZynAddSubFxInstrument( InstrumentTrack * _instrumentTrack ) : - AudioPluginInterface(&zynaddsubfx_plugin_descriptor, _instrumentTrack, nullptr, Flag::IsSingleStreamed | Flag::IsMidiBased), + AudioPlugin(&zynaddsubfx_plugin_descriptor, _instrumentTrack, nullptr, Flag::IsSingleStreamed | Flag::IsMidiBased), m_hasGUI( false ), m_localPlugin(nullptr), m_remotePlugin( nullptr ), diff --git a/plugins/ZynAddSubFx/ZynAddSubFx.h b/plugins/ZynAddSubFx/ZynAddSubFx.h index c412e82221d..992549d9bb9 100644 --- a/plugins/ZynAddSubFx/ZynAddSubFx.h +++ b/plugins/ZynAddSubFx/ZynAddSubFx.h @@ -32,7 +32,7 @@ #include -#include "AudioPluginInterface.h" +#include "AudioPlugin.h" #include "AutomatableModel.h" #include "InstrumentView.h" #include "RemotePlugin.h" @@ -77,7 +77,7 @@ class ZynAddSubFxRemotePlugin // TODO: Is it always 0 inputs, 2 outputs? class ZynAddSubFxInstrument - : public AudioPluginInterface { Q_OBJECT diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp index 664a84060c9..295839618db 100644 --- a/src/tracks/InstrumentTrack.cpp +++ b/src/tracks/InstrumentTrack.cpp @@ -23,7 +23,7 @@ */ #include "InstrumentTrack.h" -#include "AudioPluginInterface.h" +#include "AudioPlugin.h" #include "AudioEngine.h" #include "AutomationClip.h" #include "ConfigManager.h"