/[svn]/linuxsampler/trunk/src/engines/EngineChannelBase.h
ViewVC logotype

Diff of /linuxsampler/trunk/src/engines/EngineChannelBase.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3034 by schoenebeck, Mon Oct 31 00:05:00 2016 UTC revision 3054 by schoenebeck, Thu Dec 15 12:47:45 2016 UTC
# Line 127  namespace LinuxSampler { Line 127  namespace LinuxSampler {
127                  }                  }
128              }              }
129    
130              virtual void Connect(AudioOutputDevice* pAudioOut) {              virtual void Connect(AudioOutputDevice* pAudioOut) OVERRIDE {
131                  if (pEngine) {                  if (pEngine) {
132                      if (pEngine->pAudioOutputDevice == pAudioOut) return;                      if (pEngine->pAudioOutputDevice == pAudioOut) return;
133                      DisconnectAudioOutputDevice();                      DisconnectAudioOutputDevice();
# Line 189  namespace LinuxSampler { Line 189  namespace LinuxSampler {
189                  MidiInputPort::AddSysexListener(pEngine);                  MidiInputPort::AddSysexListener(pEngine);
190              }              }
191    
192              virtual void DisconnectAudioOutputDevice() {              virtual void DisconnectAudioOutputDevice() OVERRIDE {
193                  if (pEngine) { // if clause to prevent disconnect loops                  if (pEngine) { // if clause to prevent disconnect loops
194    
195                      ResetInternal(false/*don't reset engine*/); // 'false' is error prone here, but the danger of recursion with 'true' would be worse, there could be a better solution though                      ResetInternal(false/*don't reset engine*/); // 'false' is error prone here, but the danger of recursion with 'true' would be worse, there could be a better solution though
# Line 471  namespace LinuxSampler { Line 471  namespace LinuxSampler {
471                  MidiKeyboardManager<V>::Reset();                  MidiKeyboardManager<V>::Reset();
472              }              }
473    
474              virtual void ResetControllers() {              virtual void ResetControllers() OVERRIDE {
475                  AbstractEngineChannel::ResetControllers();                  AbstractEngineChannel::ResetControllers();
476    
477                  MidiKeyboardManager<V>::SustainPedal   = false;                  MidiKeyboardManager<V>::SustainPedal   = false;

Legend:
Removed from v.3034  
changed lines
  Added in v.3054

  ViewVC Help
Powered by ViewVC