/[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 473 by schoenebeck, Thu Mar 17 20:13:08 2005 UTC revision 649 by schoenebeck, Wed Jun 15 00:01:28 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 184  namespace LinuxSampler { namespace gig { Line 184  namespace LinuxSampler { namespace gig {
184    
185          // reset voice stealing parameters          // reset voice stealing parameters
186          pVoiceStealingQueue->clear();          pVoiceStealingQueue->clear();
187          itLastStolenVoice  = RTList<Voice>::Iterator();          itLastStolenVoice          = RTList<Voice>::Iterator();
188          iuiLastStolenKey   = RTList<uint>::Iterator();          itLastStolenVoiceGlobally  = RTList<Voice>::Iterator();
189          pLastStolenChannel = NULL;          iuiLastStolenKey           = RTList<uint>::Iterator();
190            iuiLastStolenKeyGlobally   = RTList<uint>::Iterator();
191            pLastStolenChannel         = NULL;
192    
193          // reset to normal chromatic scale (means equal temper)          // reset to normal chromatic scale (means equal temper)
194          memset(&ScaleTuning[0], 0x00, 12);          memset(&ScaleTuning[0], 0x00, 12);
# Line 231  namespace LinuxSampler { namespace gig { Line 233  namespace LinuxSampler { namespace gig {
233          this->SampleRate         = pAudioOutputDevice->SampleRate();          this->SampleRate         = pAudioOutputDevice->SampleRate();
234    
235          // FIXME: audio drivers with varying fragment sizes might be a problem here          // FIXME: audio drivers with varying fragment sizes might be a problem here
236          MaxFadeOutPos = MaxSamplesPerCycle - int(double(SampleRate) * EG_MIN_RELEASE_TIME) - 1;          MaxFadeOutPos = MaxSamplesPerCycle - int(double(SampleRate) * CONFIG_EG_MIN_RELEASE_TIME) - 1;
237          if (MaxFadeOutPos < 0)          if (MaxFadeOutPos < 0)
238              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!");
239    
240          // (re)create disk thread          // (re)create disk thread
241          if (this->pDiskThread) {          if (this->pDiskThread) {
# Line 242  namespace LinuxSampler { namespace gig { Line 244  namespace LinuxSampler { namespace gig {
244              delete this->pDiskThread;              delete this->pDiskThread;
245              dmsg(1,("OK\n"));              dmsg(1,("OK\n"));
246          }          }
247          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
248          if (!pDiskThread) {          if (!pDiskThread) {
249              dmsg(0,("gig::Engine  new diskthread = NULL\n"));              dmsg(0,("gig::Engine  new diskthread = NULL\n"));
250              exit(EXIT_FAILURE);              exit(EXIT_FAILURE);
# Line 370  namespace LinuxSampler { namespace gig { Line 372  namespace LinuxSampler { namespace gig {
372              }              }
373          }          }
374    
375          // 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
376          // in each audio fragment. All subsequent request for spawning new          // in each audio fragment. All subsequent request for spawning new
377          // voices in the same audio fragment will be ignored.          // voices in the same audio fragment will be ignored.
378          VoiceTheftsLeft = MAX_AUDIO_VOICES;          VoiceTheftsLeft = CONFIG_MAX_VOICES;
379    
380          // reset internal voice counter (just for statistic of active voices)          // reset internal voice counter (just for statistic of active voices)
381          ActiveVoiceCountTemp = 0;          ActiveVoiceCountTemp = 0;
# Line 406  namespace LinuxSampler { namespace gig { Line 408  namespace LinuxSampler { namespace gig {
408    
409          // reset voice stealing for the next audio fragment          // reset voice stealing for the next audio fragment
410          pVoiceStealingQueue->clear();          pVoiceStealingQueue->clear();
         itLastStolenVoice  = RTList<Voice>::Iterator();  
         iuiLastStolenKey   = RTList<uint>::Iterator();  
         pLastStolenChannel = NULL;  
411    
412          // just some statistics about this engine instance          // just some statistics about this engine instance
413          ActiveVoiceCount = ActiveVoiceCountTemp;          ActiveVoiceCount = ActiveVoiceCountTemp;
414          if (ActiveVoiceCount > ActiveVoiceCountMax) ActiveVoiceCountMax = ActiveVoiceCount;          if (ActiveVoiceCount > ActiveVoiceCountMax) ActiveVoiceCountMax = ActiveVoiceCount;
415    
416            FrameTime += Samples;
417    
418          return 0;          return 0;
419      }      }
420    
# Line 456  namespace LinuxSampler { namespace gig { Line 457  namespace LinuxSampler { namespace gig {
457                  }                  }
458              }              }
459          }          }
460    
461            // reset voice stealing for the next engine channel (or next audio fragment)
462            itLastStolenVoice         = RTList<Voice>::Iterator();
463            itLastStolenVoiceGlobally = RTList<Voice>::Iterator();
464            iuiLastStolenKey          = RTList<uint>::Iterator();
465            iuiLastStolenKeyGlobally  = RTList<uint>::Iterator();
466            pLastStolenChannel        = NULL;
467      }      }
468    
469      /**      /**
# Line 539  namespace LinuxSampler { namespace gig { Line 547  namespace LinuxSampler { namespace gig {
547                  midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey];                  midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey];
548                  ++iuiKey;                  ++iuiKey;
549                  if (pKey->pActiveVoices->isEmpty()) FreeKey(pEngineChannel, pKey);                  if (pKey->pActiveVoices->isEmpty()) FreeKey(pEngineChannel, pKey);
550                  #if DEVMODE                  #if CONFIG_DEVMODE
551                  else { // FIXME: should be removed before the final release (purpose: just a sanity check for debugging)                  else { // just a sanity check for debugging
552                      RTList<Voice>::Iterator itVoice     = pKey->pActiveVoices->first();                      RTList<Voice>::Iterator itVoice     = pKey->pActiveVoices->first();
553                      RTList<Voice>::Iterator itVoicesEnd = pKey->pActiveVoices->end();                      RTList<Voice>::Iterator itVoicesEnd = pKey->pActiveVoices->end();
554                      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 557  namespace LinuxSampler { namespace gig {
557                          }                          }
558                      }                      }
559                  }                  }
560                  #endif // DEVMODE                  #endif // CONFIG_DEVMODE
561              }              }
562          }          }
563    
# Line 584  namespace LinuxSampler { namespace gig { Line 592  namespace LinuxSampler { namespace gig {
592                  // finally place sysex event into input event queue                  // finally place sysex event into input event queue
593                  pEventQueue->push(&event);                  pEventQueue->push(&event);
594              }              }
595              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));
596          }          }
597          else dmsg(1,("Engine: Input event queue full!"));          else dmsg(1,("Engine: Input event queue full!"));
598      }      }
# Line 610  namespace LinuxSampler { namespace gig { Line 618  namespace LinuxSampler { namespace gig {
618          midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[key];          midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[key];
619    
620          pKey->KeyPressed = true; // the MIDI key was now pressed down          pKey->KeyPressed = true; // the MIDI key was now pressed down
621            pKey->Velocity   = itNoteOnEvent->Param.Note.Velocity;
622            pKey->NoteOnTime = FrameTime + itNoteOnEvent->FragmentPos(); // will be used to calculate note length
623    
624          // cancel release process of voices on this key if needed          // cancel release process of voices on this key if needed
625          if (pKey->Active && !pEngineChannel->SustainPedal) {          if (pKey->Active && !pEngineChannel->SustainPedal) {
# Line 660  namespace LinuxSampler { namespace gig { Line 670  namespace LinuxSampler { namespace gig {
670          // release voices on this key if needed          // release voices on this key if needed
671          if (pKey->Active && !pEngineChannel->SustainPedal) {          if (pKey->Active && !pEngineChannel->SustainPedal) {
672              itNoteOffEvent->Type = Event::type_release; // transform event type              itNoteOffEvent->Type = Event::type_release; // transform event type
         }  
673    
674          // move event to the key's own event list              // move event to the key's own event list
675          RTList<Event>::Iterator itNoteOffEventOnKeyList = itNoteOffEvent.moveToEndOf(pKey->pEvents);              RTList<Event>::Iterator itNoteOffEventOnKeyList = itNoteOffEvent.moveToEndOf(pKey->pEvents);
676    
677          // spawn release triggered voice(s) if needed              // spawn release triggered voice(s) if needed
678          if (pKey->ReleaseTrigger) {              if (pKey->ReleaseTrigger) {
679              // first, get total amount of required voices (dependant on amount of layers)                  // first, get total amount of required voices (dependant on amount of layers)
680              ::gig::Region* pRegion = pEngineChannel->pInstrument->GetRegion(itNoteOffEventOnKeyList->Param.Note.Key);                  ::gig::Region* pRegion = pEngineChannel->pInstrument->GetRegion(itNoteOffEventOnKeyList->Param.Note.Key);
681              if (pRegion) {                  if (pRegion) {
682                  int voicesRequired = pRegion->Layers;                      int voicesRequired = pRegion->Layers;
683                  // now launch the required amount of voices  
684                  for (int i = 0; i < voicesRequired; i++)                      // MIDI note-on velocity is used instead of note-off velocity
685                      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;
686    
687                        // now launch the required amount of voices
688                        for (int i = 0; i < voicesRequired; i++)
689                            LaunchVoice(pEngineChannel, itNoteOffEventOnKeyList, i, true, false); //FIXME: for the moment we don't perform voice stealing for release triggered samples
690                    }
691                    pKey->ReleaseTrigger = false;
692              }              }
             pKey->ReleaseTrigger = false;  
         }  
693    
694          // 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
695          if (!pKey->Active && !pKey->VoiceTheftsQueued)              if (!pKey->Active && !pKey->VoiceTheftsQueued)
696              pKey->pEvents->free(itNoteOffEventOnKeyList);                  pKey->pEvents->free(itNoteOffEventOnKeyList);
697            }
698      }      }
699    
700      /**      /**
# Line 781  namespace LinuxSampler { namespace gig { Line 795  namespace LinuxSampler { namespace gig {
795       */       */
796      int Engine::StealVoice(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itNoteOnEvent) {      int Engine::StealVoice(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itNoteOnEvent) {
797          if (!VoiceTheftsLeft) {          if (!VoiceTheftsLeft) {
798              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"));
799              return -1;              return -1;
800          }          }
801          if (!pEventPool->poolIsEmpty()) {          if (!pEventPool->poolIsEmpty()) {
# Line 789  namespace LinuxSampler { namespace gig { Line 803  namespace LinuxSampler { namespace gig {
803              RTList<Voice>::Iterator itSelectedVoice;              RTList<Voice>::Iterator itSelectedVoice;
804    
805              // Select one voice for voice stealing              // Select one voice for voice stealing
806              switch (VOICE_STEAL_ALGORITHM) {              switch (CONFIG_VOICE_STEAL_ALGO) {
807    
808                  // try to pick the oldest voice on the key where the new                  // try to pick the oldest voice on the key where the new
809                  // voice should be spawned, if there is no voice on that                  // voice should be spawned, if there is no voice on that
810                  // key, or no voice left to kill there, then procceed with                  // key, or no voice left to kill, then procceed with
811                  // 'oldestkey' algorithm                  // 'oldestkey' algorithm
812                  case voice_steal_algo_oldestvoiceonkey: {                  case voice_steal_algo_oldestvoiceonkey: {
                 #if 0 // FIXME: broken  
813                      midi_key_info_t* pSelectedKey = &pEngineChannel->pMIDIKeyInfo[itNoteOnEvent->Param.Note.Key];                      midi_key_info_t* pSelectedKey = &pEngineChannel->pMIDIKeyInfo[itNoteOnEvent->Param.Note.Key];
814                      if (this->itLastStolenVoice) {                      itSelectedVoice = pSelectedKey->pActiveVoices->first();
815                          itSelectedVoice = this->itLastStolenVoice;                      // proceed iterating if voice was created in this fragment cycle
816                          ++itSelectedVoice;                      while (itSelectedVoice && !itSelectedVoice->hasRendered()) ++itSelectedVoice;
817                      }                      // if we haven't found a voice then proceed with algorithm 'oldestkey'
818                      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  
819                  } // no break - intentional !                  } // no break - intentional !
820    
821                  // try to pick the oldest voice on the oldest active key                  // try to pick the oldest voice on the oldest active key
822                    // from the same engine channel
823                  // (caution: must stay after 'oldestvoiceonkey' algorithm !)                  // (caution: must stay after 'oldestvoiceonkey' algorithm !)
824                  case voice_steal_algo_oldestkey: {                  case voice_steal_algo_oldestkey: {
825                        // if we already stole in this fragment, try to proceed on same key
826                      if (this->itLastStolenVoice) {                      if (this->itLastStolenVoice) {
827                          itSelectedVoice = this->itLastStolenVoice;                          itSelectedVoice = this->itLastStolenVoice;
828                          ++itSelectedVoice;                          do {
829                          if (itSelectedVoice) break; // selection succeeded                              ++itSelectedVoice;
830                          RTList<uint>::Iterator iuiSelectedKey = this->iuiLastStolenKey;                          } while (itSelectedVoice && !itSelectedVoice->hasRendered()); // proceed iterating if voice was created in this fragment cycle
831                          ++iuiSelectedKey;                          // found a "stealable" voice ?
832                          if (iuiSelectedKey) {                          if (itSelectedVoice && itSelectedVoice->hasRendered()) {
833                              this->iuiLastStolenKey = iuiSelectedKey;                              // remember which voice we stole, so we can simply proceed on next voice stealing
834                              midi_key_info_t* pSelectedKey = &pEngineChannel->pMIDIKeyInfo[*iuiSelectedKey];                              this->itLastStolenVoice = itSelectedVoice;
                             itSelectedVoice = pSelectedKey->pActiveVoices->first();  
835                              break; // selection succeeded                              break; // selection succeeded
836                          }                          }
837                      }                      }
838                        // get (next) oldest key
839                        RTList<uint>::Iterator iuiSelectedKey = (this->iuiLastStolenKey) ? ++this->iuiLastStolenKey : pEngineChannel->pActiveKeys->first();
840                        while (iuiSelectedKey) {
841                            midi_key_info_t* pSelectedKey = &pEngineChannel->pMIDIKeyInfo[*iuiSelectedKey];
842                            itSelectedVoice = pSelectedKey->pActiveVoices->first();                        
843                            // proceed iterating if voice was created in this fragment cycle
844                            while (itSelectedVoice && !itSelectedVoice->hasRendered()) ++itSelectedVoice;
845                            // found a "stealable" voice ?
846                            if (itSelectedVoice && itSelectedVoice->hasRendered()) {
847                                // remember which voice on which key we stole, so we can simply proceed on next voice stealing
848                                this->iuiLastStolenKey  = iuiSelectedKey;
849                                this->itLastStolenVoice = itSelectedVoice;
850                                break; // selection succeeded
851                            }
852                            ++iuiSelectedKey; // get next oldest key
853                        }
854                      break;                      break;
855                  }                  }
856    
# Line 839  namespace LinuxSampler { namespace gig { Line 862  namespace LinuxSampler { namespace gig {
862                  }                  }
863              }              }
864    
865              // 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
866              if (!itSelectedVoice) {              // steal oldest voice on the oldest key from any other engine channel
867                  EngineChannel* pSelectedChannel = (pLastStolenChannel) ? pLastStolenChannel : pEngineChannel;              // (the smaller engine channel number, the higher priority)
868                  int iChannelIndex = pSelectedChannel->iEngineIndexSelf;              if (!itSelectedVoice || !itSelectedVoice->hasRendered()) {
869                    EngineChannel* pSelectedChannel;
870                    int            iChannelIndex;
871                    // select engine channel
872                    if (pLastStolenChannel) {
873                        pSelectedChannel = pLastStolenChannel;
874                        iChannelIndex    = pSelectedChannel->iEngineIndexSelf;
875                    } else { // pick the engine channel followed by this engine channel
876                        iChannelIndex    = (pEngineChannel->iEngineIndexSelf + 1) % engineChannels.size();
877                        pSelectedChannel = engineChannels[iChannelIndex];
878                    }
879                    // iterate through engine channels
880                  while (true) {                  while (true) {
881                      RTList<uint>::Iterator iuiSelectedKey = pSelectedChannel->pActiveKeys->first();                      // if we already stole in this fragment, try to proceed on same key
882                      if (iuiSelectedKey) {                      if (this->itLastStolenVoiceGlobally) {
883                          midi_key_info_t* pSelectedKey = &pSelectedChannel->pMIDIKeyInfo[*iuiSelectedKey];                          itSelectedVoice = this->itLastStolenVoiceGlobally;
884                          itSelectedVoice    = pSelectedKey->pActiveVoices->first();                          do {
885                          iuiLastStolenKey   = iuiSelectedKey;                              ++itSelectedVoice;
886                          pLastStolenChannel = pSelectedChannel;                          } while (itSelectedVoice && !itSelectedVoice->hasRendered()); // proceed iterating if voice was created in this fragment cycle
887                          break; // selection succeeded                          // break if selection succeeded
888                            if (itSelectedVoice && itSelectedVoice->hasRendered()) {
889                                // remember which voice we stole, so we can simply proceed on next voice stealing
890                                this->itLastStolenVoiceGlobally = itSelectedVoice;
891                                break; // selection succeeded
892                            }
893                      }                      }
894                        // get (next) oldest key
895                        RTList<uint>::Iterator iuiSelectedKey = (this->iuiLastStolenKey) ? ++this->iuiLastStolenKey : pSelectedChannel->pActiveKeys->first();
896                        while (iuiSelectedKey) {
897                            midi_key_info_t* pSelectedKey = &pEngineChannel->pMIDIKeyInfo[*iuiSelectedKey];
898                            itSelectedVoice = pSelectedKey->pActiveVoices->first();
899                            // proceed iterating if voice was created in this fragment cycle
900                            while (itSelectedVoice && !itSelectedVoice->hasRendered()) ++itSelectedVoice;
901                            // found a "stealable" voice ?
902                            if (itSelectedVoice && itSelectedVoice->hasRendered()) {
903                                // remember which voice on which key on which engine channel we stole, so we can simply proceed on next voice stealing
904                                this->iuiLastStolenKeyGlobally  = iuiSelectedKey;
905                                this->itLastStolenVoiceGlobally = itSelectedVoice;
906                                this->pLastStolenChannel        = pSelectedChannel;
907                                break; // selection succeeded
908                            }
909                            ++iuiSelectedKey; // get next key on current engine channel
910                        }
911                        // get next engine channel
912                      iChannelIndex    = (iChannelIndex + 1) % engineChannels.size();                      iChannelIndex    = (iChannelIndex + 1) % engineChannels.size();
913                      pSelectedChannel =  engineChannels[iChannelIndex];                      pSelectedChannel = engineChannels[iChannelIndex];
914                  }                  }
915              }              }
916    
917              //FIXME: can be removed, just a sanity check for debugging              #if CONFIG_DEVMODE
918              if (!itSelectedVoice->IsActive()) {              if (!itSelectedVoice->IsActive()) {
919                  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"));
920                  return -1;                  return -1;
921              }              }
922                #endif // CONFIG_DEVMODE
923    
924              // now kill the selected voice              // now kill the selected voice
925              itSelectedVoice->Kill(itNoteOnEvent);              itSelectedVoice->Kill(itNoteOnEvent);            
   
             // remember which voice we stole, so we can simply proceed for the next voice stealing  
             itLastStolenVoice = itSelectedVoice;  
926    
927              --VoiceTheftsLeft;              --VoiceTheftsLeft;
928    
# Line 1027  namespace LinuxSampler { namespace gig { Line 1082  namespace LinuxSampler { namespace gig {
1082    
1083          switch (id) {          switch (id) {
1084              case 0x41: { // Roland              case 0x41: { // Roland
1085                    dmsg(3,("Roland Sysex\n"));
1086                  uint8_t device_id, model_id, cmd_id;                  uint8_t device_id, model_id, cmd_id;
1087                  if (!reader.pop(&device_id)) goto free_sysex_data;                  if (!reader.pop(&device_id)) goto free_sysex_data;
1088                  if (!reader.pop(&model_id))  goto free_sysex_data;                  if (!reader.pop(&model_id))  goto free_sysex_data;
# Line 1039  namespace LinuxSampler { namespace gig { Line 1095  namespace LinuxSampler { namespace gig {
1095                  const RingBuffer<uint8_t>::NonVolatileReader checksum_reader = reader; // so we can calculate the check sum later                  const RingBuffer<uint8_t>::NonVolatileReader checksum_reader = reader; // so we can calculate the check sum later
1096                  if (reader.read(&addr[0], 3) != 3) goto free_sysex_data;                  if (reader.read(&addr[0], 3) != 3) goto free_sysex_data;
1097                  if (addr[0] == 0x40 && addr[1] == 0x00) { // System Parameters                  if (addr[0] == 0x40 && addr[1] == 0x00) { // System Parameters
1098                        dmsg(3,("\tSystem Parameter\n"));
1099                  }                  }
1100                  else if (addr[0] == 0x40 && addr[1] == 0x01) { // Common Parameters                  else if (addr[0] == 0x40 && addr[1] == 0x01) { // Common Parameters
1101                        dmsg(3,("\tCommon Parameter\n"));
1102                  }                  }
1103                  else if (addr[0] == 0x40 && (addr[1] & 0xf0) == 0x10) { // Part Parameters (1)                  else if (addr[0] == 0x40 && (addr[1] & 0xf0) == 0x10) { // Part Parameters (1)
1104                      switch (addr[3]) {                      dmsg(3,("\tPart Parameter\n"));
1105                        switch (addr[2]) {
1106                          case 0x40: { // scale tuning                          case 0x40: { // scale tuning
1107                                dmsg(3,("\t\tScale Tuning\n"));
1108                              uint8_t scale_tunes[12]; // detuning of all 12 semitones of an octave                              uint8_t scale_tunes[12]; // detuning of all 12 semitones of an octave
1109                              if (reader.read(&scale_tunes[0], 12) != 12) goto free_sysex_data;                              if (reader.read(&scale_tunes[0], 12) != 12) goto free_sysex_data;
1110                              uint8_t checksum;                              uint8_t checksum;
1111                              if (!reader.pop(&checksum))                      goto free_sysex_data;                              if (!reader.pop(&checksum)) goto free_sysex_data;
1112                              if (GSCheckSum(checksum_reader, 12) != checksum) goto free_sysex_data;                              #if CONFIG_ASSERT_GS_SYSEX_CHECKSUM
1113                                if (GSCheckSum(checksum_reader, 12)) goto free_sysex_data;
1114                                #endif // CONFIG_ASSERT_GS_SYSEX_CHECKSUM
1115                              for (int i = 0; i < 12; i++) scale_tunes[i] -= 64;                              for (int i = 0; i < 12; i++) scale_tunes[i] -= 64;
1116                              AdjustScale((int8_t*) scale_tunes);                              AdjustScale((int8_t*) scale_tunes);
1117                                dmsg(3,("\t\t\tNew scale applied.\n"));
1118                              break;                              break;
1119                          }                          }
1120                      }                      }
# Line 1184  namespace LinuxSampler { namespace gig { Line 1247  namespace LinuxSampler { namespace gig {
1247      }      }
1248    
1249      String Engine::EngineName() {      String Engine::EngineName() {
1250          return "GigEngine";          return LS_GIG_ENGINE_NAME;
1251      }      }
1252    
1253      String Engine::Description() {      String Engine::Description() {
# Line 1192  namespace LinuxSampler { namespace gig { Line 1255  namespace LinuxSampler { namespace gig {
1255      }      }
1256    
1257      String Engine::Version() {      String Engine::Version() {
1258          String s = "$Revision: 1.33 $";          String s = "$Revision: 1.41 $";
1259          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
1260      }      }
1261    
Legend:
Removed from v.473  
changed lines
  Added in v.649
  ViewVC Help
Powered by ViewVC