/[svn]/libgig/trunk/src/gig.h

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

Parent Directory | Revision Log | View Patch Patch

-revision 16 by schoenebeck,
Sat Nov 29 14:56:16 2003 UTC
+revision 308 by schoenebeck,
Sun Nov 21 18:02:21 2004 UTC
 Line 2
   *                                                                         *
   *   libgig - C++ cross-platform Gigasampler format file loader library    *
   *                                                                         *
-  *   Copyright (C) 2003 by Christian Schoenebeck                           *
+  *   Copyright (C) 2003, 2004 by Christian Schoenebeck                     *
-  *                         <cuse@users.sourceforge.net>                    *
+  *                               <cuse@users.sourceforge.net>              *
   *                                                                         *
   *   This library is free software; you can redistribute it and/or modify  *
   *   it under the terms of the GNU General Public License as published by  *
 Line 63
  #define GIG_EG_CTR_ATTACK_INFLUENCE_EXTRACT(x)                  ((x >> 1) & 0x03)
  #define GIG_EG_CTR_DECAY_INFLUENCE_EXTRACT(x)                   ((x >> 3) & 0x03)
  #define GIG_EG_CTR_RELEASE_INFLUENCE_EXTRACT(x)                 ((x >> 5) & 0x03)
- //TODO: the transformation functions are not very accurate compared to the original ones
- #define GIG_VELOCITY_TRANSFORM_NONLINEAR(x,dynamic,scale)       ((1.0-1.0/pow(x,1.0/(129.0-x))) * (1.0+scale/20.0) + (5.0-dynamic)*pow(x/300.0* (1.0+2.0*scale/128.0),2))
- #define GIG_VELOCITY_TRANSFORM_LINEAR(x,dynamic,scale)          ((1.0+scale*3.0/128.0)/110.0*x+(5.0-dynamic)/5.0+(5.0-dynamic)*scale)
- #define GIG_VELOCITY_TRANSFORM_SPECIAL(x,dynamic,scale)         ((1.0+9.0*scale/129.0)*(1.0-1.0/pow(x,1.0/(129.0-x))+pow(3.0*x/pow(129,2),2)+pow((5.0-dynamic)*x/500.0,2)))
  /** Gigasampler specific classes and definitions */
  namespace gig {
-Line 168 
 namespace gig {
+Line 164 
 namespace gig {
          vcf_res_ctrl_genpurpose6 = 3            ///< General Purpose Controller 6 (Button, MIDI Controller 81)
      } vcf_res_ctrl_t;
-     /** Defines how attenuation (=gain / VCA) is controlled by. */
+     /**
-     typedef enum {
+      * Defines a controller that has a certain contrained influence on a
-         attenuation_ctrl_none              = 0x00,
+      * particular synthesis parameter (used to define attenuation controller,
-         attenuation_ctrl_modwheel          = 0x03, ///< Modulation Wheel (MIDI Controller 1)
+      * EG1 controller and EG2 controller).
-         attenuation_ctrl_breath            = 0x05, ///< Breath Controller (Coarse, MIDI Controller 2)
+      *
-         attenuation_ctrl_foot              = 0x07, ///< Foot Pedal (Coarse, MIDI Controller 4)
+      * You should use the respective <i>typedef</i> (means either
-         attenuation_ctrl_effect1           = 0x0d, ///< Effect Controller 1 (Coarse, MIDI Controller 12)
+      * attenuation_ctrl_t, eg1_ctrl_t or eg2_ctrl_t) in your code!
-         attenuation_ctrl_effect2           = 0x0f, ///< Effect Controller 2 (Coarse, MIDI Controller 13)
+      */
-         attenuation_ctrl_genpurpose1       = 0x11, ///< General Purpose Controller 1 (Slider, MIDI Controller 16)
+     struct leverage_ctrl_t {
-         attenuation_ctrl_genpurpose2       = 0x13, ///< General Purpose Controller 2 (Slider, MIDI Controller 17)
+         typedef enum {
-         attenuation_ctrl_genpurpose3       = 0x15, ///< General Purpose Controller 3 (Slider, MIDI Controller 18)
+             type_none              = 0x00, ///< No controller defined
-         attenuation_ctrl_genpurpose4       = 0x17, ///< General Purpose Controller 4 (Slider, MIDI Controller 19)
+             type_channelaftertouch = 0x2f, ///< Channel Key Pressure
-         attenuation_ctrl_portamentotime    = 0x0b, ///< Portamento Time (Coarse, MIDI Controller 5)
+             type_velocity          = 0xff, ///< Key Velocity
-         attenuation_ctrl_sustainpedal      = 0x01, ///< Sustain Pedal (MIDI Controller 64)
+             type_controlchange     = 0xfe  ///< Ordinary MIDI control change controller, see field 'controller_number'
-         attenuation_ctrl_portamento        = 0x19, ///< Portamento (MIDI Controller 65)
+         } type_t;
-         attenuation_ctrl_sostenutopedal    = 0x1b, ///< Sostenuto Pedal (MIDI Controller 66)
-         attenuation_ctrl_softpedal         = 0x09, ///< Soft Pedal (MIDI Controller 67)
+         type_t type;              ///< Controller type
-         attenuation_ctrl_genpurpose5       = 0x1d, ///< General Purpose Controller 5 (Button, MIDI Controller 80)
+         uint   controller_number; ///< MIDI controller number if this controller is a control change controller, 0 otherwise
-         attenuation_ctrl_genpurpose6       = 0x1f, ///< General Purpose Controller 6 (Button, MIDI Controller 81)
+     };
-         attenuation_ctrl_genpurpose7       = 0x21, ///< General Purpose Controller 7 (Button, MIDI Controller 82)
-         attenuation_ctrl_genpurpose8       = 0x23, ///< General Purpose Controller 8 (Button, MIDI Controller 83)
+     /**
-         attenuation_ctrl_effect1depth      = 0x25, ///< Effect 1 Depth (MIDI Controller 91)
+      * Defines controller influencing attenuation.
-         attenuation_ctrl_effect2depth      = 0x27, ///< Effect 2 Depth (MIDI Controller 92)
+      *
-         attenuation_ctrl_effect3depth      = 0x29, ///< Effect 3 Depth (MIDI Controller 93)
+      * @see leverage_ctrl_t
-         attenuation_ctrl_effect4depth      = 0x2b, ///< Effect 4 Depth (MIDI Controller 94)
+      */
-         attenuation_ctrl_effect5depth      = 0x2d, ///< Effect 5 Depth (MIDI Controller 95)
+     typedef leverage_ctrl_t attenuation_ctrl_t;
-         attenuation_ctrl_channelaftertouch = 0x2f, ///< Channel Key Pressure
-         attenuation_ctrl_velocity          = 0xff  ///< Key Velocity
+     /**
-     } attenuation_ctrl_t, eg1_ctrl_t, eg2_ctrl_t;
+      * Defines controller influencing envelope generator 1.
+      *
+      * @see leverage_ctrl_t
+      */
+     typedef leverage_ctrl_t eg1_ctrl_t;
+     /**
+      * Defines controller influencing envelope generator 2.
+      *
+      * @see leverage_ctrl_t
+      */
+     typedef leverage_ctrl_t eg2_ctrl_t;
      /**
       * Defines the type of dimension, that is how the dimension zones (and
-Line 282 
 namespace gig {
+Line 289 
 namespace gig {
          #endif // WORDS_BIGENDIAN
      };
+     /** Reflects the current playback state for a sample. */
+     struct playback_state_t {
+         unsigned long position;          ///< Current position within the sample.
+         bool          reverse;           ///< If playback direction is currently backwards (in case there is a pingpong or reverse loop defined).
+         unsigned long loop_cycles_left;  ///< How many times the loop has still to be passed, this value will be decremented with each loop cycle.
+     };
      // just symbol prototyping
      class File;
      class Instrument;
-Line 314 
 namespace gig {
+Line 328 
 namespace gig {
              bool               EG1Hold;                       ///< If <i>true</i>, Decay1 stage should be postponed until the sample reached the sample loop start.
              eg1_ctrl_t         EG1Controller;                 ///< MIDI Controller which has influence on sample amplitude EG parameters (attack, decay, release).
              bool               EG1ControllerInvert;           ///< Invert values coming from defined EG1 controller.
-             uint8_t            EG1ControllerAttackInfluence;  ///< Amount EG1 Controller has influence on the EG1 Attack time.
+             uint8_t            EG1ControllerAttackInfluence;  ///< Amount EG1 Controller has influence on the EG1 Attack time (0 - 3, where 0 means off).
-             uint8_t            EG1ControllerDecayInfluence;   ///< Amount EG1 Controller has influence on the EG1 Decay time.
+             uint8_t            EG1ControllerDecayInfluence;   ///< Amount EG1 Controller has influence on the EG1 Decay time (0 - 3, where 0 means off).
-             uint8_t            EG1ControllerReleaseInfluence; ///< Amount EG1 Controller has influence on the EG1 Release time.
+             uint8_t            EG1ControllerReleaseInfluence; ///< Amount EG1 Controller has influence on the EG1 Release time (0 - 3, where 0 means off).
              double             LFO1Frequency;                 ///< Frequency of the sample amplitude LFO (0.10 - 10.00 Hz).
              uint16_t           LFO1InternalDepth;             ///< Firm pitch of the sample amplitude LFO (0 - 1200 cents).
              uint16_t           LFO1ControlDepth;              ///< Controller depth influencing sample amplitude LFO pitch (0 - 1200 cents).
-Line 333 
 namespace gig {
+Line 347 
 namespace gig {
              double             EG2Release;                    ///< Release time of the filter cutoff EG (0.000 - 60.000s).
              eg2_ctrl_t         EG2Controller;                 ///< MIDI Controller which has influence on filter cutoff EG parameters (attack, decay, release).
              bool               EG2ControllerInvert;           ///< Invert values coming from defined EG2 controller.
-             uint8_t            EG2ControllerAttackInfluence;  ///< Amount EG2 Controller has influence on the EG2 Attack time.
+             uint8_t            EG2ControllerAttackInfluence;  ///< Amount EG2 Controller has influence on the EG2 Attack time (0 - 3, where 0 means off).
-             uint8_t            EG2ControllerDecayInfluence;   ///< Amount EG2 Controller has influence on the EG2 Decay time.
+             uint8_t            EG2ControllerDecayInfluence;   ///< Amount EG2 Controller has influence on the EG2 Decay time (0 - 3, where 0 means off).
-             uint8_t            EG2ControllerReleaseInfluence; ///< Amount EG2 Controller has influence on the EG2 Release time.
+             uint8_t            EG2ControllerReleaseInfluence; ///< Amount EG2 Controller has influence on the EG2 Release time (0 - 3, where 0 means off).
              double             LFO2Frequency;                 ///< Frequency of the filter cutoff LFO (0.10 - 10.00 Hz).
              uint16_t           LFO2InternalDepth;             ///< Firm pitch of the filter cutoff LFO (0 - 1200 cents).
              uint16_t           LFO2ControlDepth;              ///< Controller depth influencing filter cutoff LFO pitch (0 - 1200).
-Line 364 
 namespace gig {
+Line 378 
 namespace gig {
              bool               VCFKeyboardTracking;           ///< If <i>true</i>: VCF cutoff frequence will be dependend to the note key position relative to the defined breakpoint value.
              uint8_t            VCFKeyboardTrackingBreakpoint; ///< See VCFKeyboardTracking (0 - 127).
              // Key Velocity Transformations
-             curve_type_t       VelocityResponseCurve;         ///< Defines a transformation curve to the incoming velocity values affecting amplitude.
+             curve_type_t       VelocityResponseCurve;         ///< Defines a transformation curve to the incoming velocity values affecting amplitude (usually you don't have to interpret this parameter, use GetVelocityAttenuation() instead).
-             uint8_t            VelocityResponseDepth;         ///< Dynamic range of velocity affecting amplitude (0 - 4).
+             uint8_t            VelocityResponseDepth;         ///< Dynamic range of velocity affecting amplitude (0 - 4) (usually you don't have to interpret this parameter, use GetVelocityAttenuation() instead).
-             uint8_t            VelocityResponseCurveScaling;  ///< 0 - 127
+             uint8_t            VelocityResponseCurveScaling;  ///< 0 - 127 (usually you don't have to interpret this parameter, use GetVelocityAttenuation() instead)
              curve_type_t       ReleaseVelocityResponseCurve;  ///< Defines a transformation curve to the incoming release veloctiy values affecting envelope times.
              uint8_t            ReleaseVelocityResponseDepth;  ///< Dynamic range of release velocity affecting envelope time (0 - 4).
              uint8_t            ReleaseTriggerDecay;           ///< 0 - 8
-Line 376 
 namespace gig {
+Line 390 
 namespace gig {
              dim_bypass_ctrl_t  DimensionBypass;               ///< If defined, the MIDI controller can switch on/off the dimension in realtime.
              int8_t             Pan;                           ///< Panorama / Balance (-64..0..63 <-> left..middle..right)
              bool               SelfMask;                      ///< If <i>true</i>: high velocity notes will stop low velocity notes at the same note, with that you can save voices that wouldn't be audible anyway.
-             attenuation_ctrl_t AttenuationControl;            ///< MIDI Controller which has influence on the volume level of the sample (or entire sample group).
+             attenuation_ctrl_t AttenuationController;         ///< MIDI Controller which has influence on the volume level of the sample (or entire sample group).
-             bool               InvertAttenuationControl;      ///< Inverts the values coming from the defined Attenuation Controller.
+             bool               InvertAttenuationController;   ///< Inverts the values coming from the defined Attenuation Controller.
-             uint8_t            AttenuationControlTreshold;    ///< 0-127
+             uint8_t            AttenuationControllerThreshold;///< 0-127
              uint8_t            ChannelOffset;                 ///< Audio output where the audio signal of the dimension region should be routed to (0 - 9).
              bool               SustainDefeat;                 ///< If <i>true</i>: Sustain pedal will not hold a note.
              bool               MSDecode;                      ///< Gigastudio flag: defines if Mid Side Recordings should be decoded.
-Line 397 
 namespace gig {
+Line 411 
 namespace gig {
             ~DimensionRegion();
              friend class Region;
          private:
+             typedef enum { ///< Used to decode attenuation, EG1 and EG2 controller
+                 _lev_ctrl_none              = 0x00,
+                 _lev_ctrl_modwheel          = 0x03, ///< Modulation Wheel (MIDI Controller 1)
+                 _lev_ctrl_breath            = 0x05, ///< Breath Controller (Coarse, MIDI Controller 2)
+                 _lev_ctrl_foot              = 0x07, ///< Foot Pedal (Coarse, MIDI Controller 4)
+                 _lev_ctrl_effect1           = 0x0d, ///< Effect Controller 1 (Coarse, MIDI Controller 12)
+                 _lev_ctrl_effect2           = 0x0f, ///< Effect Controller 2 (Coarse, MIDI Controller 13)
+                 _lev_ctrl_genpurpose1       = 0x11, ///< General Purpose Controller 1 (Slider, MIDI Controller 16)
+                 _lev_ctrl_genpurpose2       = 0x13, ///< General Purpose Controller 2 (Slider, MIDI Controller 17)
+                 _lev_ctrl_genpurpose3       = 0x15, ///< General Purpose Controller 3 (Slider, MIDI Controller 18)
+                 _lev_ctrl_genpurpose4       = 0x17, ///< General Purpose Controller 4 (Slider, MIDI Controller 19)
+                 _lev_ctrl_portamentotime    = 0x0b, ///< Portamento Time (Coarse, MIDI Controller 5)
+                 _lev_ctrl_sustainpedal      = 0x01, ///< Sustain Pedal (MIDI Controller 64)
+                 _lev_ctrl_portamento        = 0x19, ///< Portamento (MIDI Controller 65)
+                 _lev_ctrl_sostenutopedal    = 0x1b, ///< Sostenuto Pedal (MIDI Controller 66)
+                 _lev_ctrl_softpedal         = 0x09, ///< Soft Pedal (MIDI Controller 67)
+                 _lev_ctrl_genpurpose5       = 0x1d, ///< General Purpose Controller 5 (Button, MIDI Controller 80)
+                 _lev_ctrl_genpurpose6       = 0x1f, ///< General Purpose Controller 6 (Button, MIDI Controller 81)
+                 _lev_ctrl_genpurpose7       = 0x21, ///< General Purpose Controller 7 (Button, MIDI Controller 82)
+                 _lev_ctrl_genpurpose8       = 0x23, ///< General Purpose Controller 8 (Button, MIDI Controller 83)
+                 _lev_ctrl_effect1depth      = 0x25, ///< Effect 1 Depth (MIDI Controller 91)
+                 _lev_ctrl_effect2depth      = 0x27, ///< Effect 2 Depth (MIDI Controller 92)
+                 _lev_ctrl_effect3depth      = 0x29, ///< Effect 3 Depth (MIDI Controller 93)
+                 _lev_ctrl_effect4depth      = 0x2b, ///< Effect 4 Depth (MIDI Controller 94)
+                 _lev_ctrl_effect5depth      = 0x2d, ///< Effect 5 Depth (MIDI Controller 95)
+                 _lev_ctrl_channelaftertouch = 0x2f, ///< Channel Key Pressure
+                 _lev_ctrl_velocity          = 0xff  ///< Key Velocity
+             } _lev_ctrl_t;
              typedef std::map<uint32_t, double*> VelocityTableMap;
              static uint              Instances;                  ///< Number of DimensionRegion instances.
              static VelocityTableMap* pVelocityTables;            ///< Contains the tables corresponding to the various velocity parameters (VelocityResponseCurve and VelocityResponseDepth).
              double*                  pVelocityAttenuationTable;  ///< Points to the velocity table corresponding to the velocity parameters of this DimensionRegion.
+             leverage_ctrl_t DecodeLeverageController(_lev_ctrl_t EncodedController);
+             double* CreateVelocityTable(curve_type_t curveType, uint8_t depth, uint8_t scaling);
      };
      /** Encapsulates sample waves used for playback. */
-Line 412 
 namespace gig {
+Line 457 
 namespace gig {
              uint32_t       Product;           ///< Specifies the MIDI model ID defined by the manufacturer corresponding to the Manufacturer field. If no particular manufacturer's product is to be specified, a value of 0 should be used.
              uint32_t       SamplePeriod;      ///< Specifies the duration of time that passes during the playback of one sample in nanoseconds (normally equal to 1 / Samplers Per Second, where Samples Per Second is the value found in the format chunk).
              uint32_t       MIDIUnityNote;     ///< Specifies the musical note at which the sample will be played at it's original sample rate.
-             uint32_t       MIDIPitchFraction; ///< Specifies the fraction of a semitone up from the specified MIDI unity note field. A value of 0x80000000 means 1/2 semitone (50 cents) and a value of 0x00000000 means no fine tuning between semitones.
+             uint32_t       FineTune;          ///< Specifies the fraction of a semitone up from the specified MIDI unity note field. A value of 0x80000000 means 1/2 semitone (50 cents) and a value of 0x00000000 means no fine tuning between semitones.
              smpte_format_t SMPTEFormat;       ///< Specifies the Society of Motion Pictures and Television E time format used in the following <i>SMPTEOffset</i> field. If a value of 0 is set, <i>SMPTEOffset</i> should also be set to 0.
              uint32_t       SMPTEOffset;       ///< The SMPTE Offset value specifies the time offset to be used for the synchronization / calibration to the first sample in the waveform. This value uses a format of 0xhhmmssff where hh is a signed value that specifies the number of hours (-23 to 23), mm is an unsigned value that specifies the number of minutes (0 to 59), ss is an unsigned value that specifies the number of seconds (0 to 59) and ff is an unsigned value that specifies the number of frames (0 to -1).
              uint32_t       Loops;             ///< Number of defined sample loops (so far only seen single loops in gig files - please report me if you encounter more!).
-             uint32_t       LoopID;            ///< Specifies the unique ID that corresponds to one of the defined cue points in the cue point list (only if Loops > 0).
+             uint32_t       LoopID;            ///< Specifies the unique ID that corresponds to one of the defined cue points in the cue point list (only if Loops > 0), as the Gigasampler format only allows one loop definition at the moment, this attribute isn't really useful for anything.
              loop_type_t    LoopType;          ///< The type field defines how the waveform samples will be looped (only if Loops > 0).
-             uint32_t       LoopStart;         ///< The start value specifies the byte offset into the waveform data of the first sample to be played in the loop (only if Loops > 0).
+             uint32_t       LoopStart;         ///< The start value specifies the offset (in sample points) in the waveform data of the first sample to be played in the loop (only if Loops > 0).
-             uint32_t       LoopEnd;           ///< The end value specifies the byte offset into the waveform data of the last sample to be played in the loop (only if Loops > 0).
+             uint32_t       LoopEnd;           ///< The end value specifies the offset (in sample points) in the waveform data which represents the end of the loop (only if Loops > 0).
+             uint32_t       LoopSize;          ///< Length of the looping area (in sample points) which is equivalent to <i>LoopEnd - LoopStart</i>.
              uint32_t       LoopFraction;      ///< The fractional value specifies a fraction of a sample at which to loop (only if Loops > 0). This allows a loop to be fine tuned at a resolution greater than one sample. A value of 0 means no fraction, a value of 0x80000000 means 1/2 of a sample length. 0xFFFFFFFF is the smallest fraction of a sample that can be represented.
              uint32_t       LoopPlayCount;     ///< Number of times the loop should be played (only if Loops > 0, a value of 0 = infinite).
              bool           Compressed;        ///< If the sample wave is compressed (probably just interesting for instrument and sample editors, as this library already handles the decompression in it's sample access methods anyway).
-Line 435 
 namespace gig {
+Line 481 
 namespace gig {
              unsigned long SetPos(unsigned long SampleCount, RIFF::stream_whence_t Whence = RIFF::stream_start);
              unsigned long GetPos();
              unsigned long Read(void* pBuffer, unsigned long SampleCount);
+             unsigned long ReadAndLoop(void* pBuffer, unsigned long SampleCount, playback_state_t* pPlaybackState);
          protected:
              static unsigned int  Instances;               ///< Number of instances of class Sample.
              static unsigned long DecompressionBufferSize; ///< Current size of the decompression buffer.
-Line 446 
 namespace gig {
+Line 493 
 namespace gig {
              Sample(File* pFile, RIFF::List* waveList, unsigned long WavePoolOffset);
             ~Sample();
+             /**
+              * Swaps the order of the data words in the given memory area
+              * with a granularity given by \a WordSize.
+              *
+              * @param pData    - pointer to the memory area to be swapped
+              * @param AreaSize - size of the memory area to be swapped (in bytes)
+              * @param WordSize - size of the data words (in bytes)
+              */
+             inline void SwapMemoryArea(void* pData, unsigned long AreaSize, uint WordSize) {
+                 switch (WordSize) { // TODO: unefficient
+                     case 1: {
+                         uint8_t* pDst = (uint8_t*) pData;
+                         uint8_t  cache;
+                         unsigned long lo = 0, hi = AreaSize - 1;
+                         for (; lo < hi; hi--, lo++) {
+                             cache    = pDst[lo];
+                             pDst[lo] = pDst[hi];
+                             pDst[hi] = cache;
+                         }
+                         break;
+                     }
+                     case 2: {
+                         uint16_t* pDst = (uint16_t*) pData;
+                         uint16_t  cache;
+                         unsigned long lo = 0, hi = (AreaSize >> 1) - 1;
+                         for (; lo < hi; hi--, lo++) {
+                             cache    = pDst[lo];
+                             pDst[lo] = pDst[hi];
+                             pDst[hi] = cache;
+                         }
+                         break;
+                     }
+                     case 4: {
+                         uint32_t* pDst = (uint32_t*) pData;
+                         uint32_t  cache;
+                         unsigned long lo = 0, hi = (AreaSize >> 2) - 1;
+                         for (; lo < hi; hi--, lo++) {
+                             cache    = pDst[lo];
+                             pDst[lo] = pDst[hi];
+                             pDst[hi] = cache;
+                         }
+                         break;
+                     }
+                     default: {
+                         uint8_t* pCache = new uint8_t[WordSize]; // TODO: unefficient
+                         unsigned long lo = 0, hi = AreaSize - WordSize;
+                         for (; lo < hi; hi -= WordSize, lo += WordSize) {
+                             memcpy(pCache, (uint8_t*) pData + lo, WordSize);
+                             memcpy((uint8_t*) pData + lo, (uint8_t*) pData + hi, WordSize);
+                             memcpy((uint8_t*) pData + hi, pCache, WordSize);
+                         }
+                         delete[] pCache;
+                         break;
+                     }
+                 }
+             }
+             inline long Min(long A, long B) {
+                 return (A > B) ? B : A;
+             }
+             inline long Abs(long val) { return (val > 0) ? val : -val; }
          private:
              void ScanCompressedSample();
              friend class File;
-Line 460 
 namespace gig {
+Line 567 
 namespace gig {
              dimension_def_t         pDimensionDefinitions[5]; ///< Defines the five possible dimensions (the dimension's controller and number of bits/splits).
              uint32_t                DimensionRegions;         ///< Total number of DimensionRegions this Region contains.
              DimensionRegion*        pDimensionRegions[32];    ///< Pointer array to the 32 possible dimension regions (reflects NULL for dimension regions not in use). Avoid to access the array directly and better use GetDimensionRegionByValue() instead, but of course in some cases it makes sense to use the array (e.g. iterating through all DimensionRegions).
+             unsigned int            Layers;                   ///< Amount of defined layers (1 - 32). A value of 1 actually means no layering, a value > 1 means there is Layer dimension. The same information can of course also be obtained by accessing pDimensionDefinitions.
              DimensionRegion* GetDimensionRegionByValue(uint Dim4Val, uint Dim3Val, uint Dim2Val, uint Dim1Val, uint Dim0Val);
              DimensionRegion* GetDimensionRegionByBit(uint8_t Dim4Bit, uint8_t Dim3Bit, uint8_t Dim2Bit, uint8_t Dim1Bit, uint8_t Dim0Bit);
-Line 532 
 namespace gig {
+Line 640 
 namespace gig {
              Sample*     GetNextSample();      ///< Returns a pointer to the next <i>Sample</i> object of the file, <i>NULL</i> otherwise.
              Instrument* GetFirstInstrument(); ///< Returns a pointer to the first <i>Instrument</i> object of the file, <i>NULL</i> otherwise.
              Instrument* GetNextInstrument();  ///< Returns a pointer to the next <i>Instrument</i> object of the file, <i>NULL</i> otherwise.
+             Instrument* GetInstrument(uint index);
             ~File() {};
          protected:
              typedef std::list<Sample*>     SampleList;

 Legend:



Removed from v.16
 


changed lines


 
Added in v.308
 Legend:



Removed from v.16
 


changed lines


 
Added in v.308
-Removed from v.16
+Added in v.308

	ViewVC Help
Powered by ViewVC