/[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 493 by schoenebeck, Sun Apr 3 19:53:43 2005 UTC revision 659 by schoenebeck, Thu Jun 16 21:35:30 2005 UTC
# Line 103  namespace LinuxSampler { namespace gig { Line 103  namespace LinuxSampler { namespace gig {
103          pAudioOutputDevice = NULL;          pAudioOutputDevice = NULL;
104          pDiskThread        = NULL;          pDiskThread        = NULL;
105          pEventGenerator    = NULL;          pEventGenerator    = NULL;
106          pSysexBuffer       = new RingBuffer<uint8_t>(SYSEX_BUFFER_SIZE, 0);          pSysexBuffer       = new RingBuffer<uint8_t>(CONFIG_SYSEX_BUFFER_SIZE, 0);
107          pEventQueue        = new RingBuffer<Event>(MAX_EVENTS_PER_FRAGMENT, 0);          pEventQueue        = new RingBuffer<Event>(CONFIG_MAX_EVENTS_PER_FRAGMENT, 0);
108          pEventPool         = new Pool<Event>(MAX_EVENTS_PER_FRAGMENT);          pEventPool         = new Pool<Event>(CONFIG_MAX_EVENTS_PER_FRAGMENT);
109          pVoicePool         = new Pool<Voice>(MAX_AUDIO_VOICES);          pVoicePool         = new Pool<Voice>(CONFIG_MAX_VOICES);
110          pVoiceStealingQueue = new RTList<Event>(pEventPool);          pVoiceStealingQueue = new RTList<Event>(pEventPool);
111          pGlobalEvents      = new RTList<Event>(pEventPool);          pGlobalEvents      = new RTList<Event>(pEventPool);
112          for (RTList<Voice>::Iterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) {          for (RTList<Voice>::Iterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) {
# Line 119  namespace LinuxSampler { namespace gig { Line 119  namespace LinuxSampler { namespace gig {
119          pMainFilterParameters   = NULL;          pMainFilterParameters   = NULL;
120    
121          ResetInternal();          ResetInternal();
122            ResetScaleTuning();
123      }      }
124    
125      /**      /**
# Line 171  namespace LinuxSampler { namespace gig { Line 172  namespace LinuxSampler { namespace gig {
172      void Engine::Reset() {      void Engine::Reset() {
173          DisableAndLock();          DisableAndLock();
174          ResetInternal();          ResetInternal();
175            ResetScaleTuning();
176          Enable();          Enable();
177      }      }
178    
# Line 184  namespace LinuxSampler { namespace gig { Line 186  namespace LinuxSampler { namespace gig {
186    
187          // reset voice stealing parameters          // reset voice stealing parameters
188          pVoiceStealingQueue->clear();          pVoiceStealingQueue->clear();
189          itLastStolenVoice  = RTList<Voice>::Iterator();          itLastStolenVoice          = RTList<Voice>::Iterator();
190          iuiLastStolenKey   = RTList<uint>::Iterator();          itLastStolenVoiceGlobally  = RTList<Voice>::Iterator();
191          pLastStolenChannel = NULL;          iuiLastStolenKey           = RTList<uint>::Iterator();
192            iuiLastStolenKeyGlobally   = RTList<uint>::Iterator();
193          // reset to normal chromatic scale (means equal temper)          pLastStolenChannel         = NULL;
         memset(&ScaleTuning[0], 0x00, 12);  
194    
195          // reset all voices          // reset all voices
196          for (RTList<Voice>::Iterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) {          for (RTList<Voice>::Iterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) {
# Line 205  namespace LinuxSampler { namespace gig { Line 206  namespace LinuxSampler { namespace gig {
206      }      }
207    
208      /**      /**
209         * Reset to normal, chromatic scale (means equal tempered).
210         */
211        void Engine::ResetScaleTuning() {
212            memset(&ScaleTuning[0], 0x00, 12);
213        }
214    
215        /**
216       * Connect this engine instance with the given audio output device.       * Connect this engine instance with the given audio output device.
217       * This method will be called when an Engine instance is created.       * This method will be called when an Engine instance is created.
218       * All of the engine's data structures which are dependant to the used       * All of the engine's data structures which are dependant to the used
# Line 231  namespace LinuxSampler { namespace gig { Line 239  namespace LinuxSampler { namespace gig {
239          this->SampleRate         = pAudioOutputDevice->SampleRate();          this->SampleRate         = pAudioOutputDevice->SampleRate();
240    
241          // FIXME: audio drivers with varying fragment sizes might be a problem here          // FIXME: audio drivers with varying fragment sizes might be a problem here
242          MaxFadeOutPos = MaxSamplesPerCycle - int(double(SampleRate) * EG_MIN_RELEASE_TIME) - 1;          MaxFadeOutPos = MaxSamplesPerCycle - int(double(SampleRate) * CONFIG_EG_MIN_RELEASE_TIME) - 1;
243          if (MaxFadeOutPos < 0)          if (MaxFadeOutPos < 0)
244              throw LinuxSamplerException("EG_MIN_RELEASE_TIME in EGADSR.h too big for current audio fragment size / sampling rate!");              throw LinuxSamplerException("CONFIG_EG_MIN_RELEASE_TIME too big for current audio fragment size / sampling rate!");
245    
246          // (re)create disk thread          // (re)create disk thread
247          if (this->pDiskThread) {          if (this->pDiskThread) {
# Line 242  namespace LinuxSampler { namespace gig { Line 250  namespace LinuxSampler { namespace gig {
250              delete this->pDiskThread;              delete this->pDiskThread;
251              dmsg(1,("OK\n"));              dmsg(1,("OK\n"));
252          }          }
253          this->pDiskThread = new DiskThread(((pAudioOut->MaxSamplesPerCycle() << MAX_PITCH) << 1) + 6); //FIXME: assuming stereo          this->pDiskThread = new DiskThread(((pAudioOut->MaxSamplesPerCycle() << CONFIG_MAX_PITCH) << 1) + 6); //FIXME: assuming stereo
254          if (!pDiskThread) {          if (!pDiskThread) {
255              dmsg(0,("gig::Engine  new diskthread = NULL\n"));              dmsg(0,("gig::Engine  new diskthread = NULL\n"));
256              exit(EXIT_FAILURE);              exit(EXIT_FAILURE);
# Line 370  namespace LinuxSampler { namespace gig { Line 378  namespace LinuxSampler { namespace gig {
378              }              }
379          }          }
380    
381          // We only allow a maximum of MAX_AUDIO_VOICES voices to be stolen          // We only allow a maximum of CONFIG_MAX_VOICES voices to be stolen
382          // in each audio fragment. All subsequent request for spawning new          // in each audio fragment. All subsequent request for spawning new
383          // voices in the same audio fragment will be ignored.          // voices in the same audio fragment will be ignored.
384          VoiceTheftsLeft = MAX_AUDIO_VOICES;          VoiceTheftsLeft = CONFIG_MAX_VOICES;
385    
386          // reset internal voice counter (just for statistic of active voices)          // reset internal voice counter (just for statistic of active voices)
387          ActiveVoiceCountTemp = 0;          ActiveVoiceCountTemp = 0;
# Line 406  namespace LinuxSampler { namespace gig { Line 414  namespace LinuxSampler { namespace gig {
414    
415          // reset voice stealing for the next audio fragment          // reset voice stealing for the next audio fragment
416          pVoiceStealingQueue->clear();          pVoiceStealingQueue->clear();
         itLastStolenVoice  = RTList<Voice>::Iterator();  
         iuiLastStolenKey   = RTList<uint>::Iterator();  
         pLastStolenChannel = NULL;  
417    
418          // just some statistics about this engine instance          // just some statistics about this engine instance
419          ActiveVoiceCount = ActiveVoiceCountTemp;          ActiveVoiceCount = ActiveVoiceCountTemp;
420          if (ActiveVoiceCount > ActiveVoiceCountMax) ActiveVoiceCountMax = ActiveVoiceCount;          if (ActiveVoiceCount > ActiveVoiceCountMax) ActiveVoiceCountMax = ActiveVoiceCount;
421    
422            FrameTime += Samples;
423    
424          return 0;          return 0;
425      }      }
426    
# Line 456  namespace LinuxSampler { namespace gig { Line 463  namespace LinuxSampler { namespace gig {
463                  }                  }
464              }              }
465          }          }
466    
467            // reset voice stealing for the next engine channel (or next audio fragment)
468            itLastStolenVoice         = RTList<Voice>::Iterator();
469            itLastStolenVoiceGlobally = RTList<Voice>::Iterator();
470            iuiLastStolenKey          = RTList<uint>::Iterator();
471            iuiLastStolenKeyGlobally  = RTList<uint>::Iterator();
472            pLastStolenChannel        = NULL;
473      }      }
474    
475      /**      /**
# Line 539  namespace LinuxSampler { namespace gig { Line 553  namespace LinuxSampler { namespace gig {
553                  midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey];                  midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey];
554                  ++iuiKey;                  ++iuiKey;
555                  if (pKey->pActiveVoices->isEmpty()) FreeKey(pEngineChannel, pKey);                  if (pKey->pActiveVoices->isEmpty()) FreeKey(pEngineChannel, pKey);
556                  #if DEVMODE                  #if CONFIG_DEVMODE
557                  else { // FIXME: should be removed before the final release (purpose: just a sanity check for debugging)                  else { // just a sanity check for debugging
558                      RTList<Voice>::Iterator itVoice     = pKey->pActiveVoices->first();                      RTList<Voice>::Iterator itVoice     = pKey->pActiveVoices->first();
559                      RTList<Voice>::Iterator itVoicesEnd = pKey->pActiveVoices->end();                      RTList<Voice>::Iterator itVoicesEnd = pKey->pActiveVoices->end();
560                      for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key                      for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key
# Line 549  namespace LinuxSampler { namespace gig { Line 563  namespace LinuxSampler { namespace gig {
563                          }                          }
564                      }                      }
565                  }                  }
566                  #endif // DEVMODE                  #endif // CONFIG_DEVMODE
567              }              }
568          }          }
569    
# Line 584  namespace LinuxSampler { namespace gig { Line 598  namespace LinuxSampler { namespace gig {
598                  // finally place sysex event into input event queue                  // finally place sysex event into input event queue
599                  pEventQueue->push(&event);                  pEventQueue->push(&event);
600              }              }
601              else dmsg(1,("Engine: Sysex message too large (%d byte) for input buffer (%d byte)!",Size,SYSEX_BUFFER_SIZE));              else dmsg(1,("Engine: Sysex message too large (%d byte) for input buffer (%d byte)!",Size,CONFIG_SYSEX_BUFFER_SIZE));
602          }          }
603          else dmsg(1,("Engine: Input event queue full!"));          else dmsg(1,("Engine: Input event queue full!"));
604      }      }
# Line 610  namespace LinuxSampler { namespace gig { Line 624  namespace LinuxSampler { namespace gig {
624          midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[key];          midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[key];
625    
626          pKey->KeyPressed = true; // the MIDI key was now pressed down          pKey->KeyPressed = true; // the MIDI key was now pressed down
627            pKey->Velocity   = itNoteOnEvent->Param.Note.Velocity;
628            pKey->NoteOnTime = FrameTime + itNoteOnEvent->FragmentPos(); // will be used to calculate note length
629    
630          // cancel release process of voices on this key if needed          // cancel release process of voices on this key if needed
631          if (pKey->Active && !pEngineChannel->SustainPedal) {          if (pKey->Active && !pEngineChannel->SustainPedal) {
# Line 660  namespace LinuxSampler { namespace gig { Line 676  namespace LinuxSampler { namespace gig {
676          // release voices on this key if needed          // release voices on this key if needed
677          if (pKey->Active && !pEngineChannel->SustainPedal) {          if (pKey->Active && !pEngineChannel->SustainPedal) {
678              itNoteOffEvent->Type = Event::type_release; // transform event type              itNoteOffEvent->Type = Event::type_release; // transform event type
         }  
679    
680          // move event to the key's own event list              // move event to the key's own event list
681          RTList<Event>::Iterator itNoteOffEventOnKeyList = itNoteOffEvent.moveToEndOf(pKey->pEvents);              RTList<Event>::Iterator itNoteOffEventOnKeyList = itNoteOffEvent.moveToEndOf(pKey->pEvents);
682    
683          // spawn release triggered voice(s) if needed              // spawn release triggered voice(s) if needed
684          if (pKey->ReleaseTrigger) {              if (pKey->ReleaseTrigger) {
685              // first, get total amount of required voices (dependant on amount of layers)                  // first, get total amount of required voices (dependant on amount of layers)
686              ::gig::Region* pRegion = pEngineChannel->pInstrument->GetRegion(itNoteOffEventOnKeyList->Param.Note.Key);                  ::gig::Region* pRegion = pEngineChannel->pInstrument->GetRegion(itNoteOffEventOnKeyList->Param.Note.Key);
687              if (pRegion) {                  if (pRegion) {
688                  int voicesRequired = pRegion->Layers;                      int voicesRequired = pRegion->Layers;
689                  // now launch the required amount of voices  
690                  for (int i = 0; i < voicesRequired; i++)                      // MIDI note-on velocity is used instead of note-off velocity
691                      LaunchVoice(pEngineChannel, itNoteOffEventOnKeyList, i, true, false); //FIXME: for the moment we don't perform voice stealing for release triggered samples                      itNoteOffEventOnKeyList->Param.Note.Velocity = pKey->Velocity;
692    
693                        // now launch the required amount of voices
694                        for (int i = 0; i < voicesRequired; i++)
695                            LaunchVoice(pEngineChannel, itNoteOffEventOnKeyList, i, true, false); //FIXME: for the moment we don't perform voice stealing for release triggered samples
696                    }
697                    pKey->ReleaseTrigger = false;
698              }              }
             pKey->ReleaseTrigger = false;  
         }  
699    
700          // if neither a voice was spawned or postponed then remove note off event from key again              // if neither a voice was spawned or postponed then remove note off event from key again
701          if (!pKey->Active && !pKey->VoiceTheftsQueued)              if (!pKey->Active && !pKey->VoiceTheftsQueued)
702              pKey->pEvents->free(itNoteOffEventOnKeyList);                  pKey->pEvents->free(itNoteOffEventOnKeyList);
703            }
704      }      }
705    
706      /**      /**
# Line 781  namespace LinuxSampler { namespace gig { Line 801  namespace LinuxSampler { namespace gig {
801       */       */
802      int Engine::StealVoice(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itNoteOnEvent) {      int Engine::StealVoice(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itNoteOnEvent) {
803          if (!VoiceTheftsLeft) {          if (!VoiceTheftsLeft) {
804              dmsg(1,("Max. voice thefts per audio fragment reached (you may raise MAX_AUDIO_VOICES).\n"));              dmsg(1,("Max. voice thefts per audio fragment reached (you may raise CONFIG_MAX_VOICES).\n"));
805              return -1;              return -1;
806          }          }
807          if (!pEventPool->poolIsEmpty()) {          if (!pEventPool->poolIsEmpty()) {
# Line 789  namespace LinuxSampler { namespace gig { Line 809  namespace LinuxSampler { namespace gig {
809              RTList<Voice>::Iterator itSelectedVoice;              RTList<Voice>::Iterator itSelectedVoice;
810    
811              // Select one voice for voice stealing              // Select one voice for voice stealing
812              switch (VOICE_STEAL_ALGORITHM) {              switch (CONFIG_VOICE_STEAL_ALGO) {
813    
814                  // try to pick the oldest voice on the key where the new                  // try to pick the oldest voice on the key where the new
815                  // voice should be spawned, if there is no voice on that                  // voice should be spawned, if there is no voice on that
816                  // key, or no voice left to kill there, then procceed with                  // key, or no voice left to kill, then procceed with
817                  // 'oldestkey' algorithm                  // 'oldestkey' algorithm
818                  case voice_steal_algo_oldestvoiceonkey: {                  case voice_steal_algo_oldestvoiceonkey: {
                 #if 0 // FIXME: broken  
819                      midi_key_info_t* pSelectedKey = &pEngineChannel->pMIDIKeyInfo[itNoteOnEvent->Param.Note.Key];                      midi_key_info_t* pSelectedKey = &pEngineChannel->pMIDIKeyInfo[itNoteOnEvent->Param.Note.Key];
820                      if (this->itLastStolenVoice) {                      itSelectedVoice = pSelectedKey->pActiveVoices->first();
821                          itSelectedVoice = this->itLastStolenVoice;                      // proceed iterating if voice was created in this fragment cycle
822                          ++itSelectedVoice;                      while (itSelectedVoice && !itSelectedVoice->hasRendered()) ++itSelectedVoice;
823                      }                      // if we haven't found a voice then proceed with algorithm 'oldestkey'
824                      else { // no voice stolen in this audio fragment cycle yet                      if (itSelectedVoice && itSelectedVoice->hasRendered()) break;
                         itSelectedVoice = pSelectedKey->pActiveVoices->first();  
                     }  
                     if (itSelectedVoice) {  
                         iuiSelectedKey = pSelectedKey->itSelf;  
                         break; // selection succeeded  
                     }  
                 #endif  
825                  } // no break - intentional !                  } // no break - intentional !
826    
827                  // try to pick the oldest voice on the oldest active key                  // try to pick the oldest voice on the oldest active key
828                    // from the same engine channel
829                  // (caution: must stay after 'oldestvoiceonkey' algorithm !)                  // (caution: must stay after 'oldestvoiceonkey' algorithm !)
830                  case voice_steal_algo_oldestkey: {                  case voice_steal_algo_oldestkey: {
831                        // if we already stole in this fragment, try to proceed on same key
832                      if (this->itLastStolenVoice) {                      if (this->itLastStolenVoice) {
833                          itSelectedVoice = this->itLastStolenVoice;                          itSelectedVoice = this->itLastStolenVoice;
834                          ++itSelectedVoice;                          do {
835                          if (itSelectedVoice) break; // selection succeeded                              ++itSelectedVoice;
836                          RTList<uint>::Iterator iuiSelectedKey = this->iuiLastStolenKey;                          } while (itSelectedVoice && !itSelectedVoice->hasRendered()); // proceed iterating if voice was created in this fragment cycle
837                          ++iuiSelectedKey;                          // found a "stealable" voice ?
838                          if (iuiSelectedKey) {                          if (itSelectedVoice && itSelectedVoice->hasRendered()) {
839                              this->iuiLastStolenKey = iuiSelectedKey;                              // remember which voice we stole, so we can simply proceed on next voice stealing
840                              midi_key_info_t* pSelectedKey = &pEngineChannel->pMIDIKeyInfo[*iuiSelectedKey];                              this->itLastStolenVoice = itSelectedVoice;
                             itSelectedVoice = pSelectedKey->pActiveVoices->first();  
841                              break; // selection succeeded                              break; // selection succeeded
842                          }                          }
843                      }                      }
844                        // get (next) oldest key
845                        RTList<uint>::Iterator iuiSelectedKey = (this->iuiLastStolenKey) ? ++this->iuiLastStolenKey : pEngineChannel->pActiveKeys->first();
846                        while (iuiSelectedKey) {
847                            midi_key_info_t* pSelectedKey = &pEngineChannel->pMIDIKeyInfo[*iuiSelectedKey];
848                            itSelectedVoice = pSelectedKey->pActiveVoices->first();
849                            // proceed iterating if voice was created in this fragment cycle
850                            while (itSelectedVoice && !itSelectedVoice->hasRendered()) ++itSelectedVoice;
851                            // found a "stealable" voice ?
852                            if (itSelectedVoice && itSelectedVoice->hasRendered()) {
853                                // remember which voice on which key we stole, so we can simply proceed on next voice stealing
854                                this->iuiLastStolenKey  = iuiSelectedKey;
855                                this->itLastStolenVoice = itSelectedVoice;
856                                break; // selection succeeded
857                            }
858                            ++iuiSelectedKey; // get next oldest key
859                        }
860                      break;                      break;
861                  }                  }
862    
# Line 839  namespace LinuxSampler { namespace gig { Line 868  namespace LinuxSampler { namespace gig {
868                  }                  }
869              }              }
870    
871              // steal oldest voice on the oldest key from this or any other engine channel              // if we couldn't steal a voice from the same engine channel then
872              if (!itSelectedVoice) {              // steal oldest voice on the oldest key from any other engine channel
873                  EngineChannel* pSelectedChannel = (pLastStolenChannel) ? pLastStolenChannel : pEngineChannel;              // (the smaller engine channel number, the higher priority)
874                  int iChannelIndex = pSelectedChannel->iEngineIndexSelf;              if (!itSelectedVoice || !itSelectedVoice->hasRendered()) {
875                    EngineChannel* pSelectedChannel;
876                    int            iChannelIndex;
877                    // select engine channel
878                    if (pLastStolenChannel) {
879                        pSelectedChannel = pLastStolenChannel;
880                        iChannelIndex    = pSelectedChannel->iEngineIndexSelf;
881                    } else { // pick the engine channel followed by this engine channel
882                        iChannelIndex    = (pEngineChannel->iEngineIndexSelf + 1) % engineChannels.size();
883                        pSelectedChannel = engineChannels[iChannelIndex];
884                    }
885                    // iterate through engine channels
886                  while (true) {                  while (true) {
887                      RTList<uint>::Iterator iuiSelectedKey = pSelectedChannel->pActiveKeys->first();                      // if we already stole in this fragment, try to proceed on same key
888                      if (iuiSelectedKey) {                      if (this->itLastStolenVoiceGlobally) {
889                          midi_key_info_t* pSelectedKey = &pSelectedChannel->pMIDIKeyInfo[*iuiSelectedKey];                          itSelectedVoice = this->itLastStolenVoiceGlobally;
890                          itSelectedVoice    = pSelectedKey->pActiveVoices->first();                          do {
891                          iuiLastStolenKey   = iuiSelectedKey;                              ++itSelectedVoice;
892                          pLastStolenChannel = pSelectedChannel;                          } while (itSelectedVoice && !itSelectedVoice->hasRendered()); // proceed iterating if voice was created in this fragment cycle
893                          break; // selection succeeded                          // break if selection succeeded
894                            if (itSelectedVoice && itSelectedVoice->hasRendered()) {
895                                // remember which voice we stole, so we can simply proceed on next voice stealing
896                                this->itLastStolenVoiceGlobally = itSelectedVoice;
897                                break; // selection succeeded
898                            }
899                      }                      }
900                        // get (next) oldest key
901                        RTList<uint>::Iterator iuiSelectedKey = (this->iuiLastStolenKey) ? ++this->iuiLastStolenKey : pSelectedChannel->pActiveKeys->first();
902                        while (iuiSelectedKey) {
903                            midi_key_info_t* pSelectedKey = &pEngineChannel->pMIDIKeyInfo[*iuiSelectedKey];
904                            itSelectedVoice = pSelectedKey->pActiveVoices->first();
905                            // proceed iterating if voice was created in this fragment cycle
906                            while (itSelectedVoice && !itSelectedVoice->hasRendered()) ++itSelectedVoice;
907                            // found a "stealable" voice ?
908                            if (itSelectedVoice && itSelectedVoice->hasRendered()) {
909                                // remember which voice on which key on which engine channel we stole, so we can simply proceed on next voice stealing
910                                this->iuiLastStolenKeyGlobally  = iuiSelectedKey;
911                                this->itLastStolenVoiceGlobally = itSelectedVoice;
912                                this->pLastStolenChannel        = pSelectedChannel;
913                                break; // selection succeeded
914                            }
915                            ++iuiSelectedKey; // get next key on current engine channel
916                        }
917                        // get next engine channel
918                      iChannelIndex    = (iChannelIndex + 1) % engineChannels.size();                      iChannelIndex    = (iChannelIndex + 1) % engineChannels.size();
919                      pSelectedChannel =  engineChannels[iChannelIndex];                      pSelectedChannel = engineChannels[iChannelIndex];
920                  }                  }
921              }              }
922    
923              //FIXME: can be removed, just a sanity check for debugging              #if CONFIG_DEVMODE
924              if (!itSelectedVoice->IsActive()) {              if (!itSelectedVoice->IsActive()) {
925                  dmsg(1,("gig::Engine: ERROR, tried to steal a voice which was not active !!!\n"));                  dmsg(1,("gig::Engine: ERROR, tried to steal a voice which was not active !!!\n"));
926                  return -1;                  return -1;
927              }              }
928                #endif // CONFIG_DEVMODE
929    
930              // now kill the selected voice              // now kill the selected voice
931              itSelectedVoice->Kill(itNoteOnEvent);              itSelectedVoice->Kill(itNoteOnEvent);
932    
             // remember which voice we stole, so we can simply proceed for the next voice stealing  
             itLastStolenVoice = itSelectedVoice;  
   
933              --VoiceTheftsLeft;              --VoiceTheftsLeft;
934    
935              return 0; // success              return 0; // success
# Line 1054  namespace LinuxSampler { namespace gig { Line 1115  namespace LinuxSampler { namespace gig {
1115                              if (reader.read(&scale_tunes[0], 12) != 12) goto free_sysex_data;                              if (reader.read(&scale_tunes[0], 12) != 12) goto free_sysex_data;
1116                              uint8_t checksum;                              uint8_t checksum;
1117                              if (!reader.pop(&checksum)) goto free_sysex_data;                              if (!reader.pop(&checksum)) goto free_sysex_data;
1118                              // some are not sending a GS checksum, so we ignore it for now                              #if CONFIG_ASSERT_GS_SYSEX_CHECKSUM
1119                              //if (GSCheckSum(checksum_reader, 12)) goto free_sysex_data;                              if (GSCheckSum(checksum_reader, 12)) goto free_sysex_data;
1120                                #endif // CONFIG_ASSERT_GS_SYSEX_CHECKSUM
1121                              for (int i = 0; i < 12; i++) scale_tunes[i] -= 64;                              for (int i = 0; i < 12; i++) scale_tunes[i] -= 64;
1122                              AdjustScale((int8_t*) scale_tunes);                              AdjustScale((int8_t*) scale_tunes);
1123                              dmsg(3,("\t\t\tNew scale applied.\n"));                              dmsg(3,("\t\t\tNew scale applied.\n"));
# Line 1199  namespace LinuxSampler { namespace gig { Line 1261  namespace LinuxSampler { namespace gig {
1261      }      }
1262    
1263      String Engine::Version() {      String Engine::Version() {
1264          String s = "$Revision: 1.35 $";          String s = "$Revision: 1.42 $";
1265          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
1266      }      }
1267    
Legend:
Removed from v.493  
changed lines
  Added in v.659
  ViewVC Help
Powered by ViewVC