Merge pull request #1061 from LMMS/stable-1.1

sync
This commit is contained in:
Vesa V
2014-08-07 11:39:35 +03:00
2 changed files with 2 additions and 2 deletions

View File

@@ -158,7 +158,7 @@ void LadspaSubPluginFeatures::listSubPluginKeys(
ladspa_key_t LadspaSubPluginFeatures::subPluginKeyToLadspaKey(
const Key * _key )
{
QString file = _key->attributes["file"].toLower();
QString file = _key->attributes["file"];
return( ladspa_key_t( file.remove( QRegExp( "\\.so$" ) ).
remove( QRegExp( "\\.dll$" ) ) +
#ifdef LMMS_BUILD_WIN32

View File

@@ -63,7 +63,7 @@ public:
}
virtual void processInEvent( const MidiEvent& event, const MidiTime& time )
virtual void processInEvent( const MidiEvent& event, const MidiTime& time, f_cnt_t offset = 0 )
{
if( event.type() == MidiControlChange &&
( m_midiPort.inputChannel() == 0 || m_midiPort.inputChannel() == event.channel() + 1 ) )