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

More work

tags/1.9.4
falkTX 12 years ago
parent
88f1fa2d69
commit
0bdd4ecf81
4 changed files with 133 additions and 166 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +4
    -78
      resources/resources.qrc
  2. +28
    -27
      source/backend/carla_native.hpp
  3. +4
    -2
      source/carla.kdev4
  4. +97
    -59
      source/carla_shared.py

+ 4
- 78
resources/resources.qrc View File

@@ -1,80 +1,19 @@
<RCC version="1.0"> <RCC version="1.0">
<qresource prefix="/"> <qresource prefix="/">
<file>16x16/cadence.png</file>
<file>16x16/catarina.png</file>
<file>16x16/catia.png</file>
<file>16x16/claudia.png</file>
<file>16x16/claudia-launcher.png</file>
<file>16x16/carla.png</file> <file>16x16/carla.png</file>
<file>16x16/carla-control.png</file> <file>16x16/carla-control.png</file>


<file>16x16/application-exit.png</file>
<file>16x16/arrow-right.png</file>
<file>16x16/configure.png</file>
<file>16x16/dialog-cancel.png</file>
<file>16x16/dialog-error.png</file>
<file>16x16/dialog-information.png</file>
<file>16x16/dialog-ok-apply.png</file>
<file>16x16/document-new.png</file>
<file>16x16/document-open.png</file>
<file>16x16/document-print.png</file>
<file>16x16/document-save.png</file>
<file>16x16/document-save-as.png</file>
<file>16x16/edit-clear.png</file>
<file>16x16/edit-delete.png</file>
<file>16x16/edit-rename.png</file>
<file>16x16/list-add.png</file>
<file>16x16/list-remove.png</file>
<file>16x16/media-playback-pause.png</file>
<file>16x16/media-playback-start.png</file>
<file>16x16/media-playback-stop.png</file>
<file>16x16/media-record.png</file>
<file>16x16/media-seek-backward.png</file>
<file>16x16/media-seek-forward.png</file>
<file>16x16/network-connect.png</file>
<file>16x16/network-disconnect.png</file>
<file>16x16/system-run.png</file>
<file>16x16/user-trash.png</file>
<file>16x16/view-refresh.png</file>
<file>16x16/view-sort-ascending.png</file>
<file>16x16/window-close.png</file>
<file>16x16/zoom-fit-best.png</file>
<file>16x16/zoom-in.png</file>
<file>16x16/zoom-original.png</file>
<file>16x16/zoom-out.png</file>

<file>48x48/cadence.png</file>
<file>48x48/catarina.png</file>
<file>48x48/catia.png</file>
<file>48x48/claudia.png</file>
<file>48x48/claudia-launcher.png</file>
<file>48x48/carla.png</file> <file>48x48/carla.png</file>
<file>48x48/carla-control.png</file> <file>48x48/carla-control.png</file>


<file>48x48/canvas.png</file>
<file>48x48/exec.png</file>
<file>48x48/folder.png</file>
<file>48x48/jack.png</file>
<file>48x48/ladish.png</file>
<file>48x48/media-record.png</file>
<file>48x48/carla.png</file>
<file>48x48/carla-control.png</file>


<file>scalable/cadence.svg</file>
<file>scalable/catarina.svg</file>
<file>scalable/catia.svg</file>
<file>scalable/claudia.svg</file>
<file>scalable/claudia-launcher.svg</file>
<file>scalable/carla.svg</file> <file>scalable/carla.svg</file>
<file>scalable/carla-control.svg</file> <file>scalable/carla-control.svg</file>
<file>scalable/jack.svg</file>

<file>scalable/pb_generic.svg</file>
<file>scalable/pb_hardware.svg</file>
<file>scalable/pb_audacious.svg</file>
<file>scalable/pb_clementine.svg</file>
<file>scalable/pb_jamin.svg</file>
<file>scalable/pb_mplayer.svg</file>
<file>scalable/pb_vlc.svg</file>


<file>bitmaps/carla_about.png</file>
<file>bitmaps/carla_knobs1.png</file>
<file>bitmaps/dial_01.png</file> <file>bitmaps/dial_01.png</file>
<file>bitmaps/dial_01d.png</file> <file>bitmaps/dial_01d.png</file>
<file>bitmaps/dial_02.png</file> <file>bitmaps/dial_02.png</file>
@@ -94,18 +33,5 @@
<file>bitmaps/led_yellow.png</file> <file>bitmaps/led_yellow.png</file>
<file>bitmaps/led-big_on.png</file> <file>bitmaps/led-big_on.png</file>
<file>bitmaps/led-big_off.png</file> <file>bitmaps/led-big_off.png</file>
<file>bitmaps/carla_about.png</file>
<file>bitmaps/carla_knobs1.png</file>

<file>bitmaps/canvas/frame_node_header.png</file>
<file>bitmaps/canvas/frame_port_bg.png</file>
<file>bitmaps/textures/metal_9-512px.jpg</file>

<file>screens/cadence-logs.png</file>
<file>screens/cadence-render.png</file>
<file>screens/cadence-xycontroller.png</file>
<file>screens/catia.png</file>
<file>screens/claudia.png</file>
<file>screens/carla.png</file>
</qresource> </qresource>
</RCC> </RCC>

+ 28
- 27
source/backend/carla_native.hpp View File

@@ -30,8 +30,9 @@ class PluginDescriptorClass
{ {
public: public:
PluginDescriptorClass(const HostDescriptor* const host) PluginDescriptorClass(const HostDescriptor* const host)
: m_host(host)
: fHost(host)
{ {
CARLA_ASSERT(fHost);
} }


virtual ~PluginDescriptorClass() virtual ~PluginDescriptorClass()
@@ -43,77 +44,77 @@ public:


const HostDescriptor* getHostHandle() const const HostDescriptor* getHostHandle() const
{ {
return m_host;
return fHost;
} }


uint32_t getBufferSize() const uint32_t getBufferSize() const
{ {
CARLA_ASSERT(m_host);
CARLA_ASSERT(fHost);


if (m_host)
return m_host->get_buffer_size(m_host->handle);
if (fHost)
return fHost->get_buffer_size(fHost->handle);


return 0; return 0;
} }


double getSampleRate() const double getSampleRate() const
{ {
CARLA_ASSERT(m_host);
CARLA_ASSERT(fHost);


if (m_host)
return m_host->get_sample_rate(m_host->handle);
if (fHost)
return fHost->get_sample_rate(fHost->handle);


return 0.0; return 0.0;
} }


const TimeInfo* getTimeInfo() const const TimeInfo* getTimeInfo() const
{ {
CARLA_ASSERT(m_host);
CARLA_ASSERT(fHost);


if (m_host)
return m_host->get_time_info(m_host->handle);
if (fHost)
return fHost->get_time_info(fHost->handle);


return nullptr; return nullptr;
} }


void writeMidiEvent(const MidiEvent* const event) void writeMidiEvent(const MidiEvent* const event)
{ {
CARLA_ASSERT(m_host);
CARLA_ASSERT(fHost);


if (m_host)
m_host->write_midi_event(m_host->handle, event);
if (fHost)
fHost->write_midi_event(fHost->handle, event);
} }


void uiParameterChanged(const uint32_t index, const float value) void uiParameterChanged(const uint32_t index, const float value)
{ {
CARLA_ASSERT(m_host);
CARLA_ASSERT(fHost);


if (m_host)
m_host->ui_parameter_changed(m_host->handle, index, value);
if (fHost)
fHost->ui_parameter_changed(fHost->handle, index, value);
} }


void uiMidiProgramChanged(const uint32_t bank, const uint32_t program) void uiMidiProgramChanged(const uint32_t bank, const uint32_t program)
{ {
CARLA_ASSERT(m_host);
CARLA_ASSERT(fHost);


if (m_host)
m_host->ui_midi_program_changed(m_host->handle, bank, program);
if (fHost)
fHost->ui_midi_program_changed(fHost->handle, bank, program);
} }


void uiCustomDataChanged(const char* const key, const char* const value) void uiCustomDataChanged(const char* const key, const char* const value)
{ {
CARLA_ASSERT(m_host);
CARLA_ASSERT(fHost);


if (m_host)
m_host->ui_custom_data_changed(m_host->handle, key, value);
if (fHost)
fHost->ui_custom_data_changed(fHost->handle, key, value);
} }


void uiClosed() void uiClosed()
{ {
CARLA_ASSERT(m_host);
CARLA_ASSERT(fHost);


if (m_host)
m_host->ui_closed(m_host->handle);
if (fHost)
fHost->ui_closed(fHost->handle);
} }


protected: protected:
@@ -270,7 +271,7 @@ protected:
// ------------------------------------------------------------------- // -------------------------------------------------------------------


private: private:
const HostDescriptor* const m_host;
const HostDescriptor* const fHost;


// ------------------------------------------------------------------- // -------------------------------------------------------------------




+ 4
- 2
source/carla.kdev4 View File

@@ -1,7 +1,9 @@
[Project]
Manager=KDevGenericManager
Name=Carla

[Filters] [Filters]
Excludes=*/.*,*/*~,*/*.pyc,*/ui_*.py,*/__pycache__/ Excludes=*/.*,*/*~,*/*.pyc,*/ui_*.py,*/__pycache__/


[Project] [Project]
Manager=
Name=source
VersionControlSupport=kdevgit VersionControlSupport=kdevgit

+ 97
- 59
source/carla_shared.py View File

@@ -20,7 +20,7 @@
# Imports (Global) # Imports (Global)


import os import os
#import platform
import platform
import sys import sys
from codecs import open as codecopen from codecs import open as codecopen
from copy import deepcopy from copy import deepcopy
@@ -133,7 +133,7 @@ else:
# ------------------------------------------------------------------------------------------------------------ # ------------------------------------------------------------------------------------------------------------
# 64bit check # 64bit check


is64bit = False #bool(platform.architecture()[0] == "64bit" and sys.maxsize > 2**32)
kIs64bit = bool(platform.architecture()[0] == "64bit" and sys.maxsize > 2**32)


# ------------------------------------------------------------------------------------------------------------ # ------------------------------------------------------------------------------------------------------------
# Convert a ctypes c_char_p into a python string # Convert a ctypes c_char_p into a python string
@@ -303,9 +303,9 @@ PROCESS_MODE_PATCHBAY = 3


# Set BINARY_NATIVE # Set BINARY_NATIVE
if HAIKU or LINUX or MACOS: if HAIKU or LINUX or MACOS:
BINARY_NATIVE = BINARY_POSIX64 if is64bit else BINARY_POSIX32
BINARY_NATIVE = BINARY_POSIX64 if kIs64bit else BINARY_POSIX32
elif WINDOWS: elif WINDOWS:
BINARY_NATIVE = BINARY_WIN64 if is64bit else BINARY_WIN32
BINARY_NATIVE = BINARY_WIN64 if kIs64bit else BINARY_WIN32
else: else:
BINARY_NATIVE = BINARY_OTHER BINARY_NATIVE = BINARY_OTHER


@@ -629,29 +629,33 @@ def xmlSafeString(string, toXml):
# ------------------------------------------------------------------------------------------------------------ # ------------------------------------------------------------------------------------------------------------
# Carla About dialog # Carla About dialog


class CarlaAboutW(QDialog, ui_carla_about.Ui_CarlaAboutW):
class CarlaAboutW(QDialog):
def __init__(self, parent): def __init__(self, parent):
QDialog.__init__(self, parent) QDialog.__init__(self, parent)
self.setupUi(self)
self.ui = ui_carla_about.Ui_CarlaAboutW()
self.ui.setupUi(self)


oscTxt = self.tr(" - <b>OSC Bridge Version</b>") if Carla.isControl else ""
if Carla.isControl:
extraInfo = " - <b>%s</b>" % self.tr("OSC Bridge Version")
else:
extraInfo = ""


self.l_about.setText(self.tr(""
self.ui.l_about.setText(self.tr(""
"<br>Version %s" "<br>Version %s"
"<br>Carla is a Multi-Plugin Host for JACK%s.<br>" "<br>Carla is a Multi-Plugin Host for JACK%s.<br>"
"<br>Copyright (C) 2011-2012 falkTX<br>"
"" % (VERSION, oscTxt)))
"<br>Copyright (C) 2011-2013 falkTX<br>"
"" % (VERSION, extraInfo)))


if Carla.isControl: if Carla.isControl:
self.l_extended.setVisible(False) # TODO - write about this special OSC version
self.tabWidget.removeTab(1)
self.tabWidget.removeTab(1)
self.ui.l_extended.hide()
self.ui.tabWidget.removeTab(1)
self.ui.tabWidget.removeTab(1)


else: else:
self.l_extended.setText(cString(Carla.host.get_extended_license_text()))
self.le_osc_url.setText(cString(Carla.host.get_host_osc_url()) if Carla.host.is_engine_running() else self.tr("(Engine not running)"))
self.ui.l_extended.setText(cString(Carla.host.get_extended_license_text()))
self.ui.le_osc_url.setText(cString(Carla.host.get_host_osc_url()) if Carla.host.is_engine_running() else self.tr("(Engine not running)"))


self.l_osc_cmds.setText(
self.ui.l_osc_cmds.setText(
" /set_active <i-value>\n" " /set_active <i-value>\n"
" /set_drywet <f-value>\n" " /set_drywet <f-value>\n"
" /set_volume <f-value>\n" " /set_volume <f-value>\n"
@@ -667,12 +671,12 @@ class CarlaAboutW(QDialog, ui_carla_about.Ui_CarlaAboutW):
" /note_off <i-note>\n" " /note_off <i-note>\n"
) )


self.l_example.setText("/Carla/2/set_parameter_value 5 1.0")
self.l_example_help.setText("<i>(as in this example, \"2\" is the plugin number and \"5\" the parameter)</i>")
self.ui.l_example.setText("/Carla/2/set_parameter_value 5 1.0")
self.ui.l_example_help.setText("<i>(as in this example, \"2\" is the plugin number and \"5\" the parameter)</i>")


self.l_ladspa.setText(self.tr("Everything! (Including LRDF)"))
self.l_dssi.setText(self.tr("Everything! (Including CustomData/Chunks)"))
self.l_lv2.setText(self.tr("About 95&#37; complete (using custom extensions).<br/>"
self.ui.l_ladspa.setText(self.tr("Everything! (Including LRDF)"))
self.ui.l_dssi.setText(self.tr("Everything! (Including CustomData/Chunks)"))
self.ui.l_lv2.setText(self.tr("About 95&#37; complete (using custom extensions).<br/>"
"Implemented Feature/Extensions:" "Implemented Feature/Extensions:"
"<ul>" "<ul>"
"<li>http://lv2plug.in/ns/ext/atom</li>" "<li>http://lv2plug.in/ns/ext/atom</li>"
@@ -702,7 +706,7 @@ class CarlaAboutW(QDialog, ui_carla_about.Ui_CarlaAboutW):
"<li>http://ll-plugins.nongnu.org/lv2/ext/midimap</li>" "<li>http://ll-plugins.nongnu.org/lv2/ext/midimap</li>"
"<li>http://ll-plugins.nongnu.org/lv2/ext/miditype</li>" "<li>http://ll-plugins.nongnu.org/lv2/ext/miditype</li>"
"</ul>")) "</ul>"))
self.l_vst.setText(self.tr("<p>About 85&#37; complete (missing vst bank/presets and some minor stuff)</p>"))
self.ui.l_vst.setText(self.tr("<p>About 85&#37; complete (missing vst bank/presets and some minor stuff)</p>"))


def done(self, r): def done(self, r):
QDialog.done(self, r) QDialog.done(self, r)
@@ -711,10 +715,11 @@ class CarlaAboutW(QDialog, ui_carla_about.Ui_CarlaAboutW):
# ------------------------------------------------------------------------------------------------------------ # ------------------------------------------------------------------------------------------------------------
# Plugin Parameter # Plugin Parameter


class PluginParameter(QWidget, ui_carla_parameter.Ui_PluginParameter):
class PluginParameter(QWidget):
def __init__(self, parent, pInfo, pluginId, tabIndex): def __init__(self, parent, pInfo, pluginId, tabIndex):
QWidget.__init__(self, parent) QWidget.__init__(self, parent)
self.setupUi(self)
self.ui = ui_carla_parameter.Ui_PluginParameter()
self.ui.setupUi(self)


pType = pInfo['type'] pType = pInfo['type']
pHints = pInfo['hints'] pHints = pInfo['hints']
@@ -725,67 +730,67 @@ class PluginParameter(QWidget, ui_carla_parameter.Ui_PluginParameter):
self.m_parameterId = pInfo['index'] self.m_parameterId = pInfo['index']
self.m_tabIndex = tabIndex self.m_tabIndex = tabIndex


self.label.setText(pInfo['name'])
self.ui.label.setText(pInfo['name'])


for MIDI_CC in MIDI_CC_LIST: for MIDI_CC in MIDI_CC_LIST:
self.combo.addItem(MIDI_CC)
self.ui.combo.addItem(MIDI_CC)


if pType == PARAMETER_INPUT: if pType == PARAMETER_INPUT:
self.widget.set_minimum(pInfo['minimum'])
self.widget.set_maximum(pInfo['maximum'])
self.widget.set_default(pInfo['default'])
self.widget.set_value(pInfo['current'], False)
self.widget.set_label(pInfo['unit'])
self.widget.set_step(pInfo['step'])
self.widget.set_step_small(pInfo['stepSmall'])
self.widget.set_step_large(pInfo['stepLarge'])
self.widget.set_scalepoints(pInfo['scalepoints'], bool(pHints & PARAMETER_USES_SCALEPOINTS))
self.ui.widget.set_minimum(pInfo['minimum'])
self.ui.widget.set_maximum(pInfo['maximum'])
self.ui.widget.set_default(pInfo['default'])
self.ui.widget.set_value(pInfo['current'], False)
self.ui.widget.set_label(pInfo['unit'])
self.ui.widget.set_step(pInfo['step'])
self.ui.widget.set_step_small(pInfo['stepSmall'])
self.ui.widget.set_step_large(pInfo['stepLarge'])
self.ui.widget.set_scalepoints(pInfo['scalepoints'], bool(pHints & PARAMETER_USES_SCALEPOINTS))


if not pHints & PARAMETER_IS_ENABLED: if not pHints & PARAMETER_IS_ENABLED:
self.widget.set_read_only(True)
self.combo.setEnabled(False)
self.sb_channel.setEnabled(False)
self.ui.widget.set_read_only(True)
self.ui.combo.setEnabled(False)
self.ui.sb_channel.setEnabled(False)


elif not pHints & PARAMETER_IS_AUTOMABLE: elif not pHints & PARAMETER_IS_AUTOMABLE:
self.combo.setEnabled(False)
self.sb_channel.setEnabled(False)
self.ui.combo.setEnabled(False)
self.ui.sb_channel.setEnabled(False)


elif pType == PARAMETER_OUTPUT: elif pType == PARAMETER_OUTPUT:
self.widget.set_minimum(pInfo['minimum'])
self.widget.set_maximum(pInfo['maximum'])
self.widget.set_value(pInfo['current'], False)
self.widget.set_label(pInfo['unit'])
self.widget.set_read_only(True)
self.ui.widget.set_minimum(pInfo['minimum'])
self.ui.widget.set_maximum(pInfo['maximum'])
self.ui.widget.set_value(pInfo['current'], False)
self.ui.widget.set_label(pInfo['unit'])
self.ui.widget.set_read_only(True)


if not pHints & PARAMETER_IS_AUTOMABLE: if not pHints & PARAMETER_IS_AUTOMABLE:
self.combo.setEnabled(False)
self.sb_channel.setEnabled(False)
self.ui.combo.setEnabled(False)
self.ui.sb_channel.setEnabled(False)


else: else:
self.widget.setVisible(False)
self.combo.setVisible(False)
self.sb_channel.setVisible(False)
self.ui.widget.setVisible(False)
self.ui.combo.setVisible(False)
self.ui.sb_channel.setVisible(False)


self.set_parameter_midi_cc(pInfo['midiCC']) self.set_parameter_midi_cc(pInfo['midiCC'])
self.set_parameter_midi_channel(pInfo['midiChannel']) self.set_parameter_midi_channel(pInfo['midiChannel'])


self.connect(self.widget, SIGNAL("valueChanged(double)"), SLOT("slot_valueChanged(double)"))
self.connect(self.sb_channel, SIGNAL("valueChanged(int)"), SLOT("slot_midiChannelChanged(int)"))
self.connect(self.combo, SIGNAL("currentIndexChanged(int)"), SLOT("slot_midiCcChanged(int)"))
self.connect(self.ui.widget, SIGNAL("valueChanged(double)"), SLOT("slot_valueChanged(double)"))
self.connect(self.ui.sb_channel, SIGNAL("valueChanged(int)"), SLOT("slot_midiChannelChanged(int)"))
self.connect(self.ui.combo, SIGNAL("currentIndexChanged(int)"), SLOT("slot_midiCcChanged(int)"))


#if force_parameters_style: #if force_parameters_style:
#self.widget.force_plastique_style() #self.widget.force_plastique_style()


if pHints & PARAMETER_USES_CUSTOM_TEXT: if pHints & PARAMETER_USES_CUSTOM_TEXT:
self.widget.set_text_call(self.textCallBack)
self.ui.widget.set_text_call(self.textCallBack)


self.widget.updateAll()
self.ui.widget.updateAll()


def setDefaultValue(self, value): def setDefaultValue(self, value):
self.widget.set_default(value)
self.ui.widget.set_default(value)


def set_parameter_value(self, value, send=True): def set_parameter_value(self, value, send=True):
self.widget.set_value(value, send)
self.ui.widget.set_value(value, send)


def set_parameter_midi_cc(self, cc): def set_parameter_midi_cc(self, cc):
self.m_midiCC = cc self.m_midiCC = cc
@@ -793,7 +798,7 @@ class PluginParameter(QWidget, ui_carla_parameter.Ui_PluginParameter):


def set_parameter_midi_channel(self, channel): def set_parameter_midi_channel(self, channel):
self.m_midiChannel = channel+1 self.m_midiChannel = channel+1
self.sb_channel.setValue(channel+1)
self.ui.sb_channel.setValue(channel+1)


def set_MIDI_CC_in_ComboBox(self, cc): def set_MIDI_CC_in_ComboBox(self, cc):
for i in range(len(MIDI_CC_LIST)): for i in range(len(MIDI_CC_LIST)):
@@ -804,7 +809,7 @@ class PluginParameter(QWidget, ui_carla_parameter.Ui_PluginParameter):
else: else:
ccIndex = -1 ccIndex = -1


self.combo.setCurrentIndex(ccIndex+1)
self.ui.combo.setCurrentIndex(ccIndex+1)


def tabIndex(self): def tabIndex(self):
return self.m_tabIndex return self.m_tabIndex
@@ -835,3 +840,36 @@ class PluginParameter(QWidget, ui_carla_parameter.Ui_PluginParameter):
self.emit(SIGNAL("midiChannelChanged(int, int)"), self.m_parameterId, channel) self.emit(SIGNAL("midiChannelChanged(int, int)"), self.m_parameterId, channel)


self.m_midiChannel = channel self.m_midiChannel = channel

# ------------------------------------------------------------------------------------------------------------
# TESTING

from PyQt4.QtGui import QApplication

Carla.isControl = True

ptest = {
'index': 0,
'name': "",
'symbol': "",
'current': 0.1,
'default': 0.3,
'minimum': 0.0,
'maximum': 1.0,
'midiChannel': 1,
'midiCC': -1,
'type': PARAMETER_INPUT,
'hints': PARAMETER_IS_ENABLED | PARAMETER_IS_AUTOMABLE,
'scalepoints': [],
'step': 0.01,
'stepSmall': 0.001,
'stepLarge': 0.1,
'unit': "un",
}

app = QApplication(sys.argv)
gui1 = CarlaAboutW(None)
gui2 = PluginParameter(None, ptest, 0, 0)
gui1.show()
gui2.show()
app.exec_()

Write Preview
Loading…
Cancel
Save