Update to latest dpf

dpf

@@ -1 +1 @@
-Subproject commit 053854daf007c4aeeda43c26de124181e6187cf2
+Subproject commit 67b302dc3b038fafa20fbe6fa6bdddfbaf9d0b02

plugins/ProM/DistrhoPluginInfo.h

@@ -18,21 +18,13 @@
 #define DISTRHO_PLUGIN_INFO_H_INCLUDED
 
 #define DISTRHO_PLUGIN_NAME "ProM"
+#define DISTRHO_PLUGIN_URI   "http://distrho.sf.net/plugins/ProM"
 
 #define DISTRHO_PLUGIN_HAS_UI        1
-#define DISTRHO_PLUGIN_IS_SYNTH      0
-
 #define DISTRHO_PLUGIN_NUM_INPUTS    1
 #define DISTRHO_PLUGIN_NUM_OUTPUTS   1
 
-#define DISTRHO_PLUGIN_WANT_LATENCY  0
-#define DISTRHO_PLUGIN_WANT_PROGRAMS 0
-#define DISTRHO_PLUGIN_WANT_STATE    0
-#define DISTRHO_PLUGIN_WANT_TIMEPOS  0
-
-#define DISTRHO_PLUGIN_IS_RT_SAFE         0
+// required by projectM
 #define DISTRHO_PLUGIN_WANT_DIRECT_ACCESS 1
 
-#define DISTRHO_PLUGIN_URI "http://distrho.sf.net/plugins/ProM"
-
 #endif // DISTRHO_PLUGIN_INFO_H_INCLUDED

plugins/ProM/DistrhoPluginProM.cpp

@@ -36,26 +36,26 @@ DistrhoPluginProM::~DistrhoPluginProM()
 // -----------------------------------------------------------------------
 // Init
 
-void DistrhoPluginProM::d_initParameter(uint32_t, Parameter&)
+void DistrhoPluginProM::initParameter(uint32_t, Parameter&)
 {
 }
 
 // -----------------------------------------------------------------------
 // Internal data
 
-float DistrhoPluginProM::d_getParameterValue(uint32_t) const
+float DistrhoPluginProM::getParameterValue(uint32_t) const
 {
     return 0.0f;
 }
 
-void DistrhoPluginProM::d_setParameterValue(uint32_t, float)
+void DistrhoPluginProM::setParameterValue(uint32_t, float)
 {
 }
 
 // -----------------------------------------------------------------------
 // Process
 
-void DistrhoPluginProM::d_run(const float** inputs, float** outputs, uint32_t frames)
+void DistrhoPluginProM::run(const float** inputs, float** outputs, uint32_t frames)
 {
     const float* in  = inputs[0];
     float*       out = outputs[0];

plugins/ProM/DistrhoPluginProM.hpp

@@ -19,7 +19,7 @@
 
 #include "DistrhoPlugin.hpp"
 
-#include "extra/d_mutex.hpp"
+#include "extra/Mutex.hpp"
 
 class projectM;
 class DistrhoUIProM;
@@ -38,27 +38,27 @@ protected:
     // -------------------------------------------------------------------
     // Information
 
-    const char* d_getLabel() const noexcept override
+    const char* getLabel() const noexcept override
     {
         return "ProM";
     }
 
-    const char* d_getMaker() const noexcept override
+    const char* getMaker() const noexcept override
     {
         return "DISTRHO";
     }
 
-    const char* d_getLicense() const noexcept override
+    const char* getLicense() const noexcept override
     {
         return "LGPL";
     }
 
-    uint32_t d_getVersion() const noexcept override
+    uint32_t getVersion() const noexcept override
     {
         return 0x1000;
     }
 
-    int64_t d_getUniqueId() const noexcept override
+    int64_t getUniqueId() const noexcept override
     {
         return d_cconst('D', 'P', 'r', 'M');
     }
@@ -66,18 +66,18 @@ protected:
     // -------------------------------------------------------------------
     // Init
 
-    void d_initParameter(uint32_t, Parameter&) override;
+    void initParameter(uint32_t, Parameter&) override;
 
     // -------------------------------------------------------------------
     // Internal data
 
-    float d_getParameterValue(uint32_t) const override;
-    void  d_setParameterValue(uint32_t, float) override;
+    float getParameterValue(uint32_t) const override;
+    void  setParameterValue(uint32_t, float) override;
 
     // -------------------------------------------------------------------
     // Process
 
-    void d_run(const float** inputs, float** outputs, uint32_t frames) override;
+    void run(const float** inputs, float** outputs, uint32_t frames) override;
 
     // -------------------------------------------------------------------
 

plugins/ProM/DistrhoUIProM.cpp

@@ -47,14 +47,13 @@ static const projectM::Settings kSettings = {
 // -----------------------------------------------------------------------
 
 DistrhoUIProM::DistrhoUIProM()
-    : UI()
+    : UI(512, 512)
 {
-    setSize(512, 512);
 }
 
 DistrhoUIProM::~DistrhoUIProM()
 {
-    if (DistrhoPluginProM* const dspPtr = (DistrhoPluginProM*)d_getPluginInstancePointer())
+    if (DistrhoPluginProM* const dspPtr = (DistrhoPluginProM*)getPluginInstancePointer())
     {
         const MutexLocker csm(dspPtr->fMutex);
         dspPtr->fPM = nullptr;
@@ -64,21 +63,21 @@ DistrhoUIProM::~DistrhoUIProM()
 // -----------------------------------------------------------------------
 // DSP Callbacks
 
-void DistrhoUIProM::d_parameterChanged(uint32_t, float)
+void DistrhoUIProM::parameterChanged(uint32_t, float)
 {
 }
 
 // -----------------------------------------------------------------------
 // UI Callbacks
 
-void DistrhoUIProM::d_uiIdle()
+void DistrhoUIProM::uiIdle()
 {
     if (fPM == nullptr)
         return;
 
     repaint();
 
-    if (DistrhoPluginProM* const dspPtr = (DistrhoPluginProM*)d_getPluginInstancePointer())
+    if (DistrhoPluginProM* const dspPtr = (DistrhoPluginProM*)getPluginInstancePointer())
     {
         if (dspPtr->fPM != nullptr)
             return;
@@ -88,7 +87,7 @@ void DistrhoUIProM::d_uiIdle()
     }
 }
 
-void DistrhoUIProM::d_uiReshape(uint width, uint height)
+void DistrhoUIProM::uiReshape(uint width, uint height)
 {
     glEnable(GL_BLEND);
     glEnable(GL_LINE_SMOOTH);

plugins/ProM/DistrhoUIProM.hpp

@@ -35,13 +35,13 @@ protected:
     // -------------------------------------------------------------------
     // DSP Callbacks
 
-    void d_parameterChanged(uint32_t, float) override;
+    void parameterChanged(uint32_t, float) override;
 
     // -------------------------------------------------------------------
     // UI Callbacks
 
-    void d_uiIdle() override;
-    void d_uiReshape(uint width, uint height) override;
+    void uiIdle() override;
+    void uiReshape(uint width, uint height) override;
 
     // -------------------------------------------------------------------
     // Widget Callbacks