/[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 2352 by persson, Sun Jun 24 16:11:31 2012 UTC revision 2427 by persson, Sat Mar 2 07:03:04 2013 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-2012 Christian Schoenebeck and Grigor Iliev        *   *   Copyright (C) 2009-2013 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 121  namespace LinuxSampler { Line 121  namespace LinuxSampler {
121                      DisconnectAudioOutputDevice();                      DisconnectAudioOutputDevice();
122                  }                  }
123                  AbstractEngine* newEngine = AbstractEngine::AcquireEngine(this, pAudioOut);                  AbstractEngine* newEngine = AbstractEngine::AcquireEngine(this, pAudioOut);
124                  EngineMutex.Lock();                  {
125                  pEngine = newEngine;                      LockGuard lock(EngineMutex);
126                  EngineMutex.Unlock();                      pEngine = newEngine;
127                    }
128                  ResetInternal();                  ResetInternal();
129                  pEvents = new RTList<Event>(pEngine->pEventPool);                  pEvents = new RTList<Event>(pEngine->pEventPool);
130    
# Line 195  namespace LinuxSampler { Line 196  namespace LinuxSampler {
196                      DeleteGroupEventLists();                      DeleteGroupEventLists();
197    
198                      AudioOutputDevice* oldAudioDevice = pEngine->pAudioOutputDevice;                      AudioOutputDevice* oldAudioDevice = pEngine->pAudioOutputDevice;
199                      EngineMutex.Lock();                      {
200                      pEngine = NULL;                          LockGuard lock(EngineMutex);
201                      EngineMutex.Unlock();                          pEngine = NULL;
202                        }
203                      AbstractEngine::FreeEngine(this, oldAudioDevice);                      AbstractEngine::FreeEngine(this, oldAudioDevice);
204                      AudioDeviceChannelLeft  = -1;                      AudioDeviceChannelLeft  = -1;
205                      AudioDeviceChannelRight = -1;                      AudioDeviceChannelRight = -1;
Legend:
Removed from v.2352  
changed lines
  Added in v.2427
  ViewVC Help
Powered by ViewVC