/[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 1524 by schoenebeck, Sun Nov 25 17:29:37 2007 UTC revision 1713 by persson, Thu Mar 6 20:42:22 2008 UTC
# 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 2923  namespace { Line 2924  namespace {
2924      }      }
2925    
2926    
2927    // *************** MidiRule ***************
2928    // *
2929    
2930    MidiRuleCtrlTrigger::MidiRuleCtrlTrigger(RIFF::Chunk* _3ewg) {
2931        _3ewg->SetPos(36);
2932        Triggers = _3ewg->ReadUint8();
2933        _3ewg->SetPos(40);
2934        ControllerNumber = _3ewg->ReadUint8();
2935        _3ewg->SetPos(46);
2936        for (int i = 0 ; i < Triggers ; i++) {
2937            pTriggers[i].TriggerPoint = _3ewg->ReadUint8();
2938            pTriggers[i].Descending = _3ewg->ReadUint8();
2939            pTriggers[i].VelSensitivity = _3ewg->ReadUint8();
2940            pTriggers[i].Key = _3ewg->ReadUint8();
2941            pTriggers[i].NoteOff = _3ewg->ReadUint8();
2942            pTriggers[i].Velocity = _3ewg->ReadUint8();
2943            pTriggers[i].OverridePedal = _3ewg->ReadUint8();
2944            _3ewg->ReadUint8();
2945        }
2946    }
2947    
2948    
2949  // *************** Instrument ***************  // *************** Instrument ***************
2950  // *  // *
# Line 2944  namespace { Line 2966  namespace {
2966          PianoReleaseMode = false;          PianoReleaseMode = false;
2967          DimensionKeyRange.low = 0;          DimensionKeyRange.low = 0;
2968          DimensionKeyRange.high = 0;          DimensionKeyRange.high = 0;
2969            pMidiRules = new MidiRule*[3];
2970            pMidiRules[0] = NULL;
2971    
2972          // Loading          // Loading
2973          RIFF::List* lart = insList->GetSubList(LIST_TYPE_LART);          RIFF::List* lart = insList->GetSubList(LIST_TYPE_LART);
# Line 2958  namespace { Line 2982  namespace {
2982                  PianoReleaseMode       = dimkeystart & 0x01;                  PianoReleaseMode       = dimkeystart & 0x01;
2983                  DimensionKeyRange.low  = dimkeystart >> 1;                  DimensionKeyRange.low  = dimkeystart >> 1;
2984                  DimensionKeyRange.high = _3ewg->ReadUint8();                  DimensionKeyRange.high = _3ewg->ReadUint8();
2985    
2986                    if (_3ewg->GetSize() > 32) {
2987                        // read MIDI rules
2988                        int i = 0;
2989                        _3ewg->SetPos(32);
2990                        uint8_t id1 = _3ewg->ReadUint8();
2991                        uint8_t id2 = _3ewg->ReadUint8();
2992    
2993                        if (id1 == 4 && id2 == 16) {
2994                            pMidiRules[i++] = new MidiRuleCtrlTrigger(_3ewg);
2995                        }
2996                        //TODO: all the other types of rules
2997    
2998                        pMidiRules[i] = NULL;
2999                    }
3000              }              }
3001          }          }
3002    
# Line 2994  namespace { Line 3033  namespace {
3033      }      }
3034    
3035      Instrument::~Instrument() {      Instrument::~Instrument() {
3036            delete[] pMidiRules;
3037      }      }
3038    
3039      /**      /**
# Line 3108  namespace { Line 3148  namespace {
3148          UpdateRegionKeyTable();          UpdateRegionKeyTable();
3149      }      }
3150    
3151        /**
3152         * Returns a MIDI rule of the instrument.
3153         *
3154         * The list of MIDI rules, at least in gig v3, always contains at
3155         * most two rules. The second rule can only be the DEF filter
3156         * (which currently isn't supported by libgig).
3157         *
3158         * @param i - MIDI rule number
3159         * @returns   pointer address to MIDI rule number i or NULL if there is none
3160         */
3161        MidiRule* Instrument::GetMidiRule(int i) {
3162            return pMidiRules[i];
3163        }
3164    
3165    
3166  // *************** Group ***************  // *************** Group ***************
# Line 3351  namespace { Line 3404  namespace {
3404          pSamples->erase(iter);          pSamples->erase(iter);
3405          delete pSample;          delete pSample;
3406    
3407            SampleList::iterator tmp = SamplesIterator;
3408          // remove all references to the sample          // remove all references to the sample
3409          for (Instrument* instrument = GetFirstInstrument() ; instrument ;          for (Instrument* instrument = GetFirstInstrument() ; instrument ;
3410               instrument = GetNextInstrument()) {               instrument = GetNextInstrument()) {
# Line 3365  namespace { Line 3419  namespace {
3419                  }                  }
3420              }              }
3421          }          }
3422            SamplesIterator = tmp; // restore iterator
3423      }      }
3424    
3425      void File::LoadSamples() {      void File::LoadSamples() {
Legend:
Removed from v.1524  
changed lines
  Added in v.1713
  ViewVC Help
Powered by ViewVC