Browse Source

Fix LV2 crash after reset

tags/1.9.4
falkTX 11 years ago
parent
commit
3e92df309e
2 changed files with 4 additions and 5 deletions
  1. +3
    -3
      source/backend/plugin/Lv2Plugin.cpp
  2. +1
    -2
      source/carla_shared.py

+ 3
- 3
source/backend/plugin/Lv2Plugin.cpp View File

@@ -2310,9 +2310,9 @@ public:
{ {
if (fOptions & PLUGIN_OPTION_SEND_ALL_SOUND_OFF) if (fOptions & PLUGIN_OPTION_SEND_ALL_SOUND_OFF)
{ {
for (k=0, i=MAX_MIDI_CHANNELS; k < MAX_MIDI_CHANNELS; ++k)
for (i=0; i < MAX_MIDI_CHANNELS; ++i)
{ {
midiData[0] = MIDI_STATUS_CONTROL_CHANGE + k;
midiData[0] = MIDI_STATUS_CONTROL_CHANGE + i;
midiData[1] = MIDI_CONTROL_ALL_NOTES_OFF; midiData[1] = MIDI_CONTROL_ALL_NOTES_OFF;


if (fEventsIn.ctrl->type & CARLA_EVENT_DATA_ATOM) if (fEventsIn.ctrl->type & CARLA_EVENT_DATA_ATOM)
@@ -2324,7 +2324,7 @@ public:
else if (fEventsIn.ctrl->type & CARLA_EVENT_DATA_MIDI_LL) else if (fEventsIn.ctrl->type & CARLA_EVENT_DATA_MIDI_LL)
lv2midi_put_event(&evInMidiStates[k], 0, 3, midiData); lv2midi_put_event(&evInMidiStates[k], 0, 3, midiData);


midiData[0] = MIDI_STATUS_CONTROL_CHANGE + k;
midiData[0] = MIDI_STATUS_CONTROL_CHANGE + i;
midiData[1] = MIDI_CONTROL_ALL_SOUND_OFF; midiData[1] = MIDI_CONTROL_ALL_SOUND_OFF;


if (fEventsIn.ctrl->type & CARLA_EVENT_DATA_ATOM) if (fEventsIn.ctrl->type & CARLA_EVENT_DATA_ATOM)


+ 1
- 2
source/carla_shared.py View File

@@ -1483,8 +1483,7 @@ class PluginEdit(QDialog):


self.ui.cb_midi_programs.blockSignals(False) self.ui.cb_midi_programs.blockSignals(False)


# Automatically change to Midi Programs tab
if midiProgramCount > 0 and programCount == 0:
if self.fPluginInfo['type'] != PLUGIN_VST:
self.ui.tab_programs.setCurrentIndex(1) self.ui.tab_programs.setCurrentIndex(1)


def updateInfo(self): def updateInfo(self):


Loading…
Cancel
Save