mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-03-16 21:18:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

LocalZynAddSubFx: include/forward MIDI channel information

Browse Source 
When sending MIDI events to the ZynAddSubFX engine do not statically
send them on channel 0 but on the MIDI channel which is set as output
MIDI channel of the instrument track. This adds some flexibility when
it comes to multipart ZynAddSubFX presets which are connected to
different MIDI channels.
This commit is contained in:
Tobias Doerffel
2013-01-13 18:48:35 +01:00
parent 6940ceca44
commit 99efe8aef3
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/zynaddsubfx/LocalZynAddSubFx.cpp
View File

@@ -1,7 +1,7 @@
/*
* LocalZynAddSubFx.cpp - local implementation of ZynAddSubFx plugin
*
* Copyright (c) 2009-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2009-2013 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -206,10 +206,10 @@ void LocalZynAddSubFx::processMidiEvent( const midiEvent & _e )
}
if( m_runningNotes[_e.key()] > 0 )
{
m_master->NoteOff( 0, _e.key() );
m_master->NoteOff( _e.channel(), _e.key() );
}
++m_runningNotes[_e.key()];
m_master->NoteOn( 0, _e.key(), _e.velocity() );
m_master->NoteOn( _e.channel(), _e.key(), _e.velocity() );
break;
}
case MidiNoteOff:
@@ -219,16 +219,16 @@ void LocalZynAddSubFx::processMidiEvent( const midiEvent & _e )
}
if( --m_runningNotes[_e.key()] <= 0 )
{
m_master->NoteOff( 0, _e.key() );
m_master->NoteOff( _e.channel(), _e.key() );
}
break;
case MidiPitchBend:
m_master->SetController( 0, C_pitchwheel,
m_master->SetController( _e.channel(), C_pitchwheel,
_e.m_data.m_param[0] +
_e.m_data.m_param[1]*128-8192 );
break;
case MidiControlChange:
m_master->SetController( 0,
m_master->SetController( _e.channel(),
midiIn.getcontroller( _e.m_data.m_param[0] ),
_e.m_data.m_param[1] );
break;

4
plugins/zynaddsubfx/ZynAddSubFx.cpp
View File

@@ -1,7 +1,7 @@
/*
* ZynAddSubFx.cpp - ZynAddSubxFX-embedding plugin
*
* Copyright (c) 2008-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2008-2013 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -450,7 +450,7 @@ void ZynAddSubFxInstrument::initPlugin()
void ZynAddSubFxInstrument::sendControlChange( MidiControllers midiCtl, float value )
{
handleMidiEvent( midiEvent( MidiControlChange, 0, midiCtl, (int) value, this ),
handleMidiEvent( midiEvent( MidiControlChange, instrumentTrack()->midiPort()->realOutputChannel(), midiCtl, (int) value, this ),
midiTime() );
}