/[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 354 by schoenebeck, Sat Jan 29 15:17:59 2005 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    
86            if (pInstrument) Instruments.HandBack(pInstrument, this);
87    
88          if (pGig)  delete pGig;          if (pGig)  delete pGig;
89          if (pRIFF) delete pRIFF;          if (pRIFF) delete pRIFF;
90          for (uint i = 0; i < 128; i++) {          for (uint i = 0; i < 128; i++) {
# Line 89  namespace LinuxSampler { namespace gig { Line 94  namespace LinuxSampler { namespace gig {
94          for (uint i = 0; i < Event::destination_count; i++) {          for (uint i = 0; i < Event::destination_count; i++) {
95              if (pSynthesisEvents[i]) delete pSynthesisEvents[i];              if (pSynthesisEvents[i]) delete pSynthesisEvents[i];
96          }          }
         delete[] pSynthesisEvents;  
97          if (pEvents)     delete pEvents;          if (pEvents)     delete pEvents;
98          if (pCCEvents)   delete pCCEvents;          if (pCCEvents)   delete pCCEvents;
99          if (pEventQueue) delete pEventQueue;          if (pEventQueue) delete pEventQueue;
100          if (pEventPool)  delete pEventPool;          if (pEventPool)  delete pEventPool;
101          if (pVoicePool)  delete pVoicePool;          if (pVoicePool) {
102                    pVoicePool->clear();
103                    delete pVoicePool;
104            }
105          if (pActiveKeys) delete pActiveKeys;          if (pActiveKeys) delete pActiveKeys;
106          if (pSysexBuffer) delete pSysexBuffer;          if (pSysexBuffer) delete pSysexBuffer;
107          if (pEventGenerator) delete pEventGenerator;          if (pEventGenerator) delete pEventGenerator;
# Line 159  namespace LinuxSampler { namespace gig { Line 166  namespace LinuxSampler { namespace gig {
166          ActiveVoiceCount    = 0;          ActiveVoiceCount    = 0;
167          ActiveVoiceCountMax = 0;          ActiveVoiceCountMax = 0;
168          GlobalVolume        = 1.0;          GlobalVolume        = 1.0;
169            CurrentKeyDimension = 0;
170    
171          // reset voice stealing parameters          // reset voice stealing parameters
172          itLastStolenVoice = RTList<Voice>::Iterator();          itLastStolenVoice = RTList<Voice>::Iterator();
# Line 322  namespace LinuxSampler { namespace gig { Line 330  namespace LinuxSampler { namespace gig {
330    
331          // (re)create disk thread          // (re)create disk thread
332          if (this->pDiskThread) {          if (this->pDiskThread) {
333                dmsg(1,("Stopping disk thread..."));
334              this->pDiskThread->StopThread();              this->pDiskThread->StopThread();
335              delete this->pDiskThread;              delete this->pDiskThread;
336                dmsg(1,("OK\n"));
337          }          }
338          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
339          if (!pDiskThread) {          if (!pDiskThread) {
# Line 653  namespace LinuxSampler { namespace gig { Line 663  namespace LinuxSampler { namespace gig {
663       *  @param itNoteOnEvent - key, velocity and time stamp of the event       *  @param itNoteOnEvent - key, velocity and time stamp of the event
664       */       */
665      void Engine::ProcessNoteOn(Pool<Event>::Iterator& itNoteOnEvent) {      void Engine::ProcessNoteOn(Pool<Event>::Iterator& itNoteOnEvent) {
666          midi_key_info_t* pKey = &pMIDIKeyInfo[itNoteOnEvent->Param.Note.Key];  
667            const int key = itNoteOnEvent->Param.Note.Key;
668    
669            // Change key dimension value if key is in keyswitching area
670            if (key >= pInstrument->DimensionKeyRange.low && key <= pInstrument->DimensionKeyRange.high)
671                CurrentKeyDimension = ((key - pInstrument->DimensionKeyRange.low) * 128) /
672                    (pInstrument->DimensionKeyRange.high - pInstrument->DimensionKeyRange.low + 1);
673    
674            midi_key_info_t* pKey = &pMIDIKeyInfo[key];
675    
676          pKey->KeyPressed = true; // the MIDI key was now pressed down          pKey->KeyPressed = true; // the MIDI key was now pressed down
677    
# Line 727  namespace LinuxSampler { namespace gig { Line 745  namespace LinuxSampler { namespace gig {
745       *                               when there is no free voice       *                               when there is no free voice
746       *                               (optional, default = true)       *                               (optional, default = true)
747       *  @returns pointer to new voice or NULL if there was no free voice or       *  @returns pointer to new voice or NULL if there was no free voice or
748       *           if an error occured while trying to trigger the new voice       *           if the voice wasn't triggered (for example when no region is
749         *           defined for the given key).
750       */       */
751      Pool<Voice>::Iterator Engine::LaunchVoice(Pool<Event>::Iterator& itNoteOnEvent, int iLayer, bool ReleaseTriggerVoice, bool VoiceStealing) {      Pool<Voice>::Iterator Engine::LaunchVoice(Pool<Event>::Iterator& itNoteOnEvent, int iLayer, bool ReleaseTriggerVoice, bool VoiceStealing) {
752          midi_key_info_t* pKey = &pMIDIKeyInfo[itNoteOnEvent->Param.Note.Key];          midi_key_info_t* pKey = &pMIDIKeyInfo[itNoteOnEvent->Param.Note.Key];
# Line 737  namespace LinuxSampler { namespace gig { Line 756  namespace LinuxSampler { namespace gig {
756          if (itNewVoice) {          if (itNewVoice) {
757              // launch the new voice              // launch the new voice
758              if (itNewVoice->Trigger(itNoteOnEvent, this->Pitch, this->pInstrument, iLayer, ReleaseTriggerVoice, VoiceStealing) < 0) {              if (itNewVoice->Trigger(itNoteOnEvent, this->Pitch, this->pInstrument, iLayer, ReleaseTriggerVoice, VoiceStealing) < 0) {
759                  dmsg(1,("Triggering new voice failed!\n"));                  dmsg(4,("Voice not triggered\n"));
760                  pKey->pActiveVoices->free(itNewVoice);                  pKey->pActiveVoices->free(itNewVoice);
761              }              }
762              else { // on success              else { // on success
# Line 1165  namespace LinuxSampler { namespace gig { Line 1184  namespace LinuxSampler { namespace gig {
1184      }      }
1185    
1186      String Engine::Version() {      String Engine::Version() {
1187          String s = "$Revision: 1.19 $";          String s = "$Revision: 1.22 $";
1188          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
1189      }      }
1190    
Legend:
Removed from v.319  
changed lines
  Added in v.354
  ViewVC Help
Powered by ViewVC