--- linuxsampler/trunk/src/engines/gig/EngineChannel.cpp 2006/01/14 14:07:47 829 +++ linuxsampler/trunk/src/engines/gig/EngineChannel.cpp 2006/07/22 14:22:53 903 @@ -189,16 +189,16 @@ catch (RIFF::Exception e) { InstrumentStat = -2; String msg = "gig::Engine error: Failed to load instrument, cause: " + e.Message; - throw LinuxSamplerException(msg); + throw Exception(msg); } catch (InstrumentResourceManagerException e) { InstrumentStat = -3; String msg = "gig::Engine error: Failed to load instrument, cause: " + e.Message(); - throw LinuxSamplerException(msg); + throw Exception(msg); } catch (...) { InstrumentStat = -4; - throw LinuxSamplerException("gig::Engine error: Failed to load instrument, cause: Unknown exception while trying to parse gig file."); + throw Exception("gig::Engine error: Failed to load instrument, cause: Unknown exception while trying to parse gig file."); } // rebuild ActiveKeyGroups map with key groups of current instrument @@ -215,7 +215,7 @@ } catch (AudioOutputException e) { String msg = "Audio output device unable to provide 2 audio channels, cause: " + e.Message(); - throw LinuxSamplerException(msg); + throw Exception(msg); } if (pEngine) pEngine->Enable(); @@ -271,6 +271,7 @@ AudioDeviceChannelRight = 1; pOutputLeft = pAudioOut->Channel(0)->Buffer(); pOutputRight = pAudioOut->Channel(1)->Buffer(); + MidiInputPort::AddSysexListener(pEngine); } void EngineChannel::DisconnectAudioOutputDevice() { @@ -445,7 +446,7 @@ GlobalPanLeft = 1.0f; GlobalPanRight = 1.0f; // set all MIDI controller values to zero - memset(ControllerTable, 0x00, 128); + memset(ControllerTable, 0x00, 129); } /**