/[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 1722 by schoenebeck, Thu Apr 10 17:41:32 2008 UTC revision 1748 by persson, Sun Jun 22 14:46:46 2008 UTC
# Line 358  namespace LinuxSampler { namespace gig { Line 358  namespace LinuxSampler { namespace gig {
358          this->MaxSamplesPerCycle = pAudioOutputDevice->MaxSamplesPerCycle();          this->MaxSamplesPerCycle = pAudioOutputDevice->MaxSamplesPerCycle();
359          this->SampleRate         = pAudioOutputDevice->SampleRate();          this->SampleRate         = pAudioOutputDevice->SampleRate();
360    
361          // FIXME: audio drivers with varying fragment sizes might be a problem here          MinFadeOutSamples = int(double(SampleRate) * CONFIG_EG_MIN_RELEASE_TIME) - 1;
362          MaxFadeOutPos = MaxSamplesPerCycle - int(double(SampleRate) * CONFIG_EG_MIN_RELEASE_TIME) - 1;          if (MaxSamplesPerCycle < MinFadeOutSamples) {
         if (MaxFadeOutPos < 0) {  
363              std::cerr << "gig::Engine: WARNING, CONFIG_EG_MIN_RELEASE_TIME "              std::cerr << "gig::Engine: WARNING, CONFIG_EG_MIN_RELEASE_TIME "
364                        << "too big for current audio fragment size & sampling rate! "                        << "too big for current audio fragment size & sampling rate! "
365                        << "May lead to click sounds if voice stealing chimes in!\n" << std::flush;                        << "May lead to click sounds if voice stealing chimes in!\n" << std::flush;
366              // force volume ramp downs at the beginning of each fragment              // force volume ramp downs at the beginning of each fragment
367              MaxFadeOutPos = 0;              MinFadeOutSamples = MaxSamplesPerCycle;
368              // lower minimum release time              // lower minimum release time
369              const float minReleaseTime = (float) MaxSamplesPerCycle / (float) SampleRate;              const float minReleaseTime = (float) MaxSamplesPerCycle / (float) SampleRate;
370              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 1728  namespace LinuxSampler { namespace gig { Line 1727  namespace LinuxSampler { namespace gig {
1727                  //TODO: not sample accurate yet                  //TODO: not sample accurate yet
1728                  pEngineChannel->GlobalPanLeft  = PanCurve[128 - itControlChangeEvent->Param.CC.Value];                  pEngineChannel->GlobalPanLeft  = PanCurve[128 - itControlChangeEvent->Param.CC.Value];
1729                  pEngineChannel->GlobalPanRight = PanCurve[itControlChangeEvent->Param.CC.Value];                  pEngineChannel->GlobalPanRight = PanCurve[itControlChangeEvent->Param.CC.Value];
1730                    pEngineChannel->iLastPanRequest = itControlChangeEvent->Param.CC.Value;
1731                  break;                  break;
1732              }              }
1733              case 64: { // sustain              case 64: { // sustain
# Line 1890  namespace LinuxSampler { namespace gig { Line 1890  namespace LinuxSampler { namespace gig {
1890          if (exclusive_status != 0xF0)       goto free_sysex_data;          if (exclusive_status != 0xF0)       goto free_sysex_data;
1891    
1892          switch (id) {          switch (id) {
1893                case 0x7f: { // (Realtime) Universal Sysex (GM Standard)
1894                    uint8_t sysex_channel, sub_id1, sub_id2, val_msb, val_lsb;;
1895                    if (!reader.pop(&sysex_channel)) goto free_sysex_data;
1896                    if (!reader.pop(&sub_id1)) goto free_sysex_data;
1897                    if (!reader.pop(&sub_id2)) goto free_sysex_data;
1898                    if (!reader.pop(&val_lsb)) goto free_sysex_data;
1899                    if (!reader.pop(&val_msb)) goto free_sysex_data;
1900                    //TODO: for now we simply ignore the sysex channel, seldom used anyway
1901                    switch (sub_id1) {
1902                        case 0x04: // Device Control
1903                            switch (sub_id2) {
1904                                case 0x01: // Master Volume
1905                                    GLOBAL_VOLUME =
1906                                        double((uint(val_msb)<<7) | uint(val_lsb)) / 16383.0;
1907                                    break;
1908                            }
1909                            break;
1910                    }
1911                    break;
1912                }
1913              case 0x41: { // Roland              case 0x41: { // Roland
1914                  dmsg(3,("Roland Sysex\n"));                  dmsg(3,("Roland Sysex\n"));
1915                  uint8_t device_id, model_id, cmd_id;                  uint8_t device_id, model_id, cmd_id;
# Line 2068  namespace LinuxSampler { namespace gig { Line 2088  namespace LinuxSampler { namespace gig {
2088      }      }
2089    
2090      String Engine::Version() {      String Engine::Version() {
2091          String s = "$Revision: 1.90 $";          String s = "$Revision: 1.93 $";
2092          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
2093      }      }
2094    

Legend:
Removed from v.1722  
changed lines
  Added in v.1748

  ViewVC Help
Powered by ViewVC