/[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 287 by schoenebeck, Sat Oct 16 17:38:03 2004 UTC revision 329 by senkov, Tue Dec 28 09:43:04 2004 UTC
# Line 26  Line 26 
26  #include "EGADSR.h"  #include "EGADSR.h"
27    
28  #include "Engine.h"  #include "Engine.h"
29    #include <malloc.h>
30    
31  namespace LinuxSampler { namespace gig {  namespace LinuxSampler { namespace gig {
32    
# Line 76  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 88  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;
105          if (pMainFilterParameters) delete[] pMainFilterParameters;          if (pMainFilterParameters) delete[] pMainFilterParameters;
106          if (pBasicFilterParameters) delete[] pBasicFilterParameters;          if (pBasicFilterParameters) delete[] pBasicFilterParameters;
107          if (pSynthesisParameters[0]) delete[] pSynthesisParameters[0];          if (pSynthesisParameters[0]) free(pSynthesisParameters[0]);
108          if (pVoiceStealingQueue) delete pVoiceStealingQueue;          if (pVoiceStealingQueue) delete pVoiceStealingQueue;
109      }      }
110    
# Line 321  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 341  namespace LinuxSampler { namespace gig { Line 348  namespace LinuxSampler { namespace gig {
348          pEventGenerator = new EventGenerator(pAudioOut->SampleRate());          pEventGenerator = new EventGenerator(pAudioOut->SampleRate());
349    
350          // (re)allocate synthesis parameter matrix          // (re)allocate synthesis parameter matrix
351          if (pSynthesisParameters[0]) delete[] pSynthesisParameters[0];          if (pSynthesisParameters[0]) free(pSynthesisParameters[0]);
352          pSynthesisParameters[0] = new float[Event::destination_count * pAudioOut->MaxSamplesPerCycle()];          pSynthesisParameters[0] = (float *) memalign(16,(Event::destination_count * sizeof(float) * pAudioOut->MaxSamplesPerCycle()));
353          for (int dst = 1; dst < Event::destination_count; dst++)          for (int dst = 1; dst < Event::destination_count; dst++)
354              pSynthesisParameters[dst] = pSynthesisParameters[dst - 1] + pAudioOut->MaxSamplesPerCycle();              pSynthesisParameters[dst] = pSynthesisParameters[dst - 1] + pAudioOut->MaxSamplesPerCycle();
355    
# Line 398  namespace LinuxSampler { namespace gig { Line 405  namespace LinuxSampler { namespace gig {
405          }          }
406    
407    
408            // update time of start and end of this audio fragment (as events' time stamps relate to this)
409            pEventGenerator->UpdateFragmentTime(Samples);
410    
411    
412          // empty the event lists for the new fragment          // empty the event lists for the new fragment
413          pEvents->clear();          pEvents->clear();
414          pCCEvents->clear();          pCCEvents->clear();
# Line 412  namespace LinuxSampler { namespace gig { Line 423  namespace LinuxSampler { namespace gig {
423              }              }
424          }          }
425    
         // read and copy events from input queue  
         Event event = pEventGenerator->CreateEvent();  
         while (true) {  
             if (!pEventQueue->pop(&event) || pEvents->poolIsEmpty()) break;  
             *pEvents->allocAppend() = event;  
         }  
   
426    
427          // update time of start and end of this audio fragment (as events' time stamps relate to this)          // get all events from the input event queue which belong to the current fragment
428          pEventGenerator->UpdateFragmentTime(Samples);          {
429                RingBuffer<Event>::NonVolatileReader eventQueueReader = pEventQueue->get_non_volatile_reader();
430                Event* pEvent;
431                while (true) {
432                    // get next event from input event queue
433                    if (!(pEvent = eventQueueReader.pop())) break;
434                    // if younger event reached, ignore that and all subsequent ones for now
435                    if (pEvent->FragmentPos() >= Samples) {
436                        eventQueueReader--;
437                        dmsg(2,("Younger Event, pos=%d ,Samples=%d!\n",pEvent->FragmentPos(),Samples));
438                        pEvent->ResetFragmentPos();
439                        break;
440                    }
441                    // copy event to internal event list
442                    if (pEvents->poolIsEmpty()) {
443                        dmsg(1,("Event pool emtpy!\n"));
444                        break;
445                    }
446                    *pEvents->allocAppend() = *pEvent;
447                }
448                eventQueueReader.free(); // free all copied events from input queue
449            }
450    
451    
452          // process events          // process events
# Line 1146  namespace LinuxSampler { namespace gig { Line 1171  namespace LinuxSampler { namespace gig {
1171      }      }
1172    
1173      String Engine::Version() {      String Engine::Version() {
1174          String s = "$Revision: 1.17 $";          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.287  
changed lines
  Added in v.329
  ViewVC Help
Powered by ViewVC