Browse Source

Misc

tags/1.9.4
falkTX 12 years ago
parent
commit
732413eb14
4 changed files with 20 additions and 8 deletions
  1. +5
    -0
      source/backend/CarlaBackend.h
  2. +9
    -3
      source/backend/engine/CarlaEngineJack.cpp
  3. +3
    -0
      source/carla_backend.py
  4. +3
    -5
      source/carla_patchbay.py

+ 5
- 0
source/backend/CarlaBackend.h View File

@@ -316,6 +316,11 @@ const unsigned int PATCHBAY_PORT_TYPE_CV = 0x4;
*/
const unsigned int PATCHBAY_PORT_TYPE_MIDI = 0x8;

/*!
* Patchbay port is of Parameter type.
*/
const unsigned int PATCHBAY_PORT_TYPE_PARAMETER = 0x10;

/** @} */

/* ------------------------------------------------------------------------------------------------------------


+ 9
- 3
source/backend/engine/CarlaEngineJack.cpp View File

@@ -1440,10 +1440,13 @@ protected:

unsigned int canvasPortFlags = 0x0;
canvasPortFlags |= portIsInput ? PATCHBAY_PORT_IS_INPUT : 0x0;
canvasPortFlags |= portIsAudio ? PATCHBAY_PORT_TYPE_AUDIO : PATCHBAY_PORT_TYPE_MIDI;

if (portIsAudio && portIsCV)
if (portIsCV)
canvasPortFlags |= PATCHBAY_PORT_TYPE_CV;
else if (portIsAudio)
canvasPortFlags |= PATCHBAY_PORT_TYPE_AUDIO;
else
canvasPortFlags |= PATCHBAY_PORT_TYPE_MIDI;

PortNameToId portNameToId;
portNameToId.setData(groupId, fLastPortId++, portName, fullPortName);
@@ -1918,10 +1921,13 @@ private:

unsigned int canvasPortFlags = 0x0;
canvasPortFlags |= portIsInput ? PATCHBAY_PORT_IS_INPUT : 0x0;
canvasPortFlags |= portIsAudio ? PATCHBAY_PORT_TYPE_AUDIO : PATCHBAY_PORT_TYPE_MIDI;

if (portIsCV)
canvasPortFlags |= PATCHBAY_PORT_TYPE_CV;
else if (portIsAudio)
canvasPortFlags |= PATCHBAY_PORT_TYPE_AUDIO;
else
canvasPortFlags |= PATCHBAY_PORT_TYPE_MIDI;

PortNameToId portNameToId;
portNameToId.setData(groupId, fLastPortId++, portName, fullPortName);


+ 3
- 0
source/carla_backend.py View File

@@ -306,6 +306,9 @@ PATCHBAY_PORT_TYPE_CV = 0x4
# Patchbay port is of MIDI type.
PATCHBAY_PORT_TYPE_MIDI = 0x8

# Patchbay port is of Parameter type.
PATCHBAY_PORT_TYPE_PARAMETER = 0x10

# ------------------------------------------------------------------------------------------------------------
# Custom Data Types
# These types define how the value in the CustomData struct is stored.


+ 3
- 5
source/carla_patchbay.py View File

@@ -864,17 +864,15 @@ class CarlaPatchbayW(QFrame):
if (portFlags & PATCHBAY_PORT_TYPE_AUDIO):
portType = patchcanvas.PORT_TYPE_AUDIO_JACK
elif (portFlags & PATCHBAY_PORT_TYPE_CV):
isAlternate = True
portType = patchcanvas.PORT_TYPE_AUDIO_JACK
elif (portFlags & PATCHBAY_PORT_TYPE_MIDI):
portType = patchcanvas.PORT_TYPE_MIDI_JACK
#elif (portFlags & PATCHBAY_PORT_TYPE_PARAMETER):
#portType = patchcanvas.PORT_TYPE_PARAMETER
elif (portFlags & PATCHBAY_PORT_TYPE_PARAMETER):
portType = patchcanvas.PORT_TYPE_PARAMETER
else:
portType = patchcanvas.PORT_TYPE_NULL

if (portFlags & PATCHBAY_PORT_TYPE_CV):
isAlternate = True

patchcanvas.addPort(clientId, portId, portName, portMode, portType, isAlternate)
QTimer.singleShot(0, self.fMiniCanvasPreview.update)



Loading…
Cancel
Save