/[svn]/linuxsampler/trunk/src/engines/gig/Engine.cpp
ViewVC logotype

Diff of /linuxsampler/trunk/src/engines/gig/Engine.cpp

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

revision 319 by schoenebeck, Mon Dec 13 00:46:42 2004 UTC revision 329 by senkov, Tue Dec 28 09:43:04 2004 UTC
# Line 77  namespace LinuxSampler { namespace gig { Line 77  namespace LinuxSampler { namespace gig {
77    
78      Engine::~Engine() {      Engine::~Engine() {
79          if (pDiskThread) {          if (pDiskThread) {
80                dmsg(1,("Stopping disk thread..."));
81              pDiskThread->StopThread();              pDiskThread->StopThread();
82              delete pDiskThread;              delete pDiskThread;
83                dmsg(1,("OK\n"));
84          }          }
85          if (pGig)  delete pGig;          if (pGig)  delete pGig;
86          if (pRIFF) delete pRIFF;          if (pRIFF) delete pRIFF;
# Line 89  namespace LinuxSampler { namespace gig { Line 91  namespace LinuxSampler { namespace gig {
91          for (uint i = 0; i < Event::destination_count; i++) {          for (uint i = 0; i < Event::destination_count; i++) {
92              if (pSynthesisEvents[i]) delete pSynthesisEvents[i];              if (pSynthesisEvents[i]) delete pSynthesisEvents[i];
93          }          }
         delete[] pSynthesisEvents;  
94          if (pEvents)     delete pEvents;          if (pEvents)     delete pEvents;
95          if (pCCEvents)   delete pCCEvents;          if (pCCEvents)   delete pCCEvents;
96          if (pEventQueue) delete pEventQueue;          if (pEventQueue) delete pEventQueue;
97          if (pEventPool)  delete pEventPool;          if (pEventPool)  delete pEventPool;
98          if (pVoicePool)  delete pVoicePool;          if (pVoicePool) {
99                    pVoicePool->clear();
100                    delete pVoicePool;
101            }
102          if (pActiveKeys) delete pActiveKeys;          if (pActiveKeys) delete pActiveKeys;
103          if (pSysexBuffer) delete pSysexBuffer;          if (pSysexBuffer) delete pSysexBuffer;
104          if (pEventGenerator) delete pEventGenerator;          if (pEventGenerator) delete pEventGenerator;
# Line 322  namespace LinuxSampler { namespace gig { Line 326  namespace LinuxSampler { namespace gig {
326    
327          // (re)create disk thread          // (re)create disk thread
328          if (this->pDiskThread) {          if (this->pDiskThread) {
329                dmsg(1,("Stopping disk thread..."));
330              this->pDiskThread->StopThread();              this->pDiskThread->StopThread();
331              delete this->pDiskThread;              delete this->pDiskThread;
332                dmsg(1,("OK\n"));
333          }          }
334          this->pDiskThread = new DiskThread(((pAudioOut->MaxSamplesPerCycle() << MAX_PITCH) << 1) + 6); //FIXME: assuming stereo          this->pDiskThread = new DiskThread(((pAudioOut->MaxSamplesPerCycle() << MAX_PITCH) << 1) + 6); //FIXME: assuming stereo
335          if (!pDiskThread) {          if (!pDiskThread) {
# Line 1165  namespace LinuxSampler { namespace gig { Line 1171  namespace LinuxSampler { namespace gig {
1171      }      }
1172    
1173      String Engine::Version() {      String Engine::Version() {
1174          String s = "$Revision: 1.19 $";          String s = "$Revision: 1.20 $";
1175          return s.substr(11, s.size() - 13); // cut dollar signs, spaces and CVS macro keyword          return s.substr(11, s.size() - 13); // cut dollar signs, spaces and CVS macro keyword
1176      }      }
1177    

Legend:
Removed from v.319  
changed lines
  Added in v.329

  ViewVC Help
Powered by ViewVC