/[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 2325 by iliev, Thu Aug 18 11:32:33 2011 UTC revision 2326 by persson, Thu Mar 8 19:40:14 2012 UTC
# Line 4  Line 4 
4   *                                                                         *   *                                                                         *
5   *   Copyright (C) 2003,2004 by Benno Senoner and Christian Schoenebeck    *   *   Copyright (C) 2003,2004 by Benno Senoner and Christian Schoenebeck    *
6   *   Copyright (C) 2005-2008 Christian Schoenebeck                         *   *   Copyright (C) 2005-2008 Christian Schoenebeck                         *
7   *   Copyright (C) 2009-2011 Christian Schoenebeck and Grigor Iliev        *   *   Copyright (C) 2009-2012 Christian Schoenebeck and Grigor Iliev        *
8   *                                                                         *   *                                                                         *
9   *   This program is free software; you can redistribute it and/or modify  *   *   This program is free software; you can redistribute it and/or modify  *
10   *   it under the terms of the GNU General Public License as published by  *   *   it under the terms of the GNU General Public License as published by  *
# Line 120  namespace LinuxSampler { Line 120  namespace LinuxSampler {
120                      if (pEngine->pAudioOutputDevice == pAudioOut) return;                      if (pEngine->pAudioOutputDevice == pAudioOut) return;
121                      DisconnectAudioOutputDevice();                      DisconnectAudioOutputDevice();
122                  }                  }
123                  pEngine = AbstractEngine::AcquireEngine(this, pAudioOut);                  AbstractEngine* newEngine = AbstractEngine::AcquireEngine(this, pAudioOut);
124                    EngineMutex.Lock();
125                    pEngine = newEngine;
126                    EngineMutex.Unlock();
127                  ResetInternal();                  ResetInternal();
128                  pEvents = new RTList<Event>(pEngine->pEventPool);                  pEvents = new RTList<Event>(pEngine->pEventPool);
129    
# Line 192  namespace LinuxSampler { Line 195  namespace LinuxSampler {
195                      DeleteGroupEventLists();                      DeleteGroupEventLists();
196    
197                      AudioOutputDevice* oldAudioDevice = pEngine->pAudioOutputDevice;                      AudioOutputDevice* oldAudioDevice = pEngine->pAudioOutputDevice;
198                        EngineMutex.Lock();
199                      pEngine = NULL;                      pEngine = NULL;
200                        EngineMutex.Unlock();
201                      AbstractEngine::FreeEngine(this, oldAudioDevice);                      AbstractEngine::FreeEngine(this, oldAudioDevice);
202                      AudioDeviceChannelLeft  = -1;                      AudioDeviceChannelLeft  = -1;
203                      AudioDeviceChannelRight = -1;                      AudioDeviceChannelRight = -1;
Legend:
Removed from v.2325  
changed lines
  Added in v.2326
  ViewVC Help
Powered by ViewVC