/[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 738 by schoenebeck, Tue Aug 16 17:14:25 2005 UTC revision 769 by schoenebeck, Sat Sep 3 11:14:30 2005 UTC
# Line 703  namespace LinuxSampler { namespace gig { Line 703  namespace LinuxSampler { namespace gig {
703       */       */
704      void Engine::ProcessPitchbend(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itPitchbendEvent) {      void Engine::ProcessPitchbend(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itPitchbendEvent) {
705          pEngineChannel->Pitch = itPitchbendEvent->Param.Pitch.Pitch; // store current pitch value          pEngineChannel->Pitch = itPitchbendEvent->Param.Pitch.Pitch; // store current pitch value
         itPitchbendEvent.moveToEndOf(pEngineChannel->pEvents);  
706      }      }
707    
708      /**      /**
# Line 1140  namespace LinuxSampler { namespace gig { Line 1139  namespace LinuxSampler { namespace gig {
1139          // update controller value in the engine channel's controller table          // update controller value in the engine channel's controller table
1140          pEngineChannel->ControllerTable[itControlChangeEvent->Param.CC.Controller] = itControlChangeEvent->Param.CC.Value;          pEngineChannel->ControllerTable[itControlChangeEvent->Param.CC.Controller] = itControlChangeEvent->Param.CC.Value;
1141    
1142          // move event from the import event list to the engine channel's CC and pitchbend event list          switch (itControlChangeEvent->Param.CC.Controller) {
         Pool<Event>::Iterator itControlChangeEventOnCCList = itControlChangeEvent.moveToEndOf(pEngineChannel->pEvents);  
   
         switch (itControlChangeEventOnCCList->Param.CC.Controller) {  
1143              case 7: { // volume              case 7: { // volume
1144                  //TODO: not sample accurate yet                  //TODO: not sample accurate yet
1145                  pEngineChannel->GlobalVolume = (float) itControlChangeEventOnCCList->Param.CC.Value / 127.0f;                  pEngineChannel->GlobalVolume = (float) itControlChangeEvent->Param.CC.Value / 127.0f;
1146                  pEngineChannel->bStatusChanged = true; // engine channel status has changed, so set notify flag                  pEngineChannel->bStatusChanged = true; // engine channel status has changed, so set notify flag
1147                  break;                  break;
1148              }              }
1149              case 10: { // panpot              case 10: { // panpot
1150                  //TODO: not sample accurate yet                  //TODO: not sample accurate yet
1151                  const int pan = (int) itControlChangeEventOnCCList->Param.CC.Value - 64;                  const int pan = (int) itControlChangeEvent->Param.CC.Value - 64;
1152                  pEngineChannel->GlobalPanLeft  = 1.0f - float(RTMath::Max(pan, 0)) /  63.0f;                  pEngineChannel->GlobalPanLeft  = 1.0f - float(RTMath::Max(pan, 0)) /  63.0f;
1153                  pEngineChannel->GlobalPanRight = 1.0f - float(RTMath::Min(pan, 0)) / -64.0f;                  pEngineChannel->GlobalPanRight = 1.0f - float(RTMath::Min(pan, 0)) / -64.0f;
1154                  break;                  break;
1155              }              }
1156              case 64: { // sustain              case 64: { // sustain
1157                  if (itControlChangeEventOnCCList->Param.CC.Value >= 64 && !pEngineChannel->SustainPedal) {                  if (itControlChangeEvent->Param.CC.Value >= 64 && !pEngineChannel->SustainPedal) {
1158                      dmsg(4,("PEDAL DOWN\n"));                      dmsg(4,("PEDAL DOWN\n"));
1159                      pEngineChannel->SustainPedal = true;                      pEngineChannel->SustainPedal = true;
1160    
# Line 1173  namespace LinuxSampler { namespace gig { Line 1169  namespace LinuxSampler { namespace gig {
1169                          if (!pKey->KeyPressed) {                          if (!pKey->KeyPressed) {
1170                              RTList<Event>::Iterator itNewEvent = pKey->pEvents->allocAppend();                              RTList<Event>::Iterator itNewEvent = pKey->pEvents->allocAppend();
1171                              if (itNewEvent) {                              if (itNewEvent) {
1172                                  *itNewEvent = *itControlChangeEventOnCCList; // copy event to the key's own event list                                  *itNewEvent = *itControlChangeEvent; // copy event to the key's own event list
1173                                  itNewEvent->Type = Event::type_cancel_release; // transform event type                                  itNewEvent->Type = Event::type_cancel_release; // transform event type
1174                              }                              }
1175                              else dmsg(1,("Event pool emtpy!\n"));                              else dmsg(1,("Event pool emtpy!\n"));
1176                          }                          }
1177                      }                      }
1178                  }                  }
1179                  if (itControlChangeEventOnCCList->Param.CC.Value < 64 && pEngineChannel->SustainPedal) {                  if (itControlChangeEvent->Param.CC.Value < 64 && pEngineChannel->SustainPedal) {
1180                      dmsg(4,("PEDAL UP\n"));                      dmsg(4,("PEDAL UP\n"));
1181                      pEngineChannel->SustainPedal = false;                      pEngineChannel->SustainPedal = false;
1182    
# Line 1195  namespace LinuxSampler { namespace gig { Line 1191  namespace LinuxSampler { namespace gig {
1191                          if (!pKey->KeyPressed) {                          if (!pKey->KeyPressed) {
1192                              RTList<Event>::Iterator itNewEvent = pKey->pEvents->allocAppend();                              RTList<Event>::Iterator itNewEvent = pKey->pEvents->allocAppend();
1193                              if (itNewEvent) {                              if (itNewEvent) {
1194                                  *itNewEvent = *itControlChangeEventOnCCList; // copy event to the key's own event list                                  *itNewEvent = *itControlChangeEvent; // copy event to the key's own event list
1195                                  itNewEvent->Type = Event::type_release; // transform event type                                  itNewEvent->Type = Event::type_release; // transform event type
1196                              }                              }
1197                              else dmsg(1,("Event pool emtpy!\n"));                              else dmsg(1,("Event pool emtpy!\n"));
# Line 1209  namespace LinuxSampler { namespace gig { Line 1205  namespace LinuxSampler { namespace gig {
1205              // Channel Mode Messages              // Channel Mode Messages
1206    
1207              case 120: { // all sound off              case 120: { // all sound off
1208                  KillAllVoices(pEngineChannel, itControlChangeEventOnCCList);                  KillAllVoices(pEngineChannel, itControlChangeEvent);
1209                  break;                  break;
1210              }              }
1211              case 121: { // reset all controllers              case 121: { // reset all controllers
# Line 1217  namespace LinuxSampler { namespace gig { Line 1213  namespace LinuxSampler { namespace gig {
1213                  break;                  break;
1214              }              }
1215              case 123: { // all notes off              case 123: { // all notes off
1216                  ReleaseAllVoices(pEngineChannel, itControlChangeEventOnCCList);                  ReleaseAllVoices(pEngineChannel, itControlChangeEvent);
1217                  break;                  break;
1218              }              }
1219          }          }
# Line 1397  namespace LinuxSampler { namespace gig { Line 1393  namespace LinuxSampler { namespace gig {
1393      }      }
1394    
1395      String Engine::Version() {      String Engine::Version() {
1396          String s = "$Revision: 1.52 $";          String s = "$Revision: 1.53 $";
1397          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
1398      }      }
1399    

Legend:
Removed from v.738  
changed lines
  Added in v.769

  ViewVC Help
Powered by ViewVC