/[svn]/linuxsampler/trunk/src/Sampler.cpp
ViewVC logotype

Diff of /linuxsampler/trunk/src/Sampler.cpp

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

revision 556 by schoenebeck, Sat May 21 01:10:12 2005 UTC revision 660 by schoenebeck, Fri Jun 17 19:49:30 2005 UTC
# Line 51  namespace LinuxSampler { Line 51  namespace LinuxSampler {
51              if (pMidiInputPort) pMidiInputPort->Disconnect(pEngineChannel);              if (pMidiInputPort) pMidiInputPort->Disconnect(pEngineChannel);
52              if (pEngineChannel) {              if (pEngineChannel) {
53                  if (pAudioOutputDevice) pEngineChannel->DisconnectAudioOutputDevice();                  if (pAudioOutputDevice) pEngineChannel->DisconnectAudioOutputDevice();
54                  delete pEngineChannel;                  EngineChannelFactory::Destroy(pEngineChannel);
55              }              }
56          }          }
57      }      }
# Line 63  namespace LinuxSampler { Line 63  namespace LinuxSampler {
63          EngineChannel* pNewEngineChannel = EngineChannelFactory::Create(EngineType);          EngineChannel* pNewEngineChannel = EngineChannelFactory::Create(EngineType);
64          if (!pNewEngineChannel) throw LinuxSamplerException("Unknown engine type");          if (!pNewEngineChannel) throw LinuxSamplerException("Unknown engine type");
65    
66            //FIXME: hack to allow fast retrieval of engine channel's sampler channel index
67            pNewEngineChannel->iSamplerChannelIndex = Index();
68    
69          // dereference midi input port.          // dereference midi input port.
70          MidiInputPort* pMidiInputPort = GetMidiInputDevicePort(this->midiPort);          MidiInputPort* pMidiInputPort = GetMidiInputDevicePort(this->midiPort);
71          // disconnect old engine          // disconnect old engine
72          if (pEngineChannel) {          if (pEngineChannel) {
73              if (pMidiInputPort) pMidiInputPort->Disconnect(pEngineChannel);              if (pMidiInputPort) pMidiInputPort->Disconnect(pEngineChannel);
74              if (pAudioOutputDevice) pEngineChannel->DisconnectAudioOutputDevice();              if (pAudioOutputDevice) pEngineChannel->DisconnectAudioOutputDevice();
75              delete pEngineChannel;              EngineChannelFactory::Destroy(pEngineChannel);
76          }          }
77    
78          // connect new engine channel          // connect new engine channel

Legend:
Removed from v.556  
changed lines
  Added in v.660

  ViewVC Help
Powered by ViewVC