/[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 1627 by persson, Sun Jan 6 10:53:53 2008 UTC revision 1869 by persson, Sun Mar 22 11:13:25 2009 UTC
# Line 2  Line 2 
2   *                                                                         *   *                                                                         *
3   *   libgig - C++ cross-platform Gigasampler format file access library    *   *   libgig - C++ cross-platform Gigasampler format file access library    *
4   *                                                                         *   *                                                                         *
5   *   Copyright (C) 2003-2007 by Christian Schoenebeck                      *   *   Copyright (C) 2003-2009 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  *
# Line 25  Line 25 
25    
26  #include "helper.h"  #include "helper.h"
27    
28    #include <algorithm>
29  #include <math.h>  #include <math.h>
30  #include <iostream>  #include <iostream>
31    
# Line 676  namespace { Line 677  namespace {
677          if (SampleCount > this->SamplesTotal) SampleCount = this->SamplesTotal;          if (SampleCount > this->SamplesTotal) SampleCount = this->SamplesTotal;
678          if (RAMCache.pStart) delete[] (int8_t*) RAMCache.pStart;          if (RAMCache.pStart) delete[] (int8_t*) RAMCache.pStart;
679          unsigned long allocationsize = (SampleCount + NullSamplesCount) * this->FrameSize;          unsigned long allocationsize = (SampleCount + NullSamplesCount) * this->FrameSize;
680            SetPos(0); // reset read position to begin of sample
681          RAMCache.pStart            = new int8_t[allocationsize];          RAMCache.pStart            = new int8_t[allocationsize];
682          RAMCache.Size              = Read(RAMCache.pStart, SampleCount) * this->FrameSize;          RAMCache.Size              = Read(RAMCache.pStart, SampleCount) * this->FrameSize;
683          RAMCache.NullExtensionSize = allocationsize - RAMCache.Size;          RAMCache.NullExtensionSize = allocationsize - RAMCache.Size;
# Line 713  namespace { Line 715  namespace {
715          if (RAMCache.pStart) delete[] (int8_t*) RAMCache.pStart;          if (RAMCache.pStart) delete[] (int8_t*) RAMCache.pStart;
716          RAMCache.pStart = NULL;          RAMCache.pStart = NULL;
717          RAMCache.Size   = 0;          RAMCache.Size   = 0;
718            RAMCache.NullExtensionSize = 0;
719      }      }
720    
721      /** @brief Resize sample.      /** @brief Resize sample.
# Line 1834  namespace { Line 1837  namespace {
1837    
1838          const uint16_t eg3depth = (EG3Depth >= 0) ? EG3Depth          const uint16_t eg3depth = (EG3Depth >= 0) ? EG3Depth
1839                                                    : uint16_t(((-EG3Depth) - 1) ^ 0xffff); /* binary complementary for negatives */                                                    : uint16_t(((-EG3Depth) - 1) ^ 0xffff); /* binary complementary for negatives */
1840          pData[116] = eg3depth;          store16(&pData[116], eg3depth);
1841    
1842          // next 2 bytes unknown          // next 2 bytes unknown
1843    
# Line 2965  MidiRuleCtrlTrigger::MidiRuleCtrlTrigger Line 2968  MidiRuleCtrlTrigger::MidiRuleCtrlTrigger
2968          PianoReleaseMode = false;          PianoReleaseMode = false;
2969          DimensionKeyRange.low = 0;          DimensionKeyRange.low = 0;
2970          DimensionKeyRange.high = 0;          DimensionKeyRange.high = 0;
2971            pMidiRules = new MidiRule*[3];
2972            pMidiRules[0] = NULL;
2973    
2974          // Loading          // Loading
2975          RIFF::List* lart = insList->GetSubList(LIST_TYPE_LART);          RIFF::List* lart = insList->GetSubList(LIST_TYPE_LART);
# Line 2982  MidiRuleCtrlTrigger::MidiRuleCtrlTrigger Line 2987  MidiRuleCtrlTrigger::MidiRuleCtrlTrigger
2987    
2988                  if (_3ewg->GetSize() > 32) {                  if (_3ewg->GetSize() > 32) {
2989                      // read MIDI rules                      // read MIDI rules
2990                        int i = 0;
2991                      _3ewg->SetPos(32);                      _3ewg->SetPos(32);
2992                      uint8_t id1 = _3ewg->ReadUint8();                      uint8_t id1 = _3ewg->ReadUint8();
2993                      uint8_t id2 = _3ewg->ReadUint8();                      uint8_t id2 = _3ewg->ReadUint8();
2994    
2995                      if (id1 == 4 && id2 == 16) {                      if (id1 == 4 && id2 == 16) {
2996                          MidiRules.push_back(new MidiRuleCtrlTrigger(_3ewg));                          pMidiRules[i++] = new MidiRuleCtrlTrigger(_3ewg);
2997                      }                      }
2998                      //TODO: all the other types of rules                      //TODO: all the other types of rules
2999    
3000                        pMidiRules[i] = NULL;
3001                  }                  }
3002              }              }
3003          }          }
# Line 3027  MidiRuleCtrlTrigger::MidiRuleCtrlTrigger Line 3035  MidiRuleCtrlTrigger::MidiRuleCtrlTrigger
3035      }      }
3036    
3037      Instrument::~Instrument() {      Instrument::~Instrument() {
3038            delete[] pMidiRules;
3039      }      }
3040    
3041      /**      /**
# Line 3142  MidiRuleCtrlTrigger::MidiRuleCtrlTrigger Line 3151  MidiRuleCtrlTrigger::MidiRuleCtrlTrigger
3151      }      }
3152    
3153      /**      /**
3154       * Returns the first MIDI rule of the instrument. You have to call       * Returns a MIDI rule of the instrument.
      * this method once before you use GetNextMidiRule().  
3155       *       *
3156       * The list of MIDI rules, at least in gig v3, always contains at       * The list of MIDI rules, at least in gig v3, always contains at
3157       * most two rules. The second rule can only be the DEF filter       * most two rules. The second rule can only be the DEF filter
3158       * (which currently isn't supported by libgig).       * (which currently isn't supported by libgig).
3159       *       *
3160       * @returns  pointer address to first MIDI rule or NULL if there is none       * @param i - MIDI rule number
3161       * @see      GetNextMidiRule()       * @returns   pointer address to MIDI rule number i or NULL if there is none
      */  
     MidiRule* Instrument::GetFirstMidiRule() {  
         MidiRulesIterator = MidiRules.begin();  
         return MidiRulesIterator != MidiRules.end() ? *MidiRulesIterator : NULL;  
     }  
   
     /**  
      * Returns the next MIDI rule of the instrument. You have to call  
      * GetFirstMidiRule() once before you can use this method. By  
      * calling this method multiple times it iterates through the  
      * available rules.  
      *  
      * @returns  pointer address to the next MIDI rule or NULL if end reached  
      * @see      GetFirstMidiRule()  
3162       */       */
3163      MidiRule* Instrument::GetNextMidiRule() {      MidiRule* Instrument::GetMidiRule(int i) {
3164          MidiRulesIterator++;          return pMidiRules[i];
         return MidiRulesIterator != MidiRules.end() ? *MidiRulesIterator : NULL;  
3165      }      }
3166    
3167    
# Line 3413  MidiRuleCtrlTrigger::MidiRuleCtrlTrigger Line 3406  MidiRuleCtrlTrigger::MidiRuleCtrlTrigger
3406          pSamples->erase(iter);          pSamples->erase(iter);
3407          delete pSample;          delete pSample;
3408    
3409            SampleList::iterator tmp = SamplesIterator;
3410          // remove all references to the sample          // remove all references to the sample
3411          for (Instrument* instrument = GetFirstInstrument() ; instrument ;          for (Instrument* instrument = GetFirstInstrument() ; instrument ;
3412               instrument = GetNextInstrument()) {               instrument = GetNextInstrument()) {
# Line 3427  MidiRuleCtrlTrigger::MidiRuleCtrlTrigger Line 3421  MidiRuleCtrlTrigger::MidiRuleCtrlTrigger
3421                  }                  }
3422              }              }
3423          }          }
3424            SamplesIterator = tmp; // restore iterator
3425      }      }
3426    
3427      void File::LoadSamples() {      void File::LoadSamples() {
Legend:
Removed from v.1627  
changed lines
  Added in v.1869
  ViewVC Help
Powered by ViewVC