Browse Source

Carla: Sync DSSI to LADSPA code, small fixing

tags/v0.9.0
falkTX 13 years ago
parent
commit
565f8c0359
3 changed files with 290 additions and 264 deletions
  1. +11
    -2
      c++/carla-backend/carla_plugin.h
  2. +276
    -259
      c++/carla-backend/dssi.cpp
  3. +3
    -3
      c++/carla-backend/ladspa.cpp

+ 11
- 2
c++/carla-backend/carla_plugin.h View File

@@ -1785,7 +1785,8 @@ public:

case PluginPostEventProgramChange:
// Update UI
uiProgramChange(event->value1);
if (event->value1 >= 0)
uiProgramChange(event->value1);

// Update OSC control client
x_engine->osc_send_set_program(m_id, event->value1);
@@ -1799,7 +1800,8 @@ public:

case PluginPostEventMidiProgramChange:
// Update UI
uiMidiProgramChange(event->value1);
if (event->value1 >= 0)
uiMidiProgramChange(event->value1);

// Update OSC control client
x_engine->osc_send_set_midi_program(m_id, event->value1);
@@ -1869,6 +1871,10 @@ public:
*/
virtual void uiNoteOn(const uint8_t channel, const uint8_t note, const uint8_t velo)
{
Q_ASSERT(channel < 16);
Q_ASSERT(note < 128);
Q_ASSERT(velo < 128);

Q_UNUSED(channel);
Q_UNUSED(note);
Q_UNUSED(velo);
@@ -1879,6 +1885,9 @@ public:
*/
virtual void uiNoteOff(const uint8_t channel, const uint8_t note)
{
Q_ASSERT(channel < 16);
Q_ASSERT(note < 128);

Q_UNUSED(channel);
Q_UNUSED(note);
}


+ 276
- 259
c++/carla-backend/dssi.cpp
File diff suppressed because it is too large
View File


+ 3
- 3
c++/carla-backend/ladspa.cpp View File

@@ -1048,9 +1048,9 @@ public:
// ---------------------------------------------------------------
// get DLL main entry

LADSPA_Descriptor_Function descfn = (LADSPA_Descriptor_Function)libSymbol("ladspa_descriptor");
LADSPA_Descriptor_Function descFn = (LADSPA_Descriptor_Function)libSymbol("ladspa_descriptor");

if (! descfn)
if (! descFn)
{
setLastError("Could not find the LASDPA Descriptor in the plugin library");
return false;
@@ -1060,7 +1060,7 @@ public:
// get descriptor that matches label

unsigned long i = 0;
while ((descriptor = descfn(i++)))
while ((descriptor = descFn(i++)))
{
if (strcmp(descriptor->Label, label) == 0)
break;


Loading…
Cancel
Save