falkTX
/
Carla
mirror of https://github.com/falkTX/Carla
1
0
Fork 0
Code Releases 42 Activity
Browse Source

Add RDF prefix to LADSPA_RDF definitons

tags/v2.1-rc1
falkTX 5 years ago
parent
f119412bc9
commit
801bc02a8c
2 changed files with 108 additions and 114 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +22
    -22
      source/backend/plugin/CarlaPluginLADSPA.cpp
  2. +86
    -92
      source/includes/ladspa_rdf.hpp

+ 22
- 22
source/backend/plugin/CarlaPluginLADSPA.cpp View File

@@ -103,34 +103,34 @@ public:
{
if (fRdfDescriptor != nullptr)
{
const LADSPA_PluginType category(fRdfDescriptor->Type);
const LADSPA_RDF_PluginType category = fRdfDescriptor->Type;

// Specific Types
if (category & (LADSPA_PLUGIN_DELAY|LADSPA_PLUGIN_REVERB))
if (category & (LADSPA_RDF_PLUGIN_DELAY|LADSPA_RDF_PLUGIN_REVERB))
return PLUGIN_CATEGORY_DELAY;
if (category & (LADSPA_PLUGIN_PHASER|LADSPA_PLUGIN_FLANGER|LADSPA_PLUGIN_CHORUS))
if (category & (LADSPA_RDF_PLUGIN_PHASER|LADSPA_RDF_PLUGIN_FLANGER|LADSPA_RDF_PLUGIN_CHORUS))
return PLUGIN_CATEGORY_MODULATOR;
if (category & (LADSPA_PLUGIN_AMPLIFIER))
if (category & (LADSPA_RDF_PLUGIN_AMPLIFIER))
return PLUGIN_CATEGORY_DYNAMICS;
if (category & (LADSPA_PLUGIN_UTILITY|LADSPA_PLUGIN_SPECTRAL|LADSPA_PLUGIN_FREQUENCY_METER))
if (category & (LADSPA_RDF_PLUGIN_UTILITY|LADSPA_RDF_PLUGIN_SPECTRAL|LADSPA_RDF_PLUGIN_FREQUENCY_METER))
return PLUGIN_CATEGORY_UTILITY;

// Pre-set LADSPA Types
if (LADSPA_IS_PLUGIN_DYNAMICS(category))
if (LADSPA_RDF_IS_PLUGIN_DYNAMICS(category))
return PLUGIN_CATEGORY_DYNAMICS;
if (LADSPA_IS_PLUGIN_AMPLITUDE(category))
if (LADSPA_RDF_IS_PLUGIN_AMPLITUDE(category))
return PLUGIN_CATEGORY_MODULATOR;
if (LADSPA_IS_PLUGIN_EQ(category))
if (LADSPA_RDF_IS_PLUGIN_EQ(category))
return PLUGIN_CATEGORY_EQ;
if (LADSPA_IS_PLUGIN_FILTER(category))
if (LADSPA_RDF_IS_PLUGIN_FILTER(category))
return PLUGIN_CATEGORY_FILTER;
if (LADSPA_IS_PLUGIN_FREQUENCY(category))
if (LADSPA_RDF_IS_PLUGIN_FREQUENCY(category))
return PLUGIN_CATEGORY_UTILITY;
if (LADSPA_IS_PLUGIN_SIMULATOR(category))
if (LADSPA_RDF_IS_PLUGIN_SIMULATOR(category))
return PLUGIN_CATEGORY_OTHER;
if (LADSPA_IS_PLUGIN_TIME(category))
if (LADSPA_RDF_IS_PLUGIN_TIME(category))
return PLUGIN_CATEGORY_DELAY;
if (LADSPA_IS_PLUGIN_GENERATOR(category))
if (LADSPA_RDF_IS_PLUGIN_GENERATOR(category))
return PLUGIN_CATEGORY_SYNTH;
}

@@ -301,26 +301,26 @@ public:
{
const LADSPA_RDF_Port& port(fRdfDescriptor->Ports[rindex]);

if (LADSPA_PORT_HAS_UNIT(port.Hints))
if (LADSPA_RDF_PORT_HAS_UNIT(port.Hints))
{
switch (port.Unit)
{
case LADSPA_UNIT_DB:
case LADSPA_RDF_UNIT_DB:
std::strncpy(strBuf, "dB", STR_MAX);
return true;
case LADSPA_UNIT_COEF:
case LADSPA_RDF_UNIT_COEF:
std::strncpy(strBuf, "(coef)", STR_MAX);
return true;
case LADSPA_UNIT_HZ:
case LADSPA_RDF_UNIT_HZ:
std::strncpy(strBuf, "Hz", STR_MAX);
return true;
case LADSPA_UNIT_S:
case LADSPA_RDF_UNIT_S:
std::strncpy(strBuf, "s", STR_MAX);
return true;
case LADSPA_UNIT_MS:
case LADSPA_RDF_UNIT_MS:
std::strncpy(strBuf, "ms", STR_MAX);
return true;
case LADSPA_UNIT_MIN:
case LADSPA_RDF_UNIT_MIN:
std::strncpy(strBuf, "min", STR_MAX);
return true;
}
@@ -348,7 +348,7 @@ public:

const LADSPA_RDF_Port& port(fRdfDescriptor->Ports[rindex]);

if (! LADSPA_PORT_HAS_LABEL(port.Hints))
if (! LADSPA_RDF_PORT_HAS_LABEL(port.Hints))
return false;

CARLA_SAFE_ASSERT_RETURN(port.Label != nullptr, false);
@@ -621,7 +621,7 @@ public:
}

// default value
if (hasPortRDF && LADSPA_PORT_HAS_DEFAULT(fRdfDescriptor->Ports[i].Hints))
if (hasPortRDF && LADSPA_RDF_PORT_HAS_DEFAULT(fRdfDescriptor->Ports[i].Hints))
def = fRdfDescriptor->Ports[i].Default;
else
def = get_default_ladspa_port_value(portRangeHints.HintDescriptor, min, max);


+ 86
- 92
source/includes/ladspa_rdf.hpp View File

@@ -19,103 +19,97 @@
#define LADSPA_RDF_HPP_INCLUDED

#include "CarlaDefines.h"
#include "ladspa/ladspa.h"

// Base Types
typedef float LADSPA_Data;
typedef int LADSPA_Property;
typedef unsigned long long LADSPA_PluginType;
typedef int LADSPA_RDF_Property;
typedef unsigned long long LADSPA_RDF_PluginType;

// Unit Types
#define LADSPA_UNIT_DB 0x01
#define LADSPA_UNIT_COEF 0x02
#define LADSPA_UNIT_HZ 0x04
#define LADSPA_UNIT_S 0x08
#define LADSPA_UNIT_MS 0x10
#define LADSPA_UNIT_MIN 0x20

#define LADSPA_UNIT_CLASS_AMPLITUDE (LADSPA_UNIT_DB|LADSPA_UNIT_COEF)
#define LADSPA_UNIT_CLASS_FREQUENCY (LADSPA_UNIT_HZ)
#define LADSPA_UNIT_CLASS_TIME (LADSPA_UNIT_S|LADSPA_UNIT_MS|LADSPA_UNIT_MIN)

#define LADSPA_IS_UNIT_DB(x) ((x) == LADSPA_UNIT_DB)
#define LADSPA_IS_UNIT_COEF(x) ((x) == LADSPA_UNIT_COEF)
#define LADSPA_IS_UNIT_HZ(x) ((x) == LADSPA_UNIT_HZ)
#define LADSPA_IS_UNIT_S(x) ((x) == LADSPA_UNIT_S)
#define LADSPA_IS_UNIT_MS(x) ((x) == LADSPA_UNIT_MS)
#define LADSPA_IS_UNIT_MIN(x) ((x) == LADSPA_UNIT_MIN)

#define LADSPA_IS_UNIT_CLASS_AMPLITUDE(x) ((x) & LADSPA_UNIT_CLASS_AMPLITUDE)
#define LADSPA_IS_UNIT_CLASS_FREQUENCY(x) ((x) & LADSPA_UNIT_CLASS_FREQUENCY)
#define LADSPA_IS_UNIT_CLASS_TIME(x) ((x) & LADSPA_UNIT_CLASS_TIME)

// Port Types (Official API)
#define LADSPA_PORT_INPUT 0x1
#define LADSPA_PORT_OUTPUT 0x2
#define LADSPA_PORT_CONTROL 0x4
#define LADSPA_PORT_AUDIO 0x8
#define LADSPA_RDF_UNIT_DB 0x01
#define LADSPA_RDF_UNIT_COEF 0x02
#define LADSPA_RDF_UNIT_HZ 0x04
#define LADSPA_RDF_UNIT_S 0x08
#define LADSPA_RDF_UNIT_MS 0x10
#define LADSPA_RDF_UNIT_MIN 0x20

#define LADSPA_RDF_UNIT_CLASS_AMPLITUDE (LADSPA_RDF_UNIT_DB|LADSPA_RDF_UNIT_COEF)
#define LADSPA_RDF_UNIT_CLASS_FREQUENCY (LADSPA_RDF_UNIT_HZ)
#define LADSPA_RDF_UNIT_CLASS_TIME (LADSPA_RDF_UNIT_S|LADSPA_RDF_UNIT_MS|LADSPA_RDF_UNIT_MIN)

#define LADSPA_RDF_IS_UNIT_DB(x) ((x) == LADSPA_RDF_UNIT_DB)
#define LADSPA_RDF_IS_UNIT_COEF(x) ((x) == LADSPA_RDF_UNIT_COEF)
#define LADSPA_RDF_IS_UNIT_HZ(x) ((x) == LADSPA_RDF_UNIT_HZ)
#define LADSPA_RDF_IS_UNIT_S(x) ((x) == LADSPA_RDF_UNIT_S)
#define LADSPA_RDF_IS_UNIT_MS(x) ((x) == LADSPA_RDF_UNIT_MS)
#define LADSPA_RDF_IS_UNIT_MIN(x) ((x) == LADSPA_RDF_UNIT_MIN)

#define LADSPA_RDF_IS_UNIT_CLASS_AMPLITUDE(x) ((x) & LADSPA_RDF_UNIT_CLASS_AMPLITUDE)
#define LADSPA_RDF_IS_UNIT_CLASS_FREQUENCY(x) ((x) & LADSPA_RDF_UNIT_CLASS_FREQUENCY)
#define LADSPA_RDF_IS_UNIT_CLASS_TIME(x) ((x) & LADSPA_RDF_UNIT_CLASS_TIME)

// Port Hints
#define LADSPA_PORT_UNIT 0x1
#define LADSPA_PORT_DEFAULT 0x2
#define LADSPA_PORT_LABEL 0x4
#define LADSPA_RDF_PORT_UNIT 0x1
#define LADSPA_RDF_PORT_DEFAULT 0x2
#define LADSPA_RDF_PORT_LABEL 0x4

#define LADSPA_PORT_HAS_UNIT(x) ((x) & LADSPA_PORT_UNIT)
#define LADSPA_PORT_HAS_DEFAULT(x) ((x) & LADSPA_PORT_DEFAULT)
#define LADSPA_PORT_HAS_LABEL(x) ((x) & LADSPA_PORT_LABEL)
#define LADSPA_RDF_PORT_HAS_UNIT(x) ((x) & LADSPA_RDF_PORT_UNIT)
#define LADSPA_RDF_PORT_HAS_DEFAULT(x) ((x) & LADSPA_RDF_PORT_DEFAULT)
#define LADSPA_RDF_PORT_HAS_LABEL(x) ((x) & LADSPA_RDF_PORT_LABEL)

// Plugin Types
#define LADSPA_PLUGIN_UTILITY 0x000000001LL
#define LADSPA_PLUGIN_GENERATOR 0x000000002LL
#define LADSPA_PLUGIN_SIMULATOR 0x000000004LL
#define LADSPA_PLUGIN_OSCILLATOR 0x000000008LL
#define LADSPA_PLUGIN_TIME 0x000000010LL
#define LADSPA_PLUGIN_DELAY 0x000000020LL
#define LADSPA_PLUGIN_PHASER 0x000000040LL
#define LADSPA_PLUGIN_FLANGER 0x000000080LL
#define LADSPA_PLUGIN_CHORUS 0x000000100LL
#define LADSPA_PLUGIN_REVERB 0x000000200LL
#define LADSPA_PLUGIN_FREQUENCY 0x000000400LL
#define LADSPA_PLUGIN_FREQUENCY_METER 0x000000800LL
#define LADSPA_PLUGIN_FILTER 0x000001000LL
#define LADSPA_PLUGIN_LOWPASS 0x000002000LL
#define LADSPA_PLUGIN_HIGHPASS 0x000004000LL
#define LADSPA_PLUGIN_BANDPASS 0x000008000LL
#define LADSPA_PLUGIN_COMB 0x000010000LL
#define LADSPA_PLUGIN_ALLPASS 0x000020000LL
#define LADSPA_PLUGIN_EQ 0x000040000LL
#define LADSPA_PLUGIN_PARAEQ 0x000080000LL
#define LADSPA_PLUGIN_MULTIEQ 0x000100000LL
#define LADSPA_PLUGIN_AMPLITUDE 0x000200000LL
#define LADSPA_PLUGIN_PITCH 0x000400000LL
#define LADSPA_PLUGIN_AMPLIFIER 0x000800000LL
#define LADSPA_PLUGIN_WAVESHAPER 0x001000000LL
#define LADSPA_PLUGIN_MODULATOR 0x002000000LL
#define LADSPA_PLUGIN_DISTORTION 0x004000000LL
#define LADSPA_PLUGIN_DYNAMICS 0x008000000LL
#define LADSPA_PLUGIN_COMPRESSOR 0x010000000LL
#define LADSPA_PLUGIN_EXPANDER 0x020000000LL
#define LADSPA_PLUGIN_LIMITER 0x040000000LL
#define LADSPA_PLUGIN_GATE 0x080000000LL
#define LADSPA_PLUGIN_SPECTRAL 0x100000000LL
#define LADSPA_PLUGIN_NOTCH 0x200000000LL
#define LADSPA_GROUP_DYNAMICS (LADSPA_PLUGIN_DYNAMICS|LADSPA_PLUGIN_COMPRESSOR|LADSPA_PLUGIN_EXPANDER|LADSPA_PLUGIN_LIMITER|LADSPA_PLUGIN_GATE)
#define LADSPA_GROUP_AMPLITUDE (LADSPA_PLUGIN_AMPLITUDE|LADSPA_PLUGIN_AMPLIFIER|LADSPA_PLUGIN_WAVESHAPER|LADSPA_PLUGIN_MODULATOR|LADSPA_PLUGIN_DISTORTION|LADSPA_GROUP_DYNAMICS)
#define LADSPA_GROUP_EQ (LADSPA_PLUGIN_EQ|LADSPA_PLUGIN_PARAEQ|LADSPA_PLUGIN_MULTIEQ)
#define LADSPA_GROUP_FILTER (LADSPA_PLUGIN_FILTER|LADSPA_PLUGIN_LOWPASS|LADSPA_PLUGIN_HIGHPASS|LADSPA_PLUGIN_BANDPASS|LADSPA_PLUGIN_COMB|LADSPA_PLUGIN_ALLPASS|LADSPA_PLUGIN_NOTCH)
#define LADSPA_GROUP_FREQUENCY (LADSPA_PLUGIN_FREQUENCY|LADSPA_PLUGIN_FREQUENCY_METER|LADSPA_GROUP_FILTER|LADSPA_GROUP_EQ|LADSPA_PLUGIN_PITCH)
#define LADSPA_GROUP_SIMULATOR (LADSPA_PLUGIN_SIMULATOR|LADSPA_PLUGIN_REVERB)
#define LADSPA_GROUP_TIME (LADSPA_PLUGIN_TIME|LADSPA_PLUGIN_DELAY|LADSPA_PLUGIN_PHASER|LADSPA_PLUGIN_FLANGER|LADSPA_PLUGIN_CHORUS|LADSPA_PLUGIN_REVERB)
#define LADSPA_GROUP_GENERATOR (LADSPA_PLUGIN_GENERATOR|LADSPA_PLUGIN_OSCILLATOR)
#define LADSPA_IS_PLUGIN_DYNAMICS(x) ((x) & LADSPA_GROUP_DYNAMICS)
#define LADSPA_IS_PLUGIN_AMPLITUDE(x) ((x) & LADSPA_GROUP_AMPLITUDE)
#define LADSPA_IS_PLUGIN_EQ(x) ((x) & LADSPA_GROUP_EQ)
#define LADSPA_IS_PLUGIN_FILTER(x) ((x) & LADSPA_GROUP_FILTER)
#define LADSPA_IS_PLUGIN_FREQUENCY(x) ((x) & LADSPA_GROUP_FREQUENCY)
#define LADSPA_IS_PLUGIN_SIMULATOR(x) ((x) & LADSPA_GROUP_SIMULATOR)
#define LADSPA_IS_PLUGIN_TIME(x) ((x) & LADSPA_GROUP_TIME)
#define LADSPA_IS_PLUGIN_GENERATOR(x) ((x) & LADSPA_GROUP_GENERATOR)
#define LADSPA_RDF_PLUGIN_UTILITY 0x000000001LL
#define LADSPA_RDF_PLUGIN_GENERATOR 0x000000002LL
#define LADSPA_RDF_PLUGIN_SIMULATOR 0x000000004LL
#define LADSPA_RDF_PLUGIN_OSCILLATOR 0x000000008LL
#define LADSPA_RDF_PLUGIN_TIME 0x000000010LL
#define LADSPA_RDF_PLUGIN_DELAY 0x000000020LL
#define LADSPA_RDF_PLUGIN_PHASER 0x000000040LL
#define LADSPA_RDF_PLUGIN_FLANGER 0x000000080LL
#define LADSPA_RDF_PLUGIN_CHORUS 0x000000100LL
#define LADSPA_RDF_PLUGIN_REVERB 0x000000200LL
#define LADSPA_RDF_PLUGIN_FREQUENCY 0x000000400LL
#define LADSPA_RDF_PLUGIN_FREQUENCY_METER 0x000000800LL
#define LADSPA_RDF_PLUGIN_FILTER 0x000001000LL
#define LADSPA_RDF_PLUGIN_LOWPASS 0x000002000LL
#define LADSPA_RDF_PLUGIN_HIGHPASS 0x000004000LL
#define LADSPA_RDF_PLUGIN_BANDPASS 0x000008000LL
#define LADSPA_RDF_PLUGIN_COMB 0x000010000LL
#define LADSPA_RDF_PLUGIN_ALLPASS 0x000020000LL
#define LADSPA_RDF_PLUGIN_EQ 0x000040000LL
#define LADSPA_RDF_PLUGIN_PARAEQ 0x000080000LL
#define LADSPA_RDF_PLUGIN_MULTIEQ 0x000100000LL
#define LADSPA_RDF_PLUGIN_AMPLITUDE 0x000200000LL
#define LADSPA_RDF_PLUGIN_PITCH 0x000400000LL
#define LADSPA_RDF_PLUGIN_AMPLIFIER 0x000800000LL
#define LADSPA_RDF_PLUGIN_WAVESHAPER 0x001000000LL
#define LADSPA_RDF_PLUGIN_MODULATOR 0x002000000LL
#define LADSPA_RDF_PLUGIN_DISTORTION 0x004000000LL
#define LADSPA_RDF_PLUGIN_DYNAMICS 0x008000000LL
#define LADSPA_RDF_PLUGIN_COMPRESSOR 0x010000000LL
#define LADSPA_RDF_PLUGIN_EXPANDER 0x020000000LL
#define LADSPA_RDF_PLUGIN_LIMITER 0x040000000LL
#define LADSPA_RDF_PLUGIN_GATE 0x080000000LL
#define LADSPA_RDF_PLUGIN_SPECTRAL 0x100000000LL
#define LADSPA_RDF_PLUGIN_NOTCH 0x200000000LL
#define LADSPA_RDF_GROUP_DYNAMICS (LADSPA_RDF_PLUGIN_DYNAMICS|LADSPA_RDF_PLUGIN_COMPRESSOR|LADSPA_RDF_PLUGIN_EXPANDER|LADSPA_RDF_PLUGIN_LIMITER|LADSPA_RDF_PLUGIN_GATE)
#define LADSPA_RDF_GROUP_AMPLITUDE (LADSPA_RDF_PLUGIN_AMPLITUDE|LADSPA_RDF_PLUGIN_AMPLIFIER|LADSPA_RDF_PLUGIN_WAVESHAPER|LADSPA_RDF_PLUGIN_MODULATOR|LADSPA_RDF_PLUGIN_DISTORTION|LADSPA_RDF_GROUP_DYNAMICS)
#define LADSPA_RDF_GROUP_EQ (LADSPA_RDF_PLUGIN_EQ|LADSPA_RDF_PLUGIN_PARAEQ|LADSPA_RDF_PLUGIN_MULTIEQ)
#define LADSPA_RDF_GROUP_FILTER (LADSPA_RDF_PLUGIN_FILTER|LADSPA_RDF_PLUGIN_LOWPASS|LADSPA_RDF_PLUGIN_HIGHPASS|LADSPA_RDF_PLUGIN_BANDPASS|LADSPA_RDF_PLUGIN_COMB|LADSPA_RDF_PLUGIN_ALLPASS|LADSPA_RDF_PLUGIN_NOTCH)
#define LADSPA_RDF_GROUP_FREQUENCY (LADSPA_RDF_PLUGIN_FREQUENCY|LADSPA_RDF_PLUGIN_FREQUENCY_METER|LADSPA_RDF_GROUP_FILTER|LADSPA_RDF_GROUP_EQ|LADSPA_RDF_PLUGIN_PITCH)
#define LADSPA_RDF_GROUP_SIMULATOR (LADSPA_RDF_PLUGIN_SIMULATOR|LADSPA_RDF_PLUGIN_REVERB)
#define LADSPA_RDF_GROUP_TIME (LADSPA_RDF_PLUGIN_TIME|LADSPA_RDF_PLUGIN_DELAY|LADSPA_RDF_PLUGIN_PHASER|LADSPA_RDF_PLUGIN_FLANGER|LADSPA_RDF_PLUGIN_CHORUS|LADSPA_RDF_PLUGIN_REVERB)
#define LADSPA_RDF_GROUP_GENERATOR (LADSPA_RDF_PLUGIN_GENERATOR|LADSPA_RDF_PLUGIN_OSCILLATOR)
#define LADSPA_RDF_IS_PLUGIN_DYNAMICS(x) ((x) & LADSPA_RDF_GROUP_DYNAMICS)
#define LADSPA_RDF_IS_PLUGIN_AMPLITUDE(x) ((x) & LADSPA_RDF_GROUP_AMPLITUDE)
#define LADSPA_RDF_IS_PLUGIN_EQ(x) ((x) & LADSPA_RDF_GROUP_EQ)
#define LADSPA_RDF_IS_PLUGIN_FILTER(x) ((x) & LADSPA_RDF_GROUP_FILTER)
#define LADSPA_RDF_IS_PLUGIN_FREQUENCY(x) ((x) & LADSPA_RDF_GROUP_FREQUENCY)
#define LADSPA_RDF_IS_PLUGIN_SIMULATOR(x) ((x) & LADSPA_RDF_GROUP_SIMULATOR)
#define LADSPA_RDF_IS_PLUGIN_TIME(x) ((x) & LADSPA_RDF_GROUP_TIME)
#define LADSPA_RDF_IS_PLUGIN_GENERATOR(x) ((x) & LADSPA_RDF_GROUP_GENERATOR)

// Scale Point
struct LADSPA_RDF_ScalePoint {
@@ -140,11 +134,11 @@ struct LADSPA_RDF_ScalePoint {

// Port
struct LADSPA_RDF_Port {
LADSPA_Property Type;
LADSPA_Property Hints;
LADSPA_RDF_Property Type;
LADSPA_RDF_Property Hints;
const char* Label;
LADSPA_Data Default;
LADSPA_Property Unit;
LADSPA_RDF_Property Unit;

unsigned long ScalePointCount;
LADSPA_RDF_ScalePoint* ScalePoints;
@@ -177,7 +171,7 @@ struct LADSPA_RDF_Port {

// Plugin Descriptor
struct LADSPA_RDF_Descriptor {
LADSPA_PluginType Type;
LADSPA_RDF_PluginType Type;
unsigned long UniqueID;
const char* Title;
const char* Creator;


Write Preview
Loading…
Cancel
Save