/[svn]/libgig/trunk/src/gig.cpp
ViewVC logotype

Diff of /libgig/trunk/src/gig.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 27 by schoenebeck, Thu Jan 1 23:46:41 2004 UTC revision 345 by schoenebeck, Fri Jan 21 16:40:37 2005 UTC
# Line 2  Line 2 
2   *                                                                         *   *                                                                         *
3   *   libgig - C++ cross-platform Gigasampler format file loader library    *   *   libgig - C++ cross-platform Gigasampler format file loader library    *
4   *                                                                         *   *                                                                         *
5   *   Copyright (C) 2003 by Christian Schoenebeck                           *   *   Copyright (C) 2003, 2004 by Christian Schoenebeck                     *
6   *                         <cuse@users.sourceforge.net>                    *   *                               <cuse@users.sourceforge.net>              *
7   *                                                                         *   *                                                                         *
8   *   This library is free software; you can redistribute it and/or modify  *   *   This library is free software; you can redistribute it and/or modify  *
9   *   it under the terms of the GNU General Public License as published by  *   *   it under the terms of the GNU General Public License as published by  *
# Line 66  namespace gig { Line 66  namespace gig {
66          Compressed = (waveList->GetSubChunk(CHUNK_ID_EWAV));          Compressed = (waveList->GetSubChunk(CHUNK_ID_EWAV));
67          if (Compressed) {          if (Compressed) {
68              ScanCompressedSample();              ScanCompressedSample();
69              if (!pDecompressionBuffer) {          }
70                  pDecompressionBuffer    = new int8_t[INITIAL_SAMPLE_BUFFER_SIZE];  
71                  DecompressionBufferSize = INITIAL_SAMPLE_BUFFER_SIZE;          if (BitDepth > 24)                throw gig::Exception("Only samples up to 24 bit supported");
72              }          if (Compressed && Channels == 1)  throw gig::Exception("Mono compressed samples not yet supported");
73            if (Compressed && BitDepth == 24) throw gig::Exception("24 bit compressed samples not yet supported");
74    
75            // we use a buffer for decompression and for truncating 24 bit samples to 16 bit
76            if ((Compressed || BitDepth == 24) && !pDecompressionBuffer) {
77                pDecompressionBuffer    = new int8_t[INITIAL_SAMPLE_BUFFER_SIZE];
78                DecompressionBufferSize = INITIAL_SAMPLE_BUFFER_SIZE;
79          }          }
80          FrameOffset = 0; // just for streaming compressed samples          FrameOffset = 0; // just for streaming compressed samples
81    
# Line 502  namespace gig { Line 508  namespace gig {
508       */       */
509      unsigned long Sample::Read(void* pBuffer, unsigned long SampleCount) {      unsigned long Sample::Read(void* pBuffer, unsigned long SampleCount) {
510          if (SampleCount == 0) return 0;          if (SampleCount == 0) return 0;
511          if (!Compressed) return pCkData->Read(pBuffer, SampleCount, FrameSize); //FIXME: channel inversion due to endian correction?          if (!Compressed) {
512                if (BitDepth == 24) {
513                    // 24 bit sample. For now just truncate to 16 bit.
514                    int8_t* pSrc = (int8_t*)this->pDecompressionBuffer;
515                    int8_t* pDst = (int8_t*)pBuffer;
516                    unsigned long n = pCkData->Read(pSrc, SampleCount, FrameSize);
517                    for (int i = SampleCount * (FrameSize / 3) ; i > 0 ; i--) {
518                        pSrc++;
519                        *pDst++ = *pSrc++;
520                        *pDst++ = *pSrc++;
521                    }
522                    return SampleCount;
523                } else {
524                    return pCkData->Read(pBuffer, SampleCount, FrameSize); //FIXME: channel inversion due to endian correction?
525                }
526            }
527          else { //FIXME: no support for mono compressed samples yet, are there any?          else { //FIXME: no support for mono compressed samples yet, are there any?
528              if (this->SamplePos >= this->SamplesTotal) return 0;              if (this->SamplePos >= this->SamplesTotal) return 0;
529              //TODO: efficiency: we simply assume here that all frames are compressed, maybe we should test for an average compression rate              //TODO: efficiency: we simply assume here that all frames are compressed, maybe we should test for an average compression rate
# Line 680  namespace gig { Line 701  namespace gig {
701          if (!pVelocityTables) pVelocityTables = new VelocityTableMap;          if (!pVelocityTables) pVelocityTables = new VelocityTableMap;
702    
703          RIFF::Chunk* _3ewa = _3ewl->GetSubChunk(CHUNK_ID_3EWA);          RIFF::Chunk* _3ewa = _3ewl->GetSubChunk(CHUNK_ID_3EWA);
704          _3ewa->ReadInt32(); // unknown, allways 0x0000008C ?          _3ewa->ReadInt32(); // unknown, always 0x0000008C ?
705          LFO3Frequency = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());          LFO3Frequency = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());
706          EG3Attack     = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());          EG3Attack     = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());
707          _3ewa->ReadInt16(); // unknown          _3ewa->ReadInt16(); // unknown
# Line 696  namespace gig { Line 717  namespace gig {
717          _3ewa->ReadInt16(); // unknown          _3ewa->ReadInt16(); // unknown
718          EG1Sustain          = _3ewa->ReadUint16();          EG1Sustain          = _3ewa->ReadUint16();
719          EG1Release          = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());          EG1Release          = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());
720          EG1Controller       = static_cast<eg1_ctrl_t>(_3ewa->ReadUint8());          EG1Controller       = DecodeLeverageController(static_cast<_lev_ctrl_t>(_3ewa->ReadUint8()));
721          uint8_t eg1ctrloptions        = _3ewa->ReadUint8();          uint8_t eg1ctrloptions        = _3ewa->ReadUint8();
722          EG1ControllerInvert           = eg1ctrloptions & 0x01;          EG1ControllerInvert           = eg1ctrloptions & 0x01;
723          EG1ControllerAttackInfluence  = GIG_EG_CTR_ATTACK_INFLUENCE_EXTRACT(eg1ctrloptions);          EG1ControllerAttackInfluence  = GIG_EG_CTR_ATTACK_INFLUENCE_EXTRACT(eg1ctrloptions);
724          EG1ControllerDecayInfluence   = GIG_EG_CTR_DECAY_INFLUENCE_EXTRACT(eg1ctrloptions);          EG1ControllerDecayInfluence   = GIG_EG_CTR_DECAY_INFLUENCE_EXTRACT(eg1ctrloptions);
725          EG1ControllerReleaseInfluence = GIG_EG_CTR_RELEASE_INFLUENCE_EXTRACT(eg1ctrloptions);          EG1ControllerReleaseInfluence = GIG_EG_CTR_RELEASE_INFLUENCE_EXTRACT(eg1ctrloptions);
726          EG2Controller       = static_cast<eg2_ctrl_t>(_3ewa->ReadUint8());          EG2Controller       = DecodeLeverageController(static_cast<_lev_ctrl_t>(_3ewa->ReadUint8()));
727          uint8_t eg2ctrloptions        = _3ewa->ReadUint8();          uint8_t eg2ctrloptions        = _3ewa->ReadUint8();
728          EG2ControllerInvert           = eg2ctrloptions & 0x01;          EG2ControllerInvert           = eg2ctrloptions & 0x01;
729          EG2ControllerAttackInfluence  = GIG_EG_CTR_ATTACK_INFLUENCE_EXTRACT(eg2ctrloptions);          EG2ControllerAttackInfluence  = GIG_EG_CTR_ATTACK_INFLUENCE_EXTRACT(eg2ctrloptions);
# Line 764  namespace gig { Line 785  namespace gig {
785              ReleaseVelocityResponseDepth = 0;              ReleaseVelocityResponseDepth = 0;
786          }          }
787          VelocityResponseCurveScaling = _3ewa->ReadUint8();          VelocityResponseCurveScaling = _3ewa->ReadUint8();
788          AttenuationControlTreshold   = _3ewa->ReadInt8();          AttenuationControllerThreshold = _3ewa->ReadInt8();
789          _3ewa->ReadInt32(); // unknown          _3ewa->ReadInt32(); // unknown
790          SampleStartOffset = (uint16_t) _3ewa->ReadInt16();          SampleStartOffset = (uint16_t) _3ewa->ReadInt16();
791          _3ewa->ReadInt16(); // unknown          _3ewa->ReadInt16(); // unknown
# Line 774  namespace gig { Line 795  namespace gig {
795          else if (pitchTrackDimensionBypass & 0x20) DimensionBypass = dim_bypass_ctrl_95;          else if (pitchTrackDimensionBypass & 0x20) DimensionBypass = dim_bypass_ctrl_95;
796          else                                       DimensionBypass = dim_bypass_ctrl_none;          else                                       DimensionBypass = dim_bypass_ctrl_none;
797          uint8_t pan = _3ewa->ReadUint8();          uint8_t pan = _3ewa->ReadUint8();
798          Pan         = (pan < 64) ? pan : (-1) * (int8_t)pan - 63;          Pan         = (pan < 64) ? pan : -((int)pan - 63); // signed 7 bit -> signed 8 bit
799          SelfMask = _3ewa->ReadInt8() & 0x01;          SelfMask = _3ewa->ReadInt8() & 0x01;
800          _3ewa->ReadInt8(); // unknown          _3ewa->ReadInt8(); // unknown
801          uint8_t lfo3ctrl = _3ewa->ReadUint8();          uint8_t lfo3ctrl = _3ewa->ReadUint8();
802          LFO3Controller           = static_cast<lfo3_ctrl_t>(lfo3ctrl & 0x07); // lower 3 bits          LFO3Controller           = static_cast<lfo3_ctrl_t>(lfo3ctrl & 0x07); // lower 3 bits
803          LFO3Sync                 = lfo3ctrl & 0x20; // bit 5          LFO3Sync                 = lfo3ctrl & 0x20; // bit 5
804          InvertAttenuationControl = lfo3ctrl & 0x80; // bit 7          InvertAttenuationController = lfo3ctrl & 0x80; // bit 7
805          if (VCFType == vcf_type_lowpass) {          AttenuationController  = DecodeLeverageController(static_cast<_lev_ctrl_t>(_3ewa->ReadUint8()));
             if (lfo3ctrl & 0x40) // bit 6  
                 VCFType = vcf_type_lowpassturbo;  
         }  
         AttenuationControl = static_cast<attenuation_ctrl_t>(_3ewa->ReadUint8());  
806          uint8_t lfo2ctrl       = _3ewa->ReadUint8();          uint8_t lfo2ctrl       = _3ewa->ReadUint8();
807          LFO2Controller         = static_cast<lfo2_ctrl_t>(lfo2ctrl & 0x07); // lower 3 bits          LFO2Controller         = static_cast<lfo2_ctrl_t>(lfo2ctrl & 0x07); // lower 3 bits
808          LFO2FlipPhase          = lfo2ctrl & 0x80; // bit 7          LFO2FlipPhase          = lfo2ctrl & 0x80; // bit 7
# Line 829  namespace gig { Line 846  namespace gig {
846          VCFVelocityDynamicRange = vcfvelocity % 5;          VCFVelocityDynamicRange = vcfvelocity % 5;
847          VCFVelocityCurve        = static_cast<curve_type_t>(vcfvelocity / 5);          VCFVelocityCurve        = static_cast<curve_type_t>(vcfvelocity / 5);
848          VCFType = static_cast<vcf_type_t>(_3ewa->ReadUint8());          VCFType = static_cast<vcf_type_t>(_3ewa->ReadUint8());
849            if (VCFType == vcf_type_lowpass) {
850                if (lfo3ctrl & 0x40) // bit 6
851                    VCFType = vcf_type_lowpassturbo;
852            }
853    
854          // get the corresponding velocity->volume table from the table map or create & calculate that table if it doesn't exist yet          // get the corresponding velocity->volume table from the table map or create & calculate that table if it doesn't exist yet
855          uint32_t tableKey = (VelocityResponseCurve<<16) | (VelocityResponseDepth<<8) | VelocityResponseCurveScaling;          uint32_t tableKey = (VelocityResponseCurve<<16) | (VelocityResponseDepth<<8) | VelocityResponseCurveScaling;
# Line 836  namespace gig { Line 857  namespace gig {
857              pVelocityAttenuationTable = (*pVelocityTables)[tableKey];              pVelocityAttenuationTable = (*pVelocityTables)[tableKey];
858          }          }
859          else {          else {
860              pVelocityAttenuationTable = new double[128];              pVelocityAttenuationTable =
861              switch (VelocityResponseCurve) { // calculate the new table                  CreateVelocityTable(VelocityResponseCurve,
862                  case curve_type_nonlinear:                                      VelocityResponseDepth,
863                      for (int velocity = 0; velocity < 128; velocity++) {                                      VelocityResponseCurveScaling);
                         pVelocityAttenuationTable[velocity] =  
                             GIG_VELOCITY_TRANSFORM_NONLINEAR((double)(velocity+1),(double)(VelocityResponseDepth+1),(double)VelocityResponseCurveScaling);  
                         if      (pVelocityAttenuationTable[velocity] > 1.0) pVelocityAttenuationTable[velocity] = 1.0;  
                         else if (pVelocityAttenuationTable[velocity] < 0.0) pVelocityAttenuationTable[velocity] = 0.0;  
                      }  
                      break;  
                 case curve_type_linear:  
                     for (int velocity = 0; velocity < 128; velocity++) {  
                         pVelocityAttenuationTable[velocity] =  
                             GIG_VELOCITY_TRANSFORM_LINEAR((double)velocity,(double)(VelocityResponseDepth+1),(double)VelocityResponseCurveScaling);  
                         if      (pVelocityAttenuationTable[velocity] > 1.0) pVelocityAttenuationTable[velocity] = 1.0;  
                         else if (pVelocityAttenuationTable[velocity] < 0.0) pVelocityAttenuationTable[velocity] = 0.0;  
                     }  
                     break;  
                 case curve_type_special:  
                     for (int velocity = 0; velocity < 128; velocity++) {  
                         pVelocityAttenuationTable[velocity] =  
                             GIG_VELOCITY_TRANSFORM_SPECIAL((double)(velocity+1),(double)(VelocityResponseDepth+1),(double)VelocityResponseCurveScaling);  
                         if      (pVelocityAttenuationTable[velocity] > 1.0) pVelocityAttenuationTable[velocity] = 1.0;  
                         else if (pVelocityAttenuationTable[velocity] < 0.0) pVelocityAttenuationTable[velocity] = 0.0;  
                     }  
                     break;  
                 case curve_type_unknown:  
                 default:  
                     throw gig::Exception("Unknown transform curve type.");  
             }  
864              (*pVelocityTables)[tableKey] = pVelocityAttenuationTable; // put the new table into the tables map              (*pVelocityTables)[tableKey] = pVelocityAttenuationTable; // put the new table into the tables map
865          }          }
866      }      }
867    
868        leverage_ctrl_t DimensionRegion::DecodeLeverageController(_lev_ctrl_t EncodedController) {
869            leverage_ctrl_t decodedcontroller;
870            switch (EncodedController) {
871                // special controller
872                case _lev_ctrl_none:
873                    decodedcontroller.type = leverage_ctrl_t::type_none;
874                    decodedcontroller.controller_number = 0;
875                    break;
876                case _lev_ctrl_velocity:
877                    decodedcontroller.type = leverage_ctrl_t::type_velocity;
878                    decodedcontroller.controller_number = 0;
879                    break;
880                case _lev_ctrl_channelaftertouch:
881                    decodedcontroller.type = leverage_ctrl_t::type_channelaftertouch;
882                    decodedcontroller.controller_number = 0;
883                    break;
884    
885                // ordinary MIDI control change controller
886                case _lev_ctrl_modwheel:
887                    decodedcontroller.type = leverage_ctrl_t::type_controlchange;
888                    decodedcontroller.controller_number = 1;
889                    break;
890                case _lev_ctrl_breath:
891                    decodedcontroller.type = leverage_ctrl_t::type_controlchange;
892                    decodedcontroller.controller_number = 2;
893                    break;
894                case _lev_ctrl_foot:
895                    decodedcontroller.type = leverage_ctrl_t::type_controlchange;
896                    decodedcontroller.controller_number = 4;
897                    break;
898                case _lev_ctrl_effect1:
899                    decodedcontroller.type = leverage_ctrl_t::type_controlchange;
900                    decodedcontroller.controller_number = 12;
901                    break;
902                case _lev_ctrl_effect2:
903                    decodedcontroller.type = leverage_ctrl_t::type_controlchange;
904                    decodedcontroller.controller_number = 13;
905                    break;
906                case _lev_ctrl_genpurpose1:
907                    decodedcontroller.type = leverage_ctrl_t::type_controlchange;
908                    decodedcontroller.controller_number = 16;
909                    break;
910                case _lev_ctrl_genpurpose2:
911                    decodedcontroller.type = leverage_ctrl_t::type_controlchange;
912                    decodedcontroller.controller_number = 17;
913                    break;
914                case _lev_ctrl_genpurpose3:
915                    decodedcontroller.type = leverage_ctrl_t::type_controlchange;
916                    decodedcontroller.controller_number = 18;
917                    break;
918                case _lev_ctrl_genpurpose4:
919                    decodedcontroller.type = leverage_ctrl_t::type_controlchange;
920                    decodedcontroller.controller_number = 19;
921                    break;
922                case _lev_ctrl_portamentotime:
923                    decodedcontroller.type = leverage_ctrl_t::type_controlchange;
924                    decodedcontroller.controller_number = 5;
925                    break;
926                case _lev_ctrl_sustainpedal:
927                    decodedcontroller.type = leverage_ctrl_t::type_controlchange;
928                    decodedcontroller.controller_number = 64;
929                    break;
930                case _lev_ctrl_portamento:
931                    decodedcontroller.type = leverage_ctrl_t::type_controlchange;
932                    decodedcontroller.controller_number = 65;
933                    break;
934                case _lev_ctrl_sostenutopedal:
935                    decodedcontroller.type = leverage_ctrl_t::type_controlchange;
936                    decodedcontroller.controller_number = 66;
937                    break;
938                case _lev_ctrl_softpedal:
939                    decodedcontroller.type = leverage_ctrl_t::type_controlchange;
940                    decodedcontroller.controller_number = 67;
941                    break;
942                case _lev_ctrl_genpurpose5:
943                    decodedcontroller.type = leverage_ctrl_t::type_controlchange;
944                    decodedcontroller.controller_number = 80;
945                    break;
946                case _lev_ctrl_genpurpose6:
947                    decodedcontroller.type = leverage_ctrl_t::type_controlchange;
948                    decodedcontroller.controller_number = 81;
949                    break;
950                case _lev_ctrl_genpurpose7:
951                    decodedcontroller.type = leverage_ctrl_t::type_controlchange;
952                    decodedcontroller.controller_number = 82;
953                    break;
954                case _lev_ctrl_genpurpose8:
955                    decodedcontroller.type = leverage_ctrl_t::type_controlchange;
956                    decodedcontroller.controller_number = 83;
957                    break;
958                case _lev_ctrl_effect1depth:
959                    decodedcontroller.type = leverage_ctrl_t::type_controlchange;
960                    decodedcontroller.controller_number = 91;
961                    break;
962                case _lev_ctrl_effect2depth:
963                    decodedcontroller.type = leverage_ctrl_t::type_controlchange;
964                    decodedcontroller.controller_number = 92;
965                    break;
966                case _lev_ctrl_effect3depth:
967                    decodedcontroller.type = leverage_ctrl_t::type_controlchange;
968                    decodedcontroller.controller_number = 93;
969                    break;
970                case _lev_ctrl_effect4depth:
971                    decodedcontroller.type = leverage_ctrl_t::type_controlchange;
972                    decodedcontroller.controller_number = 94;
973                    break;
974                case _lev_ctrl_effect5depth:
975                    decodedcontroller.type = leverage_ctrl_t::type_controlchange;
976                    decodedcontroller.controller_number = 95;
977                    break;
978    
979                // unknown controller type
980                default:
981                    throw gig::Exception("Unknown leverage controller type.");
982            }
983            return decodedcontroller;
984        }
985    
986      DimensionRegion::~DimensionRegion() {      DimensionRegion::~DimensionRegion() {
987          Instances--;          Instances--;
988          if (!Instances) {          if (!Instances) {
# Line 893  namespace gig { Line 1006  namespace gig {
1006       * triggered to get the volume with which the sample should be played       * triggered to get the volume with which the sample should be played
1007       * back.       * back.
1008       *       *
1009       * @param    MIDI velocity value of the triggered key (between 0 and 127)       * @param MIDIKeyVelocity  MIDI velocity value of the triggered key (between 0 and 127)
1010       * @returns  amplitude factor (between 0.0 and 1.0)       * @returns                amplitude factor (between 0.0 and 1.0)
1011       */       */
1012      double DimensionRegion::GetVelocityAttenuation(uint8_t MIDIKeyVelocity) {      double DimensionRegion::GetVelocityAttenuation(uint8_t MIDIKeyVelocity) {
1013          return pVelocityAttenuationTable[MIDIKeyVelocity];          return pVelocityAttenuationTable[MIDIKeyVelocity];
1014      }      }
1015    
1016        double* DimensionRegion::CreateVelocityTable(curve_type_t curveType, uint8_t depth, uint8_t scaling) {
1017    
1018            // line-segment approximations of the 15 velocity curves
1019    
1020            // linear
1021            const int lin0[] = { 1, 1, 127, 127 };
1022            const int lin1[] = { 1, 21, 127, 127 };
1023            const int lin2[] = { 1, 45, 127, 127 };
1024            const int lin3[] = { 1, 74, 127, 127 };
1025            const int lin4[] = { 1, 127, 127, 127 };
1026    
1027            // non-linear
1028            const int non0[] = { 1, 4, 24, 5, 57, 17, 92, 57, 122, 127, 127, 127 };
1029            const int non1[] = { 1, 4, 46, 9, 93, 56, 118, 106, 123, 127,
1030                                 127, 127 };
1031            const int non2[] = { 1, 4, 46, 9, 57, 20, 102, 107, 107, 127,
1032                                 127, 127 };
1033            const int non3[] = { 1, 15, 10, 19, 67, 73, 80, 80, 90, 98, 98, 127,
1034                                 127, 127 };
1035            const int non4[] = { 1, 25, 33, 57, 82, 81, 92, 127, 127, 127 };
1036    
1037            // special
1038            const int spe0[] = { 1, 2, 76, 10, 90, 15, 95, 20, 99, 28, 103, 44,
1039                                 113, 127, 127, 127 };
1040            const int spe1[] = { 1, 2, 27, 5, 67, 18, 89, 29, 95, 35, 107, 67,
1041                                 118, 127, 127, 127 };
1042            const int spe2[] = { 1, 1, 33, 1, 53, 5, 61, 13, 69, 32, 79, 74,
1043                                 85, 90, 91, 127, 127, 127 };
1044            const int spe3[] = { 1, 32, 28, 35, 66, 48, 89, 59, 95, 65, 99, 73,
1045                                 117, 127, 127, 127 };
1046            const int spe4[] = { 1, 4, 23, 5, 49, 13, 57, 17, 92, 57, 122, 127,
1047                                 127, 127 };
1048    
1049            const int* const curves[] = { non0, non1, non2, non3, non4,
1050                                          lin0, lin1, lin2, lin3, lin4,
1051                                          spe0, spe1, spe2, spe3, spe4 };
1052    
1053            double* const table = new double[128];
1054    
1055            const int* curve = curves[curveType * 5 + depth];
1056            const int s = scaling == 0 ? 20 : scaling; // 0 or 20 means no scaling
1057    
1058            table[0] = 0;
1059            for (int x = 1 ; x < 128 ; x++) {
1060    
1061                if (x > curve[2]) curve += 2;
1062                double y = curve[1] + (x - curve[0]) *
1063                    (double(curve[3] - curve[1]) / (curve[2] - curve[0]));
1064                y = y / 127;
1065    
1066                // Scale up for s > 20, down for s < 20. When
1067                // down-scaling, the curve still ends at 1.0.
1068                if (s < 20 && y >= 0.5)
1069                    y = y / ((2 - 40.0 / s) * y + 40.0 / s - 1);
1070                else
1071                    y = y * (s / 20.0);
1072                if (y > 1) y = 1;
1073    
1074                table[x] = y;
1075            }
1076            return table;
1077        }
1078    
1079    
1080  // *************** Region ***************  // *************** Region ***************
# Line 911  namespace gig { Line 1086  namespace gig {
1086          for (int i = 0; i < 32; i++) {          for (int i = 0; i < 32; i++) {
1087              pDimensionRegions[i] = NULL;              pDimensionRegions[i] = NULL;
1088          }          }
1089            Layers = 1;
1090    
1091          // Actual Loading          // Actual Loading
1092    
# Line 935  namespace gig { Line 1111  namespace gig {
1111                      pDimensionDefinitions[i].bits      = bits;                      pDimensionDefinitions[i].bits      = bits;
1112                      pDimensionDefinitions[i].zones     = 0x01 << bits; // = pow(2,bits)                      pDimensionDefinitions[i].zones     = 0x01 << bits; // = pow(2,bits)
1113                      pDimensionDefinitions[i].split_type = (dimension == dimension_layer ||                      pDimensionDefinitions[i].split_type = (dimension == dimension_layer ||
1114                                                             dimension == dimension_samplechannel) ? split_type_bit                                                             dimension == dimension_samplechannel ||
1115                                                                                                   : split_type_normal;                                                             dimension == dimension_releasetrigger) ? split_type_bit
1116                                                                                                      : split_type_normal;
1117                      pDimensionDefinitions[i].ranges = NULL; // it's not possible to check velocity dimensions for custom defined ranges at this point                      pDimensionDefinitions[i].ranges = NULL; // it's not possible to check velocity dimensions for custom defined ranges at this point
1118                      pDimensionDefinitions[i].zone_size  =                      pDimensionDefinitions[i].zone_size  =
1119                          (pDimensionDefinitions[i].split_type == split_type_normal) ? 128 / pDimensionDefinitions[i].zones                          (pDimensionDefinitions[i].split_type == split_type_normal) ? 128 / pDimensionDefinitions[i].zones
1120                                                                                     : 0;                                                                                     : 0;
1121                      Dimensions++;                      Dimensions++;
1122    
1123                        // if this is a layer dimension, remember the amount of layers
1124                        if (dimension == dimension_layer) Layers = pDimensionDefinitions[i].zones;
1125                  }                  }
1126                  _3lnk->SetPos(6, RIFF::stream_curpos); // jump forward to next dimension definition                  _3lnk->SetPos(6, RIFF::stream_curpos); // jump forward to next dimension definition
1127              }              }
# Line 976  namespace gig { Line 1156  namespace gig {
1156                  }                  }
1157              }              }
1158    
1159                // jump to start of the wave pool indices (if not already there)
1160                File* file = (File*) GetParent()->GetParent();
1161                if (file->pVersion && file->pVersion->major == 3)
1162                    _3lnk->SetPos(68); // version 3 has a different 3lnk structure
1163                else
1164                    _3lnk->SetPos(44);
1165    
1166              // load sample references              // load sample references
             _3lnk->SetPos(44); // jump to start of the wave pool indices (if not already there)  
1167              for (uint i = 0; i < DimensionRegions; i++) {              for (uint i = 0; i < DimensionRegions; i++) {
1168                  uint32_t wavepoolindex = _3lnk->ReadUint32();                  uint32_t wavepoolindex = _3lnk->ReadUint32();
1169                  pDimensionRegions[i]->pSample = GetSampleFromWavePool(wavepoolindex);                  pDimensionRegions[i]->pSample = GetSampleFromWavePool(wavepoolindex);
# Line 1034  namespace gig { Line 1220  namespace gig {
1220       * @see             Dimensions       * @see             Dimensions
1221       */       */
1222      DimensionRegion* Region::GetDimensionRegionByValue(uint Dim4Val, uint Dim3Val, uint Dim2Val, uint Dim1Val, uint Dim0Val) {      DimensionRegion* Region::GetDimensionRegionByValue(uint Dim4Val, uint Dim3Val, uint Dim2Val, uint Dim1Val, uint Dim0Val) {
1223          unsigned int bits[5] = {Dim0Val,Dim1Val,Dim2Val,Dim3Val,Dim4Val};          uint8_t bits[5] = {Dim0Val,Dim1Val,Dim2Val,Dim3Val,Dim4Val};
1224          for (uint i = 0; i < Dimensions; i++) {          for (uint i = 0; i < Dimensions; i++) {
1225              switch (pDimensionDefinitions[i].split_type) {              switch (pDimensionDefinitions[i].split_type) {
1226                  case split_type_normal:                  case split_type_normal:
# Line 1043  namespace gig { Line 1229  namespace gig {
1229                  case split_type_customvelocity:                  case split_type_customvelocity:
1230                      bits[i] = VelocityTable[bits[i]];                      bits[i] = VelocityTable[bits[i]];
1231                      break;                      break;
1232                  // else the value is already the sought dimension bit number                  case split_type_bit: // the value is already the sought dimension bit number
1233                        const uint8_t limiter_mask = (0xff << pDimensionDefinitions[i].bits) ^ 0xff;
1234                        bits[i] = bits[i] & limiter_mask; // just make sure the value don't uses more bits than allowed
1235                        break;
1236              }              }
1237          }          }
1238          return GetDimensionRegionByBit(bits[4],bits[3],bits[2],bits[1],bits[0]);          return GetDimensionRegionByBit(bits[4],bits[3],bits[2],bits[1],bits[0]);
Legend:
Removed from v.27  
changed lines
  Added in v.345
  ViewVC Help
Powered by ViewVC