From 67fbe0d520fccb2f70bf1c041cd2b7d6d3bc34af Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 13 Aug 2013 06:04:51 +0100 Subject: [PATCH] Misc --- source/backend/CarlaBackend.hpp | 18 ++++++++++-------- source/carla_backend.py | 21 ++++++++++++--------- source/utils/CarlaBackendUtils.hpp | 6 ++++++ 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/source/backend/CarlaBackend.hpp b/source/backend/CarlaBackend.hpp index 67eaedc78..9f84aa7d7 100644 --- a/source/backend/CarlaBackend.hpp +++ b/source/backend/CarlaBackend.hpp @@ -120,11 +120,12 @@ const char* const CUSTOM_DATA_STRING = "http://kxstudio.sf.net/ns/carla/string" * Various patchbay port hints. * @{ */ -const unsigned int PATCHBAY_PORT_IS_INPUT = 0x01; //!< Patchbay port is input. -const unsigned int PATCHBAY_PORT_IS_OUTPUT = 0x02; //!< Patchbay port is output. -const unsigned int PATCHBAY_PORT_IS_AUDIO = 0x10; //!< Patchbay port is of Audio type. -const unsigned int PATCHBAY_PORT_IS_CV = 0x20; //!< Patchbay port is of CV type. -const unsigned int PATCHBAY_PORT_IS_MIDI = 0x40; //!< Patchbay port is of MIDI type. +const unsigned int PATCHBAY_PORT_IS_INPUT = 0x01; //!< Patchbay port is input. +const unsigned int PATCHBAY_PORT_IS_OUTPUT = 0x02; //!< Patchbay port is output. +const unsigned int PATCHBAY_PORT_IS_AUDIO = 0x10; //!< Patchbay port is of Audio type. +const unsigned int PATCHBAY_PORT_IS_CV = 0x20; //!< Patchbay port is of CV type. +const unsigned int PATCHBAY_PORT_IS_MIDI = 0x40; //!< Patchbay port is of MIDI type. +const unsigned int PATCHBAY_PORT_IS_PARAMETER = 0x80; //!< Patchbay port is of Parameter type. /**@}*/ /*! @@ -152,9 +153,10 @@ enum PluginType { PLUGIN_VST = 5, //!< VST1/2 plugin. PLUGIN_VST3 = 6, //!< VST3 plugin. PLUGIN_AU = 7, //!< AU plugin. - PLUGIN_GIG = 8, //!< GIG sound kit. - PLUGIN_SF2 = 9, //!< SF2 sound kit (aka SoundFont). - PLUGIN_SFZ = 10 //!< SFZ sound kit. + PLUGIN_CSOUND = 8, //!< Csound file. + PLUGIN_GIG = 9, //!< GIG sound kit. + PLUGIN_SF2 = 10, //!< SF2 sound kit (aka SoundFont). + PLUGIN_SFZ = 11 //!< SFZ sound kit. }; /*! diff --git a/source/carla_backend.py b/source/carla_backend.py index 2a3f16c00..d000a2bc7 100644 --- a/source/carla_backend.py +++ b/source/carla_backend.py @@ -131,11 +131,12 @@ CUSTOM_DATA_CHUNK = "http://kxstudio.sf.net/ns/carla/chunk" CUSTOM_DATA_STRING = "http://kxstudio.sf.net/ns/carla/string" # Patchbay Port Hints -PATCHBAY_PORT_IS_INPUT = 0x01 -PATCHBAY_PORT_IS_OUTPUT = 0x02 -PATCHBAY_PORT_IS_AUDIO = 0x10 -PATCHBAY_PORT_IS_CV = 0x20 -PATCHBAY_PORT_IS_MIDI = 0x40 +PATCHBAY_PORT_IS_INPUT = 0x01 +PATCHBAY_PORT_IS_OUTPUT = 0x02 +PATCHBAY_PORT_IS_AUDIO = 0x10 +PATCHBAY_PORT_IS_CV = 0x20 +PATCHBAY_PORT_IS_MIDI = 0x40 +PATCHBAY_PORT_IS_PARAMETER = 0x80 # Binary Type BINARY_NONE = 0 @@ -153,9 +154,11 @@ PLUGIN_DSSI = 3 PLUGIN_LV2 = 4 PLUGIN_VST = 5 PLUGIN_VST3 = 6 -PLUGIN_GIG = 7 -PLUGIN_SF2 = 8 -PLUGIN_SFZ = 9 +PLUGIN_AU = 7 +PLUGIN_CSOUND = 8 +PLUGIN_GIG = 9 +PLUGIN_SF2 = 10 +PLUGIN_SFZ = 11 # Plugin Category PLUGIN_CATEGORY_NONE = 0 @@ -397,7 +400,7 @@ class CarlaTransportInfo(Structure): ] # ------------------------------------------------------------------------------------------------------------ -# Standalone Python object +# Host Python object (Control/Standalone) class Host(object): def __init__(self, libName): diff --git a/source/utils/CarlaBackendUtils.hpp b/source/utils/CarlaBackendUtils.hpp index b29c236d6..add6ce371 100644 --- a/source/utils/CarlaBackendUtils.hpp +++ b/source/utils/CarlaBackendUtils.hpp @@ -98,6 +98,8 @@ const char* PluginType2Str(const PluginType type) return "PLUGIN_VST3"; case PLUGIN_AU: return "PLUGIN_AU"; + case PLUGIN_CSOUND: + return "PLUGIN_CSOUND"; case PLUGIN_GIG: return "PLUGIN_GIG"; case PLUGIN_SF2: @@ -445,6 +447,8 @@ const char* getPluginTypeAsString(const PluginType type) return "VST3"; case PLUGIN_AU: return "AU"; + case PLUGIN_CSOUND: + return "CSOUND"; case PLUGIN_GIG: return "GIG"; case PLUGIN_SF2: @@ -485,6 +489,8 @@ PluginType getPluginTypeFromString(const char* const stype) return PLUGIN_VST3; if (std::strcmp(stype, "AU") == 0) return PLUGIN_AU; + if (std::strcmp(stype, "CSOUND") == 0) + return PLUGIN_CSOUND; if (std::strcmp(stype, "GIG") == 0) return PLUGIN_GIG; if (std::strcmp(stype, "SF2") == 0)