/[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 562 by schoenebeck, Thu May 19 19:25:14 2005 UTC revision 563 by schoenebeck, Sun May 22 20:43:32 2005 UTC
# Line 540  namespace LinuxSampler { namespace gig { Line 540  namespace LinuxSampler { namespace gig {
540                  ++iuiKey;                  ++iuiKey;
541                  if (pKey->pActiveVoices->isEmpty()) FreeKey(pEngineChannel, pKey);                  if (pKey->pActiveVoices->isEmpty()) FreeKey(pEngineChannel, pKey);
542                  #if CONFIG_DEVMODE                  #if CONFIG_DEVMODE
543                  else { // FIXME: should be removed before the final release (purpose: just a sanity check for debugging)                  else { // just a sanity check for debugging
544                      RTList<Voice>::Iterator itVoice     = pKey->pActiveVoices->first();                      RTList<Voice>::Iterator itVoice     = pKey->pActiveVoices->first();
545                      RTList<Voice>::Iterator itVoicesEnd = pKey->pActiveVoices->end();                      RTList<Voice>::Iterator itVoicesEnd = pKey->pActiveVoices->end();
546                      for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key                      for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key
# Line 793  namespace LinuxSampler { namespace gig { Line 793  namespace LinuxSampler { namespace gig {
793    
794                  // try to pick the oldest voice on the key where the new                  // try to pick the oldest voice on the key where the new
795                  // voice should be spawned, if there is no voice on that                  // voice should be spawned, if there is no voice on that
796                  // key, or no voice left to kill there, then procceed with                  // key, or no voice left to kill, then procceed with
797                  // 'oldestkey' algorithm                  // 'oldestkey' algorithm
798                  case voice_steal_algo_oldestvoiceonkey: {                  case voice_steal_algo_oldestvoiceonkey: {
                 #if 0 // FIXME: broken  
799                      midi_key_info_t* pSelectedKey = &pEngineChannel->pMIDIKeyInfo[itNoteOnEvent->Param.Note.Key];                      midi_key_info_t* pSelectedKey = &pEngineChannel->pMIDIKeyInfo[itNoteOnEvent->Param.Note.Key];
800                      if (this->itLastStolenVoice) {                      itSelectedVoice = pSelectedKey->pActiveVoices->first();
801                          itSelectedVoice = this->itLastStolenVoice;                      // proceed iterating if voice was created in this fragment cycle
802                          ++itSelectedVoice;                      while (itSelectedVoice && !itSelectedVoice->hasRendered()) ++itSelectedVoice;
803                      }                      // if we haven't found a voice then proceed with algorithm 'oldestkey'
804                      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  
805                  } // no break - intentional !                  } // no break - intentional !
806    
807                  // try to pick the oldest voice on the oldest active key                  // try to pick the oldest voice on the oldest active key
808                    // from the same engine channel
809                  // (caution: must stay after 'oldestvoiceonkey' algorithm !)                  // (caution: must stay after 'oldestvoiceonkey' algorithm !)
810                  case voice_steal_algo_oldestkey: {                  case voice_steal_algo_oldestkey: {
811                      if (this->itLastStolenVoice) {                      if (this->itLastStolenVoice) {
# Line 839  namespace LinuxSampler { namespace gig { Line 832  namespace LinuxSampler { namespace gig {
832                  }                  }
833              }              }
834    
835              // 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
836                // steal oldest voice on the oldest key from any other engine channel
837              if (!itSelectedVoice) {              if (!itSelectedVoice) {
838                  EngineChannel* pSelectedChannel = (pLastStolenChannel) ? pLastStolenChannel : pEngineChannel;                  EngineChannel* pSelectedChannel = (pLastStolenChannel) ? pLastStolenChannel : pEngineChannel;
839                  int iChannelIndex = pSelectedChannel->iEngineIndexSelf;                  int iChannelIndex = pSelectedChannel->iEngineIndexSelf;
# Line 857  namespace LinuxSampler { namespace gig { Line 851  namespace LinuxSampler { namespace gig {
851                  }                  }
852              }              }
853    
854              //FIXME: can be removed, just a sanity check for debugging              #if CONFIG_DEVMODE
855              if (!itSelectedVoice->IsActive()) {              if (!itSelectedVoice->IsActive()) {
856                  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"));
857                  return -1;                  return -1;
858              }              }
859                #endif // CONFIG_DEVMODE
860    
861              // now kill the selected voice              // now kill the selected voice
862              itSelectedVoice->Kill(itNoteOnEvent);              itSelectedVoice->Kill(itNoteOnEvent);
# Line 1054  namespace LinuxSampler { namespace gig { Line 1049  namespace LinuxSampler { namespace gig {
1049                              if (reader.read(&scale_tunes[0], 12) != 12) goto free_sysex_data;                              if (reader.read(&scale_tunes[0], 12) != 12) goto free_sysex_data;
1050                              uint8_t checksum;                              uint8_t checksum;
1051                              if (!reader.pop(&checksum)) goto free_sysex_data;                              if (!reader.pop(&checksum)) goto free_sysex_data;
1052                              // some are not sending a GS checksum, so we ignore it for now                              #if CONFIG_ASSERT_GS_SYSEX_CHECKSUM
1053                              //if (GSCheckSum(checksum_reader, 12)) goto free_sysex_data;                              if (GSCheckSum(checksum_reader, 12)) goto free_sysex_data;
1054                                #endif // CONFIG_ASSERT_GS_SYSEX_CHECKSUM
1055                              for (int i = 0; i < 12; i++) scale_tunes[i] -= 64;                              for (int i = 0; i < 12; i++) scale_tunes[i] -= 64;
1056                              AdjustScale((int8_t*) scale_tunes);                              AdjustScale((int8_t*) scale_tunes);
1057                              dmsg(3,("\t\t\tNew scale applied.\n"));                              dmsg(3,("\t\t\tNew scale applied.\n"));
# Line 1199  namespace LinuxSampler { namespace gig { Line 1195  namespace LinuxSampler { namespace gig {
1195      }      }
1196    
1197      String Engine::Version() {      String Engine::Version() {
1198          String s = "$Revision: 1.37 $";          String s = "$Revision: 1.38 $";
1199          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
1200      }      }
1201    

Legend:
Removed from v.562  
changed lines
  Added in v.563

  ViewVC Help
Powered by ViewVC