/[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 659 by schoenebeck, Thu Jun 16 21:35:30 2005 UTC revision 669 by schoenebeck, Tue Jun 21 13:33:19 2005 UTC
# Line 360  namespace LinuxSampler { namespace gig { Line 360  namespace LinuxSampler { namespace gig {
360          // update time of start and end of this audio fragment (as events' time stamps relate to this)          // update time of start and end of this audio fragment (as events' time stamps relate to this)
361          pEventGenerator->UpdateFragmentTime(Samples);          pEventGenerator->UpdateFragmentTime(Samples);
362    
363            // We only allow a maximum of CONFIG_MAX_VOICES voices to be spawned
364            // in each audio fragment. All subsequent request for spawning new
365            // voices in the same audio fragment will be ignored.
366            VoiceSpawnsLeft = CONFIG_MAX_VOICES;
367    
368          // get all events from the engine's global input event queue which belong to the current fragment          // get all events from the engine's global input event queue which belong to the current fragment
369          // (these are usually just SysEx messages)          // (these are usually just SysEx messages)
370          ImportEvents(Samples);          ImportEvents(Samples);
# Line 378  namespace LinuxSampler { namespace gig { Line 383  namespace LinuxSampler { namespace gig {
383              }              }
384          }          }
385    
         // We only allow a maximum of CONFIG_MAX_VOICES voices to be stolen  
         // in each audio fragment. All subsequent request for spawning new  
         // voices in the same audio fragment will be ignored.  
         VoiceTheftsLeft = CONFIG_MAX_VOICES;  
   
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;
388    
   
389          // handle events on all engine channels          // handle events on all engine channels
390          for (int i = 0; i < engineChannels.size(); i++) {          for (int i = 0; i < engineChannels.size(); i++) {
391              if (!engineChannels[i]->pInstrument) continue; // ignore if no instrument loaded              if (!engineChannels[i]->pInstrument) continue; // ignore if no instrument loaded
# Line 520  namespace LinuxSampler { namespace gig { Line 519  namespace LinuxSampler { namespace gig {
519          for (; itVoiceStealEvent != end; ++itVoiceStealEvent) {          for (; itVoiceStealEvent != end; ++itVoiceStealEvent) {
520              EngineChannel* pEngineChannel = (EngineChannel*) itVoiceStealEvent->pEngineChannel;              EngineChannel* pEngineChannel = (EngineChannel*) itVoiceStealEvent->pEngineChannel;
521              Pool<Voice>::Iterator itNewVoice =              Pool<Voice>::Iterator itNewVoice =
522                  LaunchVoice(pEngineChannel, itVoiceStealEvent, itVoiceStealEvent->Param.Note.Layer, itVoiceStealEvent->Param.Note.ReleaseTrigger, false);                  LaunchVoice(pEngineChannel, itVoiceStealEvent, itVoiceStealEvent->Param.Note.Layer, itVoiceStealEvent->Param.Note.ReleaseTrigger, false, false);
523              if (itNewVoice) {              if (itNewVoice) {
524                  itNewVoice->Render(Samples);                  itNewVoice->Render(Samples);
525                  if (itNewVoice->IsActive()) ActiveVoiceCountTemp++; // still active                  if (itNewVoice->IsActive()) ActiveVoiceCountTemp++; // still active
# Line 648  namespace LinuxSampler { namespace gig { Line 647  namespace LinuxSampler { namespace gig {
647                  int voicesRequired = pRegion->Layers;                  int voicesRequired = pRegion->Layers;
648                  // now launch the required amount of voices                  // now launch the required amount of voices
649                  for (int i = 0; i < voicesRequired; i++)                  for (int i = 0; i < voicesRequired; i++)
650                      LaunchVoice(pEngineChannel, itNoteOnEventOnKeyList, i, false, true);                      LaunchVoice(pEngineChannel, itNoteOnEventOnKeyList, i, false, true, true);
651              }              }
652          }          }
653    
# Line 692  namespace LinuxSampler { namespace gig { Line 691  namespace LinuxSampler { namespace gig {
691    
692                      // now launch the required amount of voices                      // now launch the required amount of voices
693                      for (int i = 0; i < voicesRequired; i++)                      for (int i = 0; i < voicesRequired; i++)
694                          LaunchVoice(pEngineChannel, itNoteOffEventOnKeyList, i, true, false); //FIXME: for the moment we don't perform voice stealing for release triggered samples                          LaunchVoice(pEngineChannel, itNoteOffEventOnKeyList, i, true, false, false); //FIXME: for the moment we don't perform voice stealing for release triggered samples
695                  }                  }
696                  pKey->ReleaseTrigger = false;                  pKey->ReleaseTrigger = false;
697              }              }
# Line 729  namespace LinuxSampler { namespace gig { Line 728  namespace LinuxSampler { namespace gig {
728       *  @param VoiceStealing       - if voice stealing should be performed       *  @param VoiceStealing       - if voice stealing should be performed
729       *                               when there is no free voice       *                               when there is no free voice
730       *                               (optional, default = true)       *                               (optional, default = true)
731         *  @param HandleKeyGroupConflicts - if voices should be killed due to a
732         *                                   key group conflict
733       *  @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
734       *           if the voice wasn't triggered (for example when no region is       *           if the voice wasn't triggered (for example when no region is
735       *           defined for the given key).       *           defined for the given key).
736       */       */
737      Pool<Voice>::Iterator Engine::LaunchVoice(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itNoteOnEvent, int iLayer, bool ReleaseTriggerVoice, bool VoiceStealing) {      Pool<Voice>::Iterator Engine::LaunchVoice(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itNoteOnEvent, int iLayer, bool ReleaseTriggerVoice, bool VoiceStealing, bool HandleKeyGroupConflicts) {
738          midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[itNoteOnEvent->Param.Note.Key];          int MIDIKey            = itNoteOnEvent->Param.Note.Key;
739            midi_key_info_t* pKey  = &pEngineChannel->pMIDIKeyInfo[MIDIKey];
740            ::gig::Region* pRegion = pEngineChannel->pInstrument->GetRegion(MIDIKey);
741    
742            // if nothing defined for this key
743            if (!pRegion) return Pool<Voice>::Iterator(); // nothing to do
744    
745            // only mark the first voice of a layered voice (group) to be in a
746            // key group, so the layered voices won't kill each other
747            int iKeyGroup = (iLayer == 0 && !ReleaseTriggerVoice) ? pRegion->KeyGroup : 0;
748    
749            // handle key group (a.k.a. exclusive group) conflicts
750            if (HandleKeyGroupConflicts) {
751                if (iKeyGroup) { // if this voice / key belongs to a key group
752                    uint** ppKeyGroup = &pEngineChannel->ActiveKeyGroups[iKeyGroup];
753                    if (*ppKeyGroup) { // if there's already an active key in that key group
754                        midi_key_info_t* pOtherKey = &pEngineChannel->pMIDIKeyInfo[**ppKeyGroup];
755                        // kill all voices on the (other) key
756                        RTList<Voice>::Iterator itVoiceToBeKilled = pOtherKey->pActiveVoices->first();
757                        RTList<Voice>::Iterator end               = pOtherKey->pActiveVoices->end();
758                        for (; itVoiceToBeKilled != end; ++itVoiceToBeKilled) {
759                            if (itVoiceToBeKilled->Type != Voice::type_release_trigger) {
760                                itVoiceToBeKilled->Kill(itNoteOnEvent);
761                                --VoiceSpawnsLeft; //FIXME: just a hack, we should better check in StealVoice() if the voice was killed due to key conflict
762                            }
763                        }
764                    }
765                }
766            }
767    
768            Voice::type_t VoiceType = Voice::type_normal;
769    
770            // get current dimension values to select the right dimension region
771            //TODO: for stolen voices this dimension region selection block is processed twice, this should be changed
772            //FIXME: controller values for selecting the dimension region here are currently not sample accurate
773            uint DimValues[8] = { 0 };
774            for (int i = pRegion->Dimensions - 1; i >= 0; i--) {
775                switch (pRegion->pDimensionDefinitions[i].dimension) {
776                    case ::gig::dimension_samplechannel:
777                        DimValues[i] = 0; //TODO: we currently ignore this dimension
778                        break;
779                    case ::gig::dimension_layer:
780                        DimValues[i] = iLayer;
781                        break;
782                    case ::gig::dimension_velocity:
783                        DimValues[i] = itNoteOnEvent->Param.Note.Velocity;
784                        break;
785                    case ::gig::dimension_channelaftertouch:
786                        DimValues[i] = 0; //TODO: we currently ignore this dimension
787                        break;
788                    case ::gig::dimension_releasetrigger:
789                        VoiceType = (ReleaseTriggerVoice) ? Voice::type_release_trigger : (!iLayer) ? Voice::type_release_trigger_required : Voice::type_normal;
790                        DimValues[i] = (uint) ReleaseTriggerVoice;
791                        break;
792                    case ::gig::dimension_keyboard:
793                        DimValues[i] = (uint) pEngineChannel->CurrentKeyDimension;
794                        break;
795                    case ::gig::dimension_roundrobin:
796                        DimValues[i] = (uint) pEngineChannel->pMIDIKeyInfo[MIDIKey].RoundRobinIndex; // incremented for each note on
797                        break;
798                    case ::gig::dimension_random:
799                        RandomSeed   = RandomSeed * 1103515245 + 12345; // classic pseudo random number generator
800                        DimValues[i] = (uint) RandomSeed >> (32 - pRegion->pDimensionDefinitions[i].bits); // highest bits are most random
801                        break;
802                    case ::gig::dimension_modwheel:
803                        DimValues[i] = pEngineChannel->ControllerTable[1];
804                        break;
805                    case ::gig::dimension_breath:
806                        DimValues[i] = pEngineChannel->ControllerTable[2];
807                        break;
808                    case ::gig::dimension_foot:
809                        DimValues[i] = pEngineChannel->ControllerTable[4];
810                        break;
811                    case ::gig::dimension_portamentotime:
812                        DimValues[i] = pEngineChannel->ControllerTable[5];
813                        break;
814                    case ::gig::dimension_effect1:
815                        DimValues[i] = pEngineChannel->ControllerTable[12];
816                        break;
817                    case ::gig::dimension_effect2:
818                        DimValues[i] = pEngineChannel->ControllerTable[13];
819                        break;
820                    case ::gig::dimension_genpurpose1:
821                        DimValues[i] = pEngineChannel->ControllerTable[16];
822                        break;
823                    case ::gig::dimension_genpurpose2:
824                        DimValues[i] = pEngineChannel->ControllerTable[17];
825                        break;
826                    case ::gig::dimension_genpurpose3:
827                        DimValues[i] = pEngineChannel->ControllerTable[18];
828                        break;
829                    case ::gig::dimension_genpurpose4:
830                        DimValues[i] = pEngineChannel->ControllerTable[19];
831                        break;
832                    case ::gig::dimension_sustainpedal:
833                        DimValues[i] = pEngineChannel->ControllerTable[64];
834                        break;
835                    case ::gig::dimension_portamento:
836                        DimValues[i] = pEngineChannel->ControllerTable[65];
837                        break;
838                    case ::gig::dimension_sostenutopedal:
839                        DimValues[i] = pEngineChannel->ControllerTable[66];
840                        break;
841                    case ::gig::dimension_softpedal:
842                        DimValues[i] = pEngineChannel->ControllerTable[67];
843                        break;
844                    case ::gig::dimension_genpurpose5:
845                        DimValues[i] = pEngineChannel->ControllerTable[80];
846                        break;
847                    case ::gig::dimension_genpurpose6:
848                        DimValues[i] = pEngineChannel->ControllerTable[81];
849                        break;
850                    case ::gig::dimension_genpurpose7:
851                        DimValues[i] = pEngineChannel->ControllerTable[82];
852                        break;
853                    case ::gig::dimension_genpurpose8:
854                        DimValues[i] = pEngineChannel->ControllerTable[83];
855                        break;
856                    case ::gig::dimension_effect1depth:
857                        DimValues[i] = pEngineChannel->ControllerTable[91];
858                        break;
859                    case ::gig::dimension_effect2depth:
860                        DimValues[i] = pEngineChannel->ControllerTable[92];
861                        break;
862                    case ::gig::dimension_effect3depth:
863                        DimValues[i] = pEngineChannel->ControllerTable[93];
864                        break;
865                    case ::gig::dimension_effect4depth:
866                        DimValues[i] = pEngineChannel->ControllerTable[94];
867                        break;
868                    case ::gig::dimension_effect5depth:
869                        DimValues[i] = pEngineChannel->ControllerTable[95];
870                        break;
871                    case ::gig::dimension_none:
872                        std::cerr << "gig::Engine::LaunchVoice() Error: dimension=none\n" << std::flush;
873                        break;
874                    default:
875                        std::cerr << "gig::Engine::LaunchVoice() Error: Unknown dimension\n" << std::flush;
876                }
877            }
878            ::gig::DimensionRegion* pDimRgn = pRegion->GetDimensionRegionByValue(DimValues);
879    
880            // no need to continue if sample is silent
881            if (!pDimRgn->pSample || !pDimRgn->pSample->SamplesTotal) return Pool<Voice>::Iterator();
882    
883          // allocate a new voice for the key          // allocate a new voice for the key
884          Pool<Voice>::Iterator itNewVoice = pKey->pActiveVoices->allocAppend();          Pool<Voice>::Iterator itNewVoice = pKey->pActiveVoices->allocAppend();
885          if (itNewVoice) {          if (itNewVoice) {
886              // launch the new voice              // launch the new voice
887              if (itNewVoice->Trigger(pEngineChannel, itNoteOnEvent, pEngineChannel->Pitch, pEngineChannel->pInstrument, iLayer, ReleaseTriggerVoice, VoiceStealing) < 0) {              if (itNewVoice->Trigger(pEngineChannel, itNoteOnEvent, pEngineChannel->Pitch, pDimRgn, VoiceType, iKeyGroup) < 0) {
888                  dmsg(4,("Voice not triggered\n"));                  dmsg(4,("Voice not triggered\n"));
889                  pKey->pActiveVoices->free(itNewVoice);                  pKey->pActiveVoices->free(itNewVoice);
890              }              }
891              else { // on success              else { // on success
892                  uint** ppKeyGroup = NULL;                  --VoiceSpawnsLeft;
                 if (itNewVoice->KeyGroup) { // if this voice / key belongs to a key group  
                     ppKeyGroup = &pEngineChannel->ActiveKeyGroups[itNewVoice->KeyGroup];  
                     if (*ppKeyGroup) { // if there's already an active key in that key group  
                         midi_key_info_t* pOtherKey = &pEngineChannel->pMIDIKeyInfo[**ppKeyGroup];  
                         // kill all voices on the (other) key  
                         RTList<Voice>::Iterator itVoiceToBeKilled = pOtherKey->pActiveVoices->first();  
                         RTList<Voice>::Iterator end               = pOtherKey->pActiveVoices->end();  
                         for (; itVoiceToBeKilled != end; ++itVoiceToBeKilled) {  
                             if (itVoiceToBeKilled->Type != Voice::type_release_trigger) itVoiceToBeKilled->Kill(itNoteOnEvent);  
                         }  
                     }  
                 }  
893                  if (!pKey->Active) { // mark as active key                  if (!pKey->Active) { // mark as active key
894                      pKey->Active = true;                      pKey->Active = true;
895                      pKey->itSelf = pEngineChannel->pActiveKeys->allocAppend();                      pKey->itSelf = pEngineChannel->pActiveKeys->allocAppend();
896                      *pKey->itSelf = itNoteOnEvent->Param.Note.Key;                      *pKey->itSelf = itNoteOnEvent->Param.Note.Key;
897                  }                  }
898                  if (itNewVoice->KeyGroup) {                  if (itNewVoice->KeyGroup) {
899                        uint** ppKeyGroup = &pEngineChannel->ActiveKeyGroups[itNewVoice->KeyGroup];
900                      *ppKeyGroup = &*pKey->itSelf; // put key as the (new) active key to its key group                      *ppKeyGroup = &*pKey->itSelf; // put key as the (new) active key to its key group
901                  }                  }
902                  if (itNewVoice->Type == Voice::type_release_trigger_required) pKey->ReleaseTrigger = true; // mark key for the need of release triggered voice(s)                  if (itNewVoice->Type == Voice::type_release_trigger_required) pKey->ReleaseTrigger = true; // mark key for the need of release triggered voice(s)
# Line 800  namespace LinuxSampler { namespace gig { Line 933  namespace LinuxSampler { namespace gig {
933       *  @returns 0 on success, a value < 0 if no active voice could be picked for voice stealing       *  @returns 0 on success, a value < 0 if no active voice could be picked for voice stealing
934       */       */
935      int Engine::StealVoice(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itNoteOnEvent) {      int Engine::StealVoice(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itNoteOnEvent) {
936          if (!VoiceTheftsLeft) {          if (VoiceSpawnsLeft <= 0) {
937              dmsg(1,("Max. voice thefts per audio fragment reached (you may raise CONFIG_MAX_VOICES).\n"));              dmsg(1,("Max. voice thefts per audio fragment reached (you may raise CONFIG_MAX_VOICES).\n"));
938              return -1;              return -1;
939          }          }
# Line 819  namespace LinuxSampler { namespace gig { Line 952  namespace LinuxSampler { namespace gig {
952                      midi_key_info_t* pSelectedKey = &pEngineChannel->pMIDIKeyInfo[itNoteOnEvent->Param.Note.Key];                      midi_key_info_t* pSelectedKey = &pEngineChannel->pMIDIKeyInfo[itNoteOnEvent->Param.Note.Key];
953                      itSelectedVoice = pSelectedKey->pActiveVoices->first();                      itSelectedVoice = pSelectedKey->pActiveVoices->first();
954                      // proceed iterating if voice was created in this fragment cycle                      // proceed iterating if voice was created in this fragment cycle
955                      while (itSelectedVoice && !itSelectedVoice->hasRendered()) ++itSelectedVoice;                      while (itSelectedVoice && !itSelectedVoice->IsStealable()) ++itSelectedVoice;
956                      // if we haven't found a voice then proceed with algorithm 'oldestkey'                      // if we haven't found a voice then proceed with algorithm 'oldestkey'
957                      if (itSelectedVoice && itSelectedVoice->hasRendered()) break;                      if (itSelectedVoice && itSelectedVoice->IsStealable()) break;
958                  } // no break - intentional !                  } // no break - intentional !
959    
960                  // try to pick the oldest voice on the oldest active key                  // try to pick the oldest voice on the oldest active key
# Line 833  namespace LinuxSampler { namespace gig { Line 966  namespace LinuxSampler { namespace gig {
966                          itSelectedVoice = this->itLastStolenVoice;                          itSelectedVoice = this->itLastStolenVoice;
967                          do {                          do {
968                              ++itSelectedVoice;                              ++itSelectedVoice;
969                          } while (itSelectedVoice && !itSelectedVoice->hasRendered()); // proceed iterating if voice was created in this fragment cycle                          } while (itSelectedVoice && !itSelectedVoice->IsStealable()); // proceed iterating if voice was created in this fragment cycle
970                          // found a "stealable" voice ?                          // found a "stealable" voice ?
971                          if (itSelectedVoice && itSelectedVoice->hasRendered()) {                          if (itSelectedVoice && itSelectedVoice->IsStealable()) {
972                              // remember which voice we stole, so we can simply proceed on next voice stealing                              // remember which voice we stole, so we can simply proceed on next voice stealing
973                              this->itLastStolenVoice = itSelectedVoice;                              this->itLastStolenVoice = itSelectedVoice;
974                              break; // selection succeeded                              break; // selection succeeded
# Line 847  namespace LinuxSampler { namespace gig { Line 980  namespace LinuxSampler { namespace gig {
980                          midi_key_info_t* pSelectedKey = &pEngineChannel->pMIDIKeyInfo[*iuiSelectedKey];                          midi_key_info_t* pSelectedKey = &pEngineChannel->pMIDIKeyInfo[*iuiSelectedKey];
981                          itSelectedVoice = pSelectedKey->pActiveVoices->first();                          itSelectedVoice = pSelectedKey->pActiveVoices->first();
982                          // proceed iterating if voice was created in this fragment cycle                          // proceed iterating if voice was created in this fragment cycle
983                          while (itSelectedVoice && !itSelectedVoice->hasRendered()) ++itSelectedVoice;                          while (itSelectedVoice && !itSelectedVoice->IsStealable()) ++itSelectedVoice;
984                          // found a "stealable" voice ?                          // found a "stealable" voice ?
985                          if (itSelectedVoice && itSelectedVoice->hasRendered()) {                          if (itSelectedVoice && itSelectedVoice->IsStealable()) {
986                              // remember which voice on which key we stole, so we can simply proceed on next voice stealing                              // remember which voice on which key we stole, so we can simply proceed on next voice stealing
987                              this->iuiLastStolenKey  = iuiSelectedKey;                              this->iuiLastStolenKey  = iuiSelectedKey;
988                              this->itLastStolenVoice = itSelectedVoice;                              this->itLastStolenVoice = itSelectedVoice;
# Line 871  namespace LinuxSampler { namespace gig { Line 1004  namespace LinuxSampler { namespace gig {
1004              // if we couldn't steal a voice from the same engine channel then              // if we couldn't steal a voice from the same engine channel then
1005              // steal oldest voice on the oldest key from any other engine channel              // steal oldest voice on the oldest key from any other engine channel
1006              // (the smaller engine channel number, the higher priority)              // (the smaller engine channel number, the higher priority)
1007              if (!itSelectedVoice || !itSelectedVoice->hasRendered()) {              if (!itSelectedVoice || !itSelectedVoice->IsStealable()) {
1008                  EngineChannel* pSelectedChannel;                  EngineChannel* pSelectedChannel;
1009                  int            iChannelIndex;                  int            iChannelIndex;
1010                  // select engine channel                  // select engine channel
# Line 882  namespace LinuxSampler { namespace gig { Line 1015  namespace LinuxSampler { namespace gig {
1015                      iChannelIndex    = (pEngineChannel->iEngineIndexSelf + 1) % engineChannels.size();                      iChannelIndex    = (pEngineChannel->iEngineIndexSelf + 1) % engineChannels.size();
1016                      pSelectedChannel = engineChannels[iChannelIndex];                      pSelectedChannel = engineChannels[iChannelIndex];
1017                  }                  }
1018                  // iterate through engine channels  
1019                  while (true) {                  // if we already stole in this fragment, try to proceed on same key
1020                      // if we already stole in this fragment, try to proceed on same key                  if (this->itLastStolenVoiceGlobally) {
1021                      if (this->itLastStolenVoiceGlobally) {                      itSelectedVoice = this->itLastStolenVoiceGlobally;
1022                          itSelectedVoice = this->itLastStolenVoiceGlobally;                      do {
1023                          do {                          ++itSelectedVoice;
1024                              ++itSelectedVoice;                      } while (itSelectedVoice && !itSelectedVoice->IsStealable()); // proceed iterating if voice was created in this fragment cycle
1025                          } while (itSelectedVoice && !itSelectedVoice->hasRendered()); // proceed iterating if voice was created in this fragment cycle                  }
1026                          // break if selection succeeded  
1027                          if (itSelectedVoice && itSelectedVoice->hasRendered()) {                  #if CONFIG_DEVMODE
1028                              // remember which voice we stole, so we can simply proceed on next voice stealing                  EngineChannel* pBegin = pSelectedChannel; // to detect endless loop
1029                              this->itLastStolenVoiceGlobally = itSelectedVoice;                  #endif // CONFIG_DEVMODE
1030                              break; // selection succeeded  
1031                          }                  // did we find a 'stealable' voice?
1032                      }                  if (itSelectedVoice && itSelectedVoice->IsStealable()) {
1033                        // remember which voice we stole, so we can simply proceed on next voice stealing
1034                        this->itLastStolenVoiceGlobally = itSelectedVoice;
1035                    } else while (true) { // iterate through engine channels
1036                      // get (next) oldest key                      // get (next) oldest key
1037                      RTList<uint>::Iterator iuiSelectedKey = (this->iuiLastStolenKey) ? ++this->iuiLastStolenKey : pSelectedChannel->pActiveKeys->first();                      RTList<uint>::Iterator iuiSelectedKey = (this->iuiLastStolenKeyGlobally) ? ++this->iuiLastStolenKeyGlobally : pSelectedChannel->pActiveKeys->first();
1038                        this->iuiLastStolenKeyGlobally = RTList<uint>::Iterator(); // to prevent endless loop (see line above)
1039                      while (iuiSelectedKey) {                      while (iuiSelectedKey) {
1040                          midi_key_info_t* pSelectedKey = &pEngineChannel->pMIDIKeyInfo[*iuiSelectedKey];                          midi_key_info_t* pSelectedKey = &pSelectedChannel->pMIDIKeyInfo[*iuiSelectedKey];
1041                          itSelectedVoice = pSelectedKey->pActiveVoices->first();                          itSelectedVoice = pSelectedKey->pActiveVoices->first();
1042                          // proceed iterating if voice was created in this fragment cycle                          // proceed iterating if voice was created in this fragment cycle
1043                          while (itSelectedVoice && !itSelectedVoice->hasRendered()) ++itSelectedVoice;                          while (itSelectedVoice && !itSelectedVoice->IsStealable()) ++itSelectedVoice;
1044                          // found a "stealable" voice ?                          // found a "stealable" voice ?
1045                          if (itSelectedVoice && itSelectedVoice->hasRendered()) {                          if (itSelectedVoice && itSelectedVoice->IsStealable()) {
1046                              // remember which voice on which key on which engine channel we stole, so we can simply proceed on next voice stealing                              // remember which voice on which key on which engine channel we stole, so we can simply proceed on next voice stealing
1047                              this->iuiLastStolenKeyGlobally  = iuiSelectedKey;                              this->iuiLastStolenKeyGlobally  = iuiSelectedKey;
1048                              this->itLastStolenVoiceGlobally = itSelectedVoice;                              this->itLastStolenVoiceGlobally = itSelectedVoice;
1049                              this->pLastStolenChannel        = pSelectedChannel;                              this->pLastStolenChannel        = pSelectedChannel;
1050                              break; // selection succeeded                              goto stealable_voice_found; // selection succeeded
1051                          }                          }
1052                          ++iuiSelectedKey; // get next key on current engine channel                          ++iuiSelectedKey; // get next key on current engine channel
1053                      }                      }
1054                      // get next engine channel                      // get next engine channel
1055                      iChannelIndex    = (iChannelIndex + 1) % engineChannels.size();                      iChannelIndex    = (iChannelIndex + 1) % engineChannels.size();
1056                      pSelectedChannel = engineChannels[iChannelIndex];                      pSelectedChannel = engineChannels[iChannelIndex];
1057    
1058                        #if CONFIG_DEVMODE
1059                        if (pSelectedChannel == pBegin) {
1060                            dmsg(1,("FATAL ERROR: voice stealing endless loop!\n"));
1061                            dmsg(1,("VoiceSpawnsLeft=%d.\n", VoiceSpawnsLeft));
1062                            dmsg(1,("Exiting.\n"));
1063                            exit(-1);
1064                        }
1065                        #endif // CONFIG_DEVMODE
1066                  }                  }
1067              }              }
1068    
1069                // jump point if a 'stealable' voice was found
1070                stealable_voice_found:
1071    
1072              #if CONFIG_DEVMODE              #if CONFIG_DEVMODE
1073              if (!itSelectedVoice->IsActive()) {              if (!itSelectedVoice->IsActive()) {
1074                  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"));
# Line 930  namespace LinuxSampler { namespace gig { Line 1079  namespace LinuxSampler { namespace gig {
1079              // now kill the selected voice              // now kill the selected voice
1080              itSelectedVoice->Kill(itNoteOnEvent);              itSelectedVoice->Kill(itNoteOnEvent);
1081    
1082              --VoiceTheftsLeft;              --VoiceSpawnsLeft;
1083    
1084              return 0; // success              return 0; // success
1085          }          }
# Line 1006  namespace LinuxSampler { namespace gig { Line 1155  namespace LinuxSampler { namespace gig {
1155              case 7: { // volume              case 7: { // volume
1156                  //TODO: not sample accurate yet                  //TODO: not sample accurate yet
1157                  pEngineChannel->GlobalVolume = (float) itControlChangeEventOnCCList->Param.CC.Value / 127.0f;                  pEngineChannel->GlobalVolume = (float) itControlChangeEventOnCCList->Param.CC.Value / 127.0f;
1158                    pEngineChannel->bStatusChanged = true; // engine channel status has changed, so set notify flag
1159                  break;                  break;
1160              }              }
1161              case 10: { // panpot              case 10: { // panpot
# Line 1205  namespace LinuxSampler { namespace gig { Line 1355  namespace LinuxSampler { namespace gig {
1355              RTList<Voice>::Iterator itVoicesEnd = pKey->pActiveVoices->end();              RTList<Voice>::Iterator itVoicesEnd = pKey->pActiveVoices->end();
1356              for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key              for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key
1357                  itVoice->Kill(itKillEvent);                  itVoice->Kill(itKillEvent);
1358                    --VoiceSpawnsLeft; //FIXME: just a temporary workaround, we should check the cause in StealVoice() instead
1359              }              }
1360          }          }
1361      }      }
# Line 1261  namespace LinuxSampler { namespace gig { Line 1412  namespace LinuxSampler { namespace gig {
1412      }      }
1413    
1414      String Engine::Version() {      String Engine::Version() {
1415          String s = "$Revision: 1.42 $";          String s = "$Revision: 1.47 $";
1416          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
1417      }      }
1418    

Legend:
Removed from v.659  
changed lines
  Added in v.669

  ViewVC Help
Powered by ViewVC