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

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

Parent Directory | Revision Log | View Patch Patch

-revision 2599 by schoenebeck,
Sat Jun  7 00:00:10 2014 UTC
+revision 3645 by schoenebeck,
Sun Dec  8 22:59:11 2019 UTC
 Line 2
   *                                                                         *
   *   libgig - C++ cross-platform Gigasampler format file access library    *
   *                                                                         *
-  *   Copyright (C) 2003-2014 by Christian Schoenebeck                      *
+  *   Copyright (C) 2003-2019 by Christian Schoenebeck                      *
   *                              <cuse@users.sourceforge.net>               *
   *                                                                         *
   *   This library is free software; you can redistribute it and/or modify  *
 Line 27
  #include "DLS.h"
  #include <vector>
+ #ifndef __has_feature
+ # define __has_feature(x) 0
+ #endif
+ #ifndef HAVE_RTTI
+ # if __GXX_RTTI || __has_feature(cxx_rtti) || _CPPRTTI
+ #  define HAVE_RTTI 1
+ # else
+ #  define HAVE_RTTI 0
+ # endif
+ #endif
+ #if HAVE_RTTI
+ # include <typeinfo>
+ #else
+ # warning No RTTI available!
+ #endif
  #if WORDS_BIGENDIAN
  # define LIST_TYPE_3PRG 0x33707267
  # define LIST_TYPE_3EWL 0x3365776C
-Line 45
+Line 61
  # define CHUNK_ID_SCRI  0x53637269 // own gig format extension
  # define CHUNK_ID_LSNM  0x4c534e4d // own gig format extension
  # define CHUNK_ID_SCSL  0x5343534c // own gig format extension
+ # define CHUNK_ID_LSDE  0x4c534445 // own gig format extension
  #else  // little endian
  # define LIST_TYPE_3PRG 0x67727033
  # define LIST_TYPE_3EWL 0x6C776533
-Line 63
+Line 80
  # define CHUNK_ID_SCRI  0x69726353 // own gig format extension
  # define CHUNK_ID_LSNM  0x4d4e534c // own gig format extension
  # define CHUNK_ID_SCSL  0x4c534353 // own gig format extension
+ # define CHUNK_ID_LSDE  0x4544534c // own gig format extension
  #endif // WORDS_BIGENDIAN
- /** Gigasampler specific classes and definitions */
+ #ifndef GIG_DECLARE_ENUM
+ # define GIG_DECLARE_ENUM(type, ...) enum type { __VA_ARGS__ }
+ #endif
+ // just symbol prototyping (since Serialization.h not included by default here)
+ namespace Serialization { class Archive; }
+ /** Gigasampler/GigaStudio specific classes and definitions */
  namespace gig {
      typedef std::string String;
+     typedef RIFF::progress_t progress_t;
+     typedef RIFF::file_offset_t file_offset_t;
      /** Lower and upper limit of a range. */
      struct range_t {
-Line 79 
 namespace gig {
+Line 106 
 namespace gig {
      /** Pointer address and size of a buffer. */
      struct buffer_t {
          void*         pStart;            ///< Points to the beginning of the buffer.
-         unsigned long Size;              ///< Size of the actual data in the buffer in bytes.
+         file_offset_t Size;              ///< Size of the actual data in the buffer in bytes.
-         unsigned long NullExtensionSize; ///< The buffer might be bigger than the actual data, if that's the case that unused space at the end of the buffer is filled with NULLs and NullExtensionSize reflects that unused buffer space in bytes. Those NULL extensions are mandatory for differential algorithms that have to take the following data words into account, thus have to access past the buffer's boundary. If you don't know what I'm talking about, just forget this variable. :)
+         file_offset_t NullExtensionSize; ///< The buffer might be bigger than the actual data, if that's the case that unused space at the end of the buffer is filled with NULLs and NullExtensionSize reflects that unused buffer space in bytes. Those NULL extensions are mandatory for differential algorithms that have to take the following data words into account, thus have to access past the buffer's boundary. If you don't know what I'm talking about, just forget this variable. :)
          buffer_t() {
              pStart            = NULL;
              Size              = 0;
-Line 88 
 namespace gig {
+Line 115 
 namespace gig {
          }
      };
-     /** Standard types of sample loops. */
+     /** Standard types of sample loops.
-     typedef enum {
+      *
-         loop_type_normal        = 0x00000000,  ///< Loop forward (normal)
+      * @see enumCount(), enumKey(), enumKeys(), enumValue()
-         loop_type_bidirectional = 0x00000001,  ///< Alternating loop (forward/backward, also known as Ping Pong)
+      */
-         loop_type_backward      = 0x00000002   ///< Loop backward (reverse)
+     GIG_DECLARE_ENUM(loop_type_t,
-     } loop_type_t;
+         loop_type_normal        = 0x00000000,  /**< Loop forward (normal) */
+         loop_type_bidirectional = 0x00000001,  /**< Alternating loop (forward/backward, also known as Ping Pong) */
-     /** Society of Motion Pictures and Television E time format. */
+         loop_type_backward      = 0x00000002   /**< Loop backward (reverse) */
-     typedef enum {
+     );
-         smpte_format_no_offset          = 0x00000000,  ///< no SMPTE offset
-         smpte_format_24_frames          = 0x00000018,  ///< 24 frames per second
+     /** Society of Motion Pictures and Television E time format.
-         smpte_format_25_frames          = 0x00000019,  ///< 25 frames per second
+      *
-         smpte_format_30_frames_dropping = 0x0000001D,  ///< 30 frames per second with frame dropping (30 drop)
+      * @see enumCount(), enumKey(), enumKeys(), enumValue()
-         smpte_format_30_frames          = 0x0000001E   ///< 30 frames per second
+      */
-     } smpte_format_t;
+     GIG_DECLARE_ENUM(smpte_format_t,
+         smpte_format_no_offset          = 0x00000000,  /**< no SMPTE offset */
-     /** Defines the shape of a function graph. */
+         smpte_format_24_frames          = 0x00000018,  /**< 24 frames per second */
-     typedef enum {
+         smpte_format_25_frames          = 0x00000019,  /**< 25 frames per second */
-         curve_type_nonlinear = 0,
+         smpte_format_30_frames_dropping = 0x0000001D,  /**< 30 frames per second with frame dropping (30 drop) */
-         curve_type_linear    = 1,
+         smpte_format_30_frames          = 0x0000001E   /**< 30 frames per second */
-         curve_type_special   = 2,
+     );
-         curve_type_unknown   = 0xffffffff
-     } curve_type_t;
+     /** Defines the shape of a function graph.
+      *
-     /** Dimensions allow to bypass one of the following controllers. */
+      * @see enumCount(), enumKey(), enumKeys(), enumValue()
-     typedef enum {
+      */
-         dim_bypass_ctrl_none,
+     GIG_DECLARE_ENUM(curve_type_t,
-         dim_bypass_ctrl_94,   ///< Effect 4 Depth (MIDI Controller 94)
+         curve_type_nonlinear = 0,          /**< Non-linear curve type. */
-         dim_bypass_ctrl_95    ///< Effect 5 Depth (MIDI Controller 95)
+         curve_type_linear    = 1,          /**< Linear curve type. */
-     } dim_bypass_ctrl_t;
+         curve_type_special   = 2,          /**< Special curve type. */
+         curve_type_unknown   = 0xffffffff  /**< Unknown curve type. */
-     /** Defines how LFO3 is controlled by. */
+     );
-     typedef enum {
-         lfo3_ctrl_internal            = 0x00, ///< Only internally controlled.
+     /** Defines the wave form type used by an LFO (gig format extension).
-         lfo3_ctrl_modwheel            = 0x01, ///< Only controlled by external modulation wheel.
+      *
-         lfo3_ctrl_aftertouch          = 0x02, ///< Only controlled by aftertouch controller.
+      * This is a gig format extension. The original Gigasampler/GigaStudio
-         lfo3_ctrl_internal_modwheel   = 0x03, ///< Controlled internally and by external modulation wheel.
+      * software always used a sine (sinus) wave form for all its 3 LFOs, so this
-         lfo3_ctrl_internal_aftertouch = 0x04  ///< Controlled internally and by aftertouch controller.
+      * was not configurable in the original gig format. Accordingly setting any
-     } lfo3_ctrl_t;
+      * other wave form than sine (sinus) will be ignored by the original
+      * Gigasampler/GigaStudio software.
-     /** Defines how LFO2 is controlled by. */
+      *
-     typedef enum {
+      * @see enumCount(), enumKey(), enumKeys(), enumValue()
-         lfo2_ctrl_internal            = 0x00, ///< Only internally controlled.
+      */
-         lfo2_ctrl_modwheel            = 0x01, ///< Only controlled by external modulation wheel.
+     GIG_DECLARE_ENUM(lfo_wave_t,
-         lfo2_ctrl_foot                = 0x02, ///< Only controlled by external foot controller.
+         lfo_wave_sine     = 0,  /**< Sine (sinus) wave form (this is the default wave form). */
-         lfo2_ctrl_internal_modwheel   = 0x03, ///< Controlled internally and by external modulation wheel.
+         lfo_wave_triangle = 1,  /**< Triangle wave form. */
-         lfo2_ctrl_internal_foot       = 0x04  ///< Controlled internally and by external foot controller.
+         lfo_wave_saw      = 2,  /**< Saw (up) wave form (saw down wave form can be achieved by flipping the phase). */
-     } lfo2_ctrl_t;
+         lfo_wave_square   = 3,  /**< Square wave form. */
+     );
-     /** Defines how LFO1 is controlled by. */
-     typedef enum {
+     /** Dimensions allow to bypass one of the following controllers.
-         lfo1_ctrl_internal            = 0x00, ///< Only internally controlled.
+      *
-         lfo1_ctrl_modwheel            = 0x01, ///< Only controlled by external modulation wheel.
+      * @see enumCount(), enumKey(), enumKeys(), enumValue()
-         lfo1_ctrl_breath              = 0x02, ///< Only controlled by external breath controller.
+      */
-         lfo1_ctrl_internal_modwheel   = 0x03, ///< Controlled internally and by external modulation wheel.
+     GIG_DECLARE_ENUM(dim_bypass_ctrl_t,
-         lfo1_ctrl_internal_breath     = 0x04  ///< Controlled internally and by external breath controller.
+         dim_bypass_ctrl_none, /**< No controller bypass. */
-     } lfo1_ctrl_t;
+         dim_bypass_ctrl_94,   /**< Effect 4 Depth (MIDI Controller 94) */
+         dim_bypass_ctrl_95    /**< Effect 5 Depth (MIDI Controller 95) */
-     /** Defines how the filter cutoff frequency is controlled by. */
+     );
-     typedef enum {
-         vcf_cutoff_ctrl_none         = 0x00,
+     /** Defines how LFO3 is controlled by.
-         vcf_cutoff_ctrl_none2        = 0x01,  ///< The difference between none and none2 is unknown
+      *
-         vcf_cutoff_ctrl_modwheel     = 0x81,  ///< Modulation Wheel (MIDI Controller 1)
+      * @see enumCount(), enumKey(), enumKeys(), enumValue()
-         vcf_cutoff_ctrl_effect1      = 0x8c,  ///< Effect Controller 1 (Coarse, MIDI Controller 12)
+      */
-         vcf_cutoff_ctrl_effect2      = 0x8d,  ///< Effect Controller 2 (Coarse, MIDI Controller 13)
+     GIG_DECLARE_ENUM(lfo3_ctrl_t,
-         vcf_cutoff_ctrl_breath       = 0x82,  ///< Breath Controller (Coarse, MIDI Controller 2)
+         lfo3_ctrl_internal            = 0x00, /**< Only internally controlled. */
-         vcf_cutoff_ctrl_foot         = 0x84,  ///< Foot Pedal (Coarse, MIDI Controller 4)
+         lfo3_ctrl_modwheel            = 0x01, /**< Only controlled by external modulation wheel. */
-         vcf_cutoff_ctrl_sustainpedal = 0xc0,  ///< Sustain Pedal (MIDI Controller 64)
+         lfo3_ctrl_aftertouch          = 0x02, /**< Only controlled by aftertouch controller. */
-         vcf_cutoff_ctrl_softpedal    = 0xc3,  ///< Soft Pedal (MIDI Controller 67)
+         lfo3_ctrl_internal_modwheel   = 0x03, /**< Controlled internally and by external modulation wheel. */
-         vcf_cutoff_ctrl_genpurpose7  = 0xd2,  ///< General Purpose Controller 7 (Button, MIDI Controller 82)
+         lfo3_ctrl_internal_aftertouch = 0x04  /**< Controlled internally and by aftertouch controller. */
-         vcf_cutoff_ctrl_genpurpose8  = 0xd3,  ///< General Purpose Controller 8 (Button, MIDI Controller 83)
+     );
-         vcf_cutoff_ctrl_aftertouch   = 0x80   ///< Key Pressure
-     } vcf_cutoff_ctrl_t;
+     /** Defines how LFO2 is controlled by.
+      *
-     /** Defines how the filter resonance is controlled by. */
+      * @see enumCount(), enumKey(), enumKeys(), enumValue()
-     typedef enum {
+      */
-         vcf_res_ctrl_none        = 0xffffffff,
+     GIG_DECLARE_ENUM(lfo2_ctrl_t,
-         vcf_res_ctrl_genpurpose3 = 0,           ///< General Purpose Controller 3 (Slider, MIDI Controller 18)
+         lfo2_ctrl_internal            = 0x00, /**< Only internally controlled. */
-         vcf_res_ctrl_genpurpose4 = 1,           ///< General Purpose Controller 4 (Slider, MIDI Controller 19)
+         lfo2_ctrl_modwheel            = 0x01, /**< Only controlled by external modulation wheel. */
-         vcf_res_ctrl_genpurpose5 = 2,           ///< General Purpose Controller 5 (Button, MIDI Controller 80)
+         lfo2_ctrl_foot                = 0x02, /**< Only controlled by external foot controller. */
-         vcf_res_ctrl_genpurpose6 = 3            ///< General Purpose Controller 6 (Button, MIDI Controller 81)
+         lfo2_ctrl_internal_modwheel   = 0x03, /**< Controlled internally and by external modulation wheel. */
-     } vcf_res_ctrl_t;
+         lfo2_ctrl_internal_foot       = 0x04  /**< Controlled internally and by external foot controller. */
+     );
+     /** Defines how LFO1 is controlled by.
+      *
+      * @see enumCount(), enumKey(), enumKeys(), enumValue()
+      */
+     GIG_DECLARE_ENUM(lfo1_ctrl_t,
+         lfo1_ctrl_internal            = 0x00, /**< Only internally controlled. */
+         lfo1_ctrl_modwheel            = 0x01, /**< Only controlled by external modulation wheel. */
+         lfo1_ctrl_breath              = 0x02, /**< Only controlled by external breath controller. */
+         lfo1_ctrl_internal_modwheel   = 0x03, /**< Controlled internally and by external modulation wheel. */
+         lfo1_ctrl_internal_breath     = 0x04  /**< Controlled internally and by external breath controller. */
+     );
+     /** Defines how the filter cutoff frequency is controlled by.
+      *
+      * @see enumCount(), enumKey(), enumKeys(), enumValue()
+      */
+     GIG_DECLARE_ENUM(vcf_cutoff_ctrl_t,
+         vcf_cutoff_ctrl_none         = 0x00,  /**< No MIDI controller assigned for filter cutoff frequency. */
+         vcf_cutoff_ctrl_none2        = 0x01,  /**< The difference between none and none2 is unknown */
+         vcf_cutoff_ctrl_modwheel     = 0x81,  /**< Modulation Wheel (MIDI Controller 1) */
+         vcf_cutoff_ctrl_effect1      = 0x8c,  /**< Effect Controller 1 (Coarse, MIDI Controller 12) */
+         vcf_cutoff_ctrl_effect2      = 0x8d,  /**< Effect Controller 2 (Coarse, MIDI Controller 13) */
+         vcf_cutoff_ctrl_breath       = 0x82,  /**< Breath Controller (Coarse, MIDI Controller 2) */
+         vcf_cutoff_ctrl_foot         = 0x84,  /**< Foot Pedal (Coarse, MIDI Controller 4) */
+         vcf_cutoff_ctrl_sustainpedal = 0xc0,  /**< Sustain Pedal (MIDI Controller 64) */
+         vcf_cutoff_ctrl_softpedal    = 0xc3,  /**< Soft Pedal (MIDI Controller 67) */
+         vcf_cutoff_ctrl_genpurpose7  = 0xd2,  /**< General Purpose Controller 7 (Button, MIDI Controller 82) */
+         vcf_cutoff_ctrl_genpurpose8  = 0xd3,  /**< General Purpose Controller 8 (Button, MIDI Controller 83) */
+         vcf_cutoff_ctrl_aftertouch   = 0x80   /**< Key Pressure */
+     );
+     /** Defines how the filter resonance is controlled by.
+      *
+      * @see enumCount(), enumKey(), enumKeys(), enumValue()
+      */
+     GIG_DECLARE_ENUM(vcf_res_ctrl_t,
+         vcf_res_ctrl_none        = 0xffffffff,  /**< No MIDI controller assigned for filter resonance. */
+         vcf_res_ctrl_genpurpose3 = 0,           /**< General Purpose Controller 3 (Slider, MIDI Controller 18) */
+         vcf_res_ctrl_genpurpose4 = 1,           /**< General Purpose Controller 4 (Slider, MIDI Controller 19) */
+         vcf_res_ctrl_genpurpose5 = 2,           /**< General Purpose Controller 5 (Button, MIDI Controller 80) */
+         vcf_res_ctrl_genpurpose6 = 3            /**< General Purpose Controller 6 (Button, MIDI Controller 81) */
+     );
      /**
       * Defines a controller that has a certain contrained influence on a
-Line 180 
 namespace gig {
+Line 251 
 namespace gig {
       * attenuation_ctrl_t, eg1_ctrl_t or eg2_ctrl_t) in your code!
       */
      struct leverage_ctrl_t {
-         typedef enum {
+         /** Defines possible controllers.
-             type_none              = 0x00, ///< No controller defined
+          *
-             type_channelaftertouch = 0x2f, ///< Channel Key Pressure
+          * @see enumCount(), enumKey(), enumKeys(), enumValue()
-             type_velocity          = 0xff, ///< Key Velocity
+          */
-             type_controlchange     = 0xfe  ///< Ordinary MIDI control change controller, see field 'controller_number'
+         GIG_DECLARE_ENUM(type_t,
-         } type_t;
+             type_none              = 0x00, /**< No controller defined */
+             type_channelaftertouch = 0x2f, /**< Channel Key Pressure */
+             type_velocity          = 0xff, /**< Key Velocity */
+             type_controlchange     = 0xfe  /**< Ordinary MIDI control change controller, see field 'controller_number' */
+         );
          type_t type;              ///< Controller type
          uint   controller_number; ///< MIDI controller number if this controller is a control change controller, 0 otherwise
+         void serialize(Serialization::Archive* archive);
      };
      /**
-Line 218 
 namespace gig {
+Line 295 
 namespace gig {
       * dimension zones is always a power of two. All dimensions can have up
       * to 32 zones (except the layer dimension with only up to 8 zones and
       * the samplechannel dimension which currently allows only 2 zones).
+      *
+      * @see enumCount(), enumKey(), enumKeys(), enumValue()
       */
-     typedef enum {
+     GIG_DECLARE_ENUM(dimension_t,
-         dimension_none              = 0x00, ///< Dimension not in use.
+         dimension_none              = 0x00, /**< Dimension not in use. */
-         dimension_samplechannel     = 0x80, ///< If used sample has more than one channel (thus is not mono).
+         dimension_samplechannel     = 0x80, /**< If used sample has more than one channel (thus is not mono). */
-         dimension_layer             = 0x81, ///< For layering of up to 8 instruments (and eventually crossfading of 2 or 4 layers).
+         dimension_layer             = 0x81, /**< For layering of up to 8 instruments (and eventually crossfading of 2 or 4 layers). */
-         dimension_velocity          = 0x82, ///< Key Velocity (this is the only dimension in gig2 where the ranges can exactly be defined).
+         dimension_velocity          = 0x82, /**< Key Velocity (this is the only dimension in gig2 where the ranges can exactly be defined). */
-         dimension_channelaftertouch = 0x83, ///< Channel Key Pressure
+         dimension_channelaftertouch = 0x83, /**< Channel Key Pressure */
-         dimension_releasetrigger    = 0x84, ///< Special dimension for triggering samples on releasing a key.
+         dimension_releasetrigger    = 0x84, /**< Special dimension for triggering samples on releasing a key. */
-         dimension_keyboard          = 0x85, ///< Dimension for keyswitching
+         dimension_keyboard          = 0x85, /**< Dimension for keyswitching */
-         dimension_roundrobin        = 0x86, ///< Different samples triggered each time a note is played, dimension regions selected in sequence
+         dimension_roundrobin        = 0x86, /**< Different samples triggered each time a note is played, dimension regions selected in sequence */
-         dimension_random            = 0x87, ///< Different samples triggered each time a note is played, random order
+         dimension_random            = 0x87, /**< Different samples triggered each time a note is played, random order */
-         dimension_smartmidi         = 0x88, ///< For MIDI tools like legato and repetition mode
+         dimension_smartmidi         = 0x88, /**< For MIDI tools like legato and repetition mode */
-         dimension_roundrobinkeyboard = 0x89, ///< Different samples triggered each time a note is played, any key advances the counter
+         dimension_roundrobinkeyboard = 0x89, /**< Different samples triggered each time a note is played, any key advances the counter */
-         dimension_modwheel          = 0x01, ///< Modulation Wheel (MIDI Controller 1)
+         dimension_modwheel          = 0x01, /**< Modulation Wheel (MIDI Controller 1) */
-         dimension_breath            = 0x02, ///< Breath Controller (Coarse, MIDI Controller 2)
+         dimension_breath            = 0x02, /**< Breath Controller (Coarse, MIDI Controller 2) */
-         dimension_foot              = 0x04, ///< Foot Pedal (Coarse, MIDI Controller 4)
+         dimension_foot              = 0x04, /**< Foot Pedal (Coarse, MIDI Controller 4) */
-         dimension_portamentotime    = 0x05, ///< Portamento Time (Coarse, MIDI Controller 5)
+         dimension_portamentotime    = 0x05, /**< Portamento Time (Coarse, MIDI Controller 5) */
-         dimension_effect1           = 0x0c, ///< Effect Controller 1 (Coarse, MIDI Controller 12)
+         dimension_effect1           = 0x0c, /**< Effect Controller 1 (Coarse, MIDI Controller 12) */
-         dimension_effect2           = 0x0d, ///< Effect Controller 2 (Coarse, MIDI Controller 13)
+         dimension_effect2           = 0x0d, /**< Effect Controller 2 (Coarse, MIDI Controller 13) */
-         dimension_genpurpose1       = 0x10, ///< General Purpose Controller 1 (Slider, MIDI Controller 16)
+         dimension_genpurpose1       = 0x10, /**< General Purpose Controller 1 (Slider, MIDI Controller 16) */
-         dimension_genpurpose2       = 0x11, ///< General Purpose Controller 2 (Slider, MIDI Controller 17)
+         dimension_genpurpose2       = 0x11, /**< General Purpose Controller 2 (Slider, MIDI Controller 17) */
-         dimension_genpurpose3       = 0x12, ///< General Purpose Controller 3 (Slider, MIDI Controller 18)
+         dimension_genpurpose3       = 0x12, /**< General Purpose Controller 3 (Slider, MIDI Controller 18) */
-         dimension_genpurpose4       = 0x13, ///< General Purpose Controller 4 (Slider, MIDI Controller 19)
+         dimension_genpurpose4       = 0x13, /**< General Purpose Controller 4 (Slider, MIDI Controller 19) */
-         dimension_sustainpedal      = 0x40, ///< Sustain Pedal (MIDI Controller 64)
+         dimension_sustainpedal      = 0x40, /**< Sustain Pedal (MIDI Controller 64) */
-         dimension_portamento        = 0x41, ///< Portamento (MIDI Controller 65)
+         dimension_portamento        = 0x41, /**< Portamento (MIDI Controller 65) */
-         dimension_sostenutopedal    = 0x42, ///< Sostenuto Pedal (MIDI Controller 66)
+         dimension_sostenutopedal    = 0x42, /**< Sostenuto Pedal (MIDI Controller 66) */
-         dimension_softpedal         = 0x43, ///< Soft Pedal (MIDI Controller 67)
+         dimension_softpedal         = 0x43, /**< Soft Pedal (MIDI Controller 67) */
-         dimension_genpurpose5       = 0x30, ///< General Purpose Controller 5 (Button, MIDI Controller 80)
+         dimension_genpurpose5       = 0x30, /**< General Purpose Controller 5 (Button, MIDI Controller 80) */
-         dimension_genpurpose6       = 0x31, ///< General Purpose Controller 6 (Button, MIDI Controller 81)
+         dimension_genpurpose6       = 0x31, /**< General Purpose Controller 6 (Button, MIDI Controller 81) */
-         dimension_genpurpose7       = 0x32, ///< General Purpose Controller 7 (Button, MIDI Controller 82)
+         dimension_genpurpose7       = 0x32, /**< General Purpose Controller 7 (Button, MIDI Controller 82) */
-         dimension_genpurpose8       = 0x33, ///< General Purpose Controller 8 (Button, MIDI Controller 83)
+         dimension_genpurpose8       = 0x33, /**< General Purpose Controller 8 (Button, MIDI Controller 83) */
-         dimension_effect1depth      = 0x5b, ///< Effect 1 Depth (MIDI Controller 91)
+         dimension_effect1depth      = 0x5b, /**< Effect 1 Depth (MIDI Controller 91) */
-         dimension_effect2depth      = 0x5c, ///< Effect 2 Depth (MIDI Controller 92)
+         dimension_effect2depth      = 0x5c, /**< Effect 2 Depth (MIDI Controller 92) */
-         dimension_effect3depth      = 0x5d, ///< Effect 3 Depth (MIDI Controller 93)
+         dimension_effect3depth      = 0x5d, /**< Effect 3 Depth (MIDI Controller 93) */
-         dimension_effect4depth      = 0x5e, ///< Effect 4 Depth (MIDI Controller 94)
+         dimension_effect4depth      = 0x5e, /**< Effect 4 Depth (MIDI Controller 94) */
-         dimension_effect5depth      = 0x5f  ///< Effect 5 Depth (MIDI Controller 95)
+         dimension_effect5depth      = 0x5f  /**< Effect 5 Depth (MIDI Controller 95) */
-     } dimension_t;
+     );
      /**
       * Intended for internal usage: will be used to convert a dimension value
       * into the corresponding dimension bit number.
+      *
+      * @see enumCount(), enumKey(), enumKeys(), enumValue()
       */
-     typedef enum {
+     GIG_DECLARE_ENUM(split_type_t,
-         split_type_normal,         ///< dimension value between 0-127
+         split_type_normal,         /**< dimension value between 0-127 */
-         split_type_bit             ///< dimension values are already the sought bit number
+         split_type_bit             /**< dimension values are already the sought bit number */
-     } split_type_t;
+     );
      /** General dimension definition. */
      struct dimension_def_t {
-Line 274 
 namespace gig {
+Line 355 
 namespace gig {
          float        zone_size;  ///< Intended for internal usage: reflects the size of each zone (128/zones) for normal split types only, 0 otherwise.
      };
-     /** Defines which frequencies are filtered by the VCF. */
+     /** Audio filter types.
-     typedef enum {
+      *
-         vcf_type_lowpass      = 0x00,
+      * The first 5 filter types are the ones which exist in GigaStudio, and
-         vcf_type_lowpassturbo = 0xff, ///< More poles than normal lowpass
+      * which are very accurately modeled on LinuxSampler side such that they
-         vcf_type_bandpass     = 0x01,
+      * would sound with LinuxSampler exactly as with GigaStudio.
-         vcf_type_highpass     = 0x02,
+      *
-         vcf_type_bandreject   = 0x03
+      * The other filter types listed here are extensions to the gig format and
-     } vcf_type_t;
+      * are LinuxSampler specific filter type implementations. Note that none of
+      * these are duplicates of the GigaStudio filter types. For instance
+      * @c vcf_type_lowpass (GigaStudio) and @c vcf_type_lowpass_2p
+      * (LinuxSampler) are both lowpass filters with 2 poles, however they do
+      * sound differently.
+      *
+      * @see enumCount(), enumKey(), enumKeys(), enumValue()
+      */
+     GIG_DECLARE_ENUM(vcf_type_t,
+         vcf_type_lowpass       = 0x00, /**< Standard lowpass filter type (GigaStudio). */
+         vcf_type_lowpassturbo  = 0xff, /**< More poles than normal lowpass (GigaStudio). */
+         vcf_type_bandpass      = 0x01, /**< Bandpass filter type (GigaStudio). */
+         vcf_type_highpass      = 0x02, /**< Highpass filter type (GigaStudio). */
+         vcf_type_bandreject    = 0x03, /**< Band reject filter type (GigaStudio). */
+         vcf_type_lowpass_1p    = 0x11, /**< [gig extension]: 1-pole lowpass filter type (LinuxSampler). */
+         vcf_type_lowpass_2p    = 0x12, /**< [gig extension]: 2-pole lowpass filter type (LinuxSampler). */
+         vcf_type_lowpass_4p    = 0x14, /**< [gig extension]: 4-pole lowpass filter type (LinuxSampler). */
+         vcf_type_lowpass_6p    = 0x16, /**< [gig extension]: 6-pole lowpass filter type (LinuxSampler). */
+         vcf_type_highpass_1p   = 0x21, /**< [gig extension]: 1-pole highpass filter type (LinuxSampler). */
+         vcf_type_highpass_2p   = 0x22, /**< [gig extension]: 2-pole highpass filter type (LinuxSampler). */
+         vcf_type_highpass_4p   = 0x24, /**< [gig extension]: 4-pole highpass filter type (LinuxSampler). */
+         vcf_type_highpass_6p   = 0x26, /**< [gig extension]: 6-pole highpass filter type (LinuxSampler). */
+         vcf_type_bandpass_2p   = 0x32, /**< [gig extension]: 2-pole bandpass filter type (LinuxSampler). */
+         vcf_type_bandreject_2p = 0x42  /**< [gig extension]: 2-pole bandreject filter type (LinuxSampler). */
+     );
      /**
       * Defines the envelope of a crossfade.
-Line 302 
 namespace gig {
+Line 407 
 namespace gig {
          uint8_t out_start;  ///< Start position of fade out.
          uint8_t out_end;    ///< End postition of fade out.
          #endif // WORDS_BIGENDIAN
+         void serialize(Serialization::Archive* archive);
      };
      /** Reflects the current playback state for a sample. */
      struct playback_state_t {
-         unsigned long position;          ///< Current position within the sample.
+         file_offset_t 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.
+         file_offset_t loop_cycles_left;  ///< How many times the loop has still to be passed, this value will be decremented with each loop cycle.
      };
      /**
-      * @brief Used for indicating the progress of a certain task.
+      * Defines behavior options for envelope generators (gig format extension).
       *
-      * The function pointer argument has to be supplied with a valid
+      * These options allow to override the precise default behavior of the
-      * function of the given signature which will then be called on
+      * envelope generators' state machines.
-      * progress changes. An equivalent progress_t structure will be passed
+      *
-      * back as argument to the callback function on each progress change.
+      * @b Note: These EG options are an extension to the original gig file
-      * The factor field of the supplied progress_t structure will then
+      * format, so these options are not available with the original
-      * reflect the current progress as value between 0.0 and 1.0. You might
+      * Gigasampler/GigaStudio software! Currently only LinuxSampler and gigedit
-      * want to use the custom field for data needed in your callback
+      * support these EG options!
-      * function.
+      *
-      */
+      * Adding these options to the original gig file format was necessary,
-     struct progress_t {
+      * because the precise state machine behavior of envelope generators of the
-         void (*callback)(progress_t*); ///< Callback function pointer which has to be assigned to a function for progress notification.
+      * gig format (and thus the default EG behavior if not explicitly overridden
-         float factor;                  ///< Reflects current progress as value between 0.0 and 1.0.
+      * here) deviates from common, expected behavior of envelope generators in
-         void* custom;                  ///< This pointer can be used for arbitrary data.
+      * general, if i.e. compared with EGs of hardware synthesizers. For example
-         float __range_min;             ///< Only for internal usage, do not modify!
+      * with the gig format, the attack and decay stages will be aborted as soon
-         float __range_max;             ///< Only for internal usage, do not modify!
+      * as a note-off is received. Most other EG implementations in the industry
-         progress_t();
+      * however always run the attack and decay stages to their full duration,
+      * even if an early note-off arrives. The latter behavior is intentionally
+      * implemented in most other products, because it is required to resemble
+      * percussive sounds in a realistic manner.
+      */
+     struct eg_opt_t {
+         bool AttackCancel;     ///< Whether the "attack" stage is cancelled when receiving a note-off (default: @c true).
+         bool AttackHoldCancel; ///< Whether the "attack hold" stage is cancelled when receiving a note-off (default: @c true).
+         bool Decay1Cancel;     ///< Whether the "decay 1" stage is cancelled when receiving a note-off (default: @c true).
+         bool Decay2Cancel;     ///< Whether the "decay 2" stage is cancelled when receiving a note-off (default: @c true).
+         bool ReleaseCancel;    ///< Whether the "release" stage is cancelled when receiving a note-on (default: @c true).
+         eg_opt_t();
+         void serialize(Serialization::Archive* archive);
      };
+     /** @brief Defines behaviour of release triggered sample(s) on sustain pedal up event.
+      *
+      * This option defines whether a sustain pedal up event (CC#64) would cause
+      * release triggered samples to be played (if any).
+      *
+      * @b Note: This option is an extension to the original gig file format,
+      * so this option is not available with the original Gigasampler/GigaStudio
+      * software! Currently only LinuxSampler and gigedit support this option!
+      *
+      * By default (which equals the original Gigasampler/GigaStudio behaviour)
+      * no release triggered samples are played if the sustain pedal is released.
+      * So usually in the gig format release triggered samples are only played
+      * on MIDI note-off events.
+      *
+      * @see enumCount(), enumKey(), enumKeys(), enumValue()
+      */
+     GIG_DECLARE_ENUM(sust_rel_trg_t,
+         sust_rel_trg_none        = 0x00, /**< No release triggered sample(s) are played on sustain pedal up (default). */
+         sust_rel_trg_maxvelocity = 0x01, /**< Play release trigger sample(s) on sustain pedal up, and simply use 127 as MIDI velocity for playback. */
+         sust_rel_trg_keyvelocity = 0x02  /**< Play release trigger sample(s) on sustain pedal up, and use the key`s last MIDI note-on velocity for playback. */
+     );
      // just symbol prototyping
      class File;
      class Instrument;
-Line 341 
 namespace gig {
+Line 483 
 namespace gig {
      class Script;
      class ScriptGroup;
-     /** @brief Encapsulates articulation information of a dimension region.
+     /** @brief Encapsulates articulation informations of a dimension region.
+      *
+      * This is the most important data object of the Gigasampler / GigaStudio
+      * format. A DimensionRegion provides the link to the sample to be played
+      * and all required articulation informations to be interpreted for playing
+      * back the sample and processing it appropriately by the sampler software.
+      * Every Region of a Gigasampler Instrument has at least one dimension
+      * region (exactly then when the Region has no dimension defined). Many
+      * Regions though provide more than one DimensionRegion, which reflect
+      * different playing "cases". For example a different sample might be played
+      * if a certain pedal is pressed down, or if the note was triggered with
+      * different velocity.
       *
-      *  Every Gigasampler Instrument has at least one dimension region
+      * One instance of a DimensionRegion reflects exactly one particular case
-      *  (exactly then when it has no dimension defined).
+      * while playing an instrument (for instance "note between C3 and E3 was
+      * triggered AND note on velocity was between 20 and 42 AND modulation wheel
+      * controller is between 80 and 127). The DimensionRegion defines what to do
+      * under that one particular case, that is which sample to play back and how
+      * to play that sample back exactly and how to process it. So a
+      * DimensionRegion object is always linked to exactly one sample. It may
+      * however also link to no sample at all, for defining a "silence" case
+      * where nothing shall be played (for example when note on velocity was
+      * below 6).
       *
-      *  Gigasampler provides three Envelope Generators and Low Frequency
+      * Note that a DimensionRegion object only defines "what to do", but it does
-      *  Oscillators:
+      * not define "when to do it". To actually resolve which DimensionRegion to
+      * pick under which situation, you need to refer to the DimensionRegions'
+      * parent Region object. The Region object contains the necessary
+      * "Dimension" definitions, which in turn define which DimensionRegion is
+      * associated with which playing case exactly.
+      *
+      * The Gigasampler/GigaStudio format defines 3 Envelope Generators and 3
+      * Low Frequency Oscillators:
       *
       *  - EG1 and LFO1, both controlling sample amplitude
       *  - EG2 and LFO2, both controlling filter cutoff frequency
       *  - EG3 and LFO3, both controlling sample pitch
+      *
+      * Since the gig format was designed as extension to the DLS file format,
+      * this class is derived from the DLS::Sampler class. So also refer to
+      * DLS::Sampler for additional informations, class attributes and methods.
       */
      class DimensionRegion : protected DLS::Sampler {
          public:
-Line 371 
 namespace gig {
+Line 543 
 namespace gig {
              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 (0 - 3, where 0 means off).
              uint8_t            EG1ControllerReleaseInfluence; ///< Amount EG1 Controller has influence on the EG1 Release time (0 - 3, where 0 means off).
+             lfo_wave_t         LFO1WaveForm;                  ///< [gig extension]: The fundamental wave form to be used by the amplitude LFO, e.g. sine, triangle, saw, square (default: sine).
              double             LFO1Frequency;                 ///< Frequency of the sample amplitude LFO (0.10 - 10.00 Hz).
+             double             LFO1Phase;                     ///< [gig extension]: Phase displacement of the amplitude LFO's wave form (0.0° - 360.0°).
              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).
              lfo1_ctrl_t        LFO1Controller;                ///< MIDI Controller which controls sample amplitude LFO.
-             bool               LFO1FlipPhase;                 ///< Inverts phase of the sample amplitude LFO wave.
+             bool               LFO1FlipPhase;                 ///< Inverts the polarity of the sample amplitude LFO wave, so it flips the wave form vertically.
              bool               LFO1Sync;                      ///< If set to <i>true</i> only one LFO should be used for all voices.
              // Filter Cutoff Frequency EG/LFO
              uint16_t           EG2PreAttack;                  ///< Preattack value of the filter cutoff EG (0 - 1000 permille).
-Line 390 
 namespace gig {
+Line 564 
 namespace gig {
              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 (0 - 3, where 0 means off).
              uint8_t            EG2ControllerReleaseInfluence; ///< Amount EG2 Controller has influence on the EG2 Release time (0 - 3, where 0 means off).
+             lfo_wave_t         LFO2WaveForm;                  ///< [gig extension]: The fundamental wave form to be used by the filter cutoff LFO, e.g. sine, triangle, saw, square (default: sine).
              double             LFO2Frequency;                 ///< Frequency of the filter cutoff LFO (0.10 - 10.00 Hz).
+             double             LFO2Phase;                     ///< [gig extension]: Phase displacement of the filter cutoff LFO's wave form (0.0° - 360.0°).
              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).
              lfo2_ctrl_t        LFO2Controller;                ///< MIDI Controlle which controls the filter cutoff LFO.
-             bool               LFO2FlipPhase;                 ///< Inverts phase of the filter cutoff LFO wave.
+             bool               LFO2FlipPhase;                 ///< Inverts the polarity of the filter cutoff LFO wave, so it flips the wave form vertically.
              bool               LFO2Sync;                      ///< If set to <i>true</i> only one LFO should be used for all voices.
              // Sample Pitch EG/LFO
              double             EG3Attack;                     ///< Attack time of the sample pitch EG (0.000 - 10.000s).
              int16_t            EG3Depth;                      ///< Depth of the sample pitch EG (-1200 - +1200).
+             lfo_wave_t         LFO3WaveForm;                  ///< [gig extension]: The fundamental wave form to be used by the pitch LFO, e.g. sine, triangle, saw, square (default: sine).
              double             LFO3Frequency;                 ///< Frequency of the sample pitch LFO (0.10 - 10.00 Hz).
+             double             LFO3Phase;                     ///< [gig extension]: Phase displacement of the pitch LFO's wave form (0.0° - 360.0°).
              int16_t            LFO3InternalDepth;             ///< Firm depth of the sample pitch LFO (-1200 - +1200 cents).
              int16_t            LFO3ControlDepth;              ///< Controller depth of the sample pitch LFO (-1200 - +1200 cents).
              lfo3_ctrl_t        LFO3Controller;                ///< MIDI Controller which controls the sample pitch LFO.
+             bool               LFO3FlipPhase;                 ///< [gig extension]: Inverts the polarity of the pitch LFO wave, so it flips the wave form vertically (@b NOTE: this setting for LFO3 is a gig format extension; flipping the polarity was only available for LFO1 and LFO2 in the original Gigasampler/GigaStudio software).
              bool               LFO3Sync;                      ///< If set to <i>true</i> only one LFO should be used for all voices.
              // Filter
              bool               VCFEnabled;                    ///< If filter should be used.
-Line 440 
 namespace gig {
+Line 619 
 namespace gig {
              uint16_t           SampleStartOffset;             ///< Number of samples the sample start should be moved (0 - 2000).
              double             SampleAttenuation;             ///< Sample volume (calculated from DLS::Sampler::Gain)
              uint8_t            DimensionUpperLimits[8];       ///< gig3: defines the upper limit of the dimension values for this dimension region. In case you wondered why this is defined on DimensionRegion level and not on Region level: the zone sizes (upper limits) of the velocity dimension can indeed differ in the individual dimension regions, depending on which zones of the other dimension types are currently selected. So this is exceptional for the velocity dimension only. All other dimension types have the same dimension zone sizes for every single DimensionRegion (of the sample Region).
+             eg_opt_t           EG1Options;                    ///< [gig extension]: Behavior options which should be used for envelope generator 1 (volume amplitude EG).
+             eg_opt_t           EG2Options;                    ///< [gig extension]: Behavior options which should be used for envelope generator 2 (filter cutoff EG).
+             sust_rel_trg_t     SustainReleaseTrigger;         ///< [gig extension]: Whether a sustain pedal up event shall play release trigger sample.
+             bool               NoNoteOffReleaseTrigger;       ///< [gig extension]: If @c true then don't play a release trigger sample on MIDI note-off events.
              // derived attributes from DLS::Sampler
              using DLS::Sampler::UnityNote;
-Line 466 
 namespace gig {
+Line 649 
 namespace gig {
              using DLS::Sampler::AddSampleLoop;
              using DLS::Sampler::DeleteSampleLoop;
              // overridden methods
-             virtual void SetGain(int32_t gain);
+             virtual void SetGain(int32_t gain) OVERRIDE;
-             virtual void UpdateChunks();
+             virtual void UpdateChunks(progress_t* pProgress) OVERRIDE;
              virtual void CopyAssign(const DimensionRegion* orig);
          protected:
              uint8_t* VelocityTable; ///< For velocity dimensions with custom defined zone ranges only: used for fast converting from velocity MIDI value to dimension bit number.
-Line 475 
 namespace gig {
+Line 658 
 namespace gig {
              DimensionRegion(RIFF::List* _3ewl, const DimensionRegion& src);
             ~DimensionRegion();
              void CopyAssign(const DimensionRegion* orig, const std::map<Sample*,Sample*>* mSamples);
+             void serialize(Serialization::Archive* archive);
              friend class Region;
+             friend class Serialization::Archive;
          private:
              typedef enum { ///< Used to decode attenuation, EG1 and EG2 controller
                  // official leverage controllers as they were defined in the original Gigasampler/GigaStudio format:
-Line 578 
 namespace gig {
+Line 763 
 namespace gig {
              } _lev_ctrl_t;
              typedef std::map<uint32_t, double*> VelocityTableMap;
-             static uint              Instances;                  ///< Number of DimensionRegion instances.
+             static size_t            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.
              double*                  pVelocityReleaseTable;      ///< Points to the velocity table corresponding to the release velocity parameters of this DimensionRegion
-Line 591 
 namespace gig {
+Line 776 
 namespace gig {
              double* GetCutoffVelocityTable(curve_type_t vcfVelocityCurve, uint8_t vcfVelocityDynamicRange, uint8_t vcfVelocityScale, vcf_cutoff_ctrl_t vcfCutoffController);
              double* GetVelocityTable(curve_type_t curveType, uint8_t depth, uint8_t scaling);
              double* CreateVelocityTable(curve_type_t curveType, uint8_t depth, uint8_t scaling);
+             bool UsesAnyGigFormatExtension() const;
      };
-     /** @brief Encapsulates sample waves used for playback.
+     /** @brief Encapsulates sample waves of Gigasampler/GigaStudio files used for playback.
+      *
+      * This class provides access to the actual audio sample data of a
+      * Gigasampler/GigaStudio file. Along to the actual sample data, it also
+      * provides access to the sample's meta informations like bit depth,
+      * sample rate, encoding type, but also loop informations. The latter may be
+      * used by instruments for resembling sounds with arbitary note lengths.
       *
       * In case you created a new sample with File::AddSample(), you should
       * first update all attributes with the desired meta informations
-Line 607 
 namespace gig {
+Line 799 
 namespace gig {
       * retrieved from the respective DimensionRegon instead from the Sample
       * itself. This was made for allowing different loop definitions for the
       * same sample under different conditions.
+      *
+      * Since the gig format was designed as extension to the DLS file format,
+      * this class is derived from the DLS::Sample class. So also refer to
+      * DLS::Sample for additional informations, class attributes and methods.
       */
      class Sample : public DLS::Sample {
          public:
-Line 631 
 namespace gig {
+Line 827 
 namespace gig {
              // own methods
              buffer_t      LoadSampleData();
-             buffer_t      LoadSampleData(unsigned long SampleCount);
+             buffer_t      LoadSampleData(file_offset_t SampleCount);
              buffer_t      LoadSampleDataWithNullSamplesExtension(uint NullSamplesCount);
-             buffer_t      LoadSampleDataWithNullSamplesExtension(unsigned long SampleCount, uint NullSamplesCount);
+             buffer_t      LoadSampleDataWithNullSamplesExtension(file_offset_t SampleCount, uint NullSamplesCount);
              buffer_t      GetCache();
              // own static methods
-             static buffer_t CreateDecompressionBuffer(unsigned long MaxReadSize);
+             static buffer_t CreateDecompressionBuffer(file_offset_t MaxReadSize);
              static void     DestroyDecompressionBuffer(buffer_t& DecompressionBuffer);
              // overridden methods
              void          ReleaseSampleData();
-             void          Resize(int iNewSize);
+             void          Resize(file_offset_t NewSize);
-             unsigned long SetPos(unsigned long SampleCount, RIFF::stream_whence_t Whence = RIFF::stream_start);
+             file_offset_t SetPos(file_offset_t SampleCount, RIFF::stream_whence_t Whence = RIFF::stream_start);
-             unsigned long GetPos() const;
+             file_offset_t GetPos() const;
-             unsigned long Read(void* pBuffer, unsigned long SampleCount, buffer_t* pExternalDecompressionBuffer = NULL);
+             file_offset_t Read(void* pBuffer, file_offset_t SampleCount, buffer_t* pExternalDecompressionBuffer = NULL);
-             unsigned long ReadAndLoop(void* pBuffer, unsigned long SampleCount, playback_state_t* pPlaybackState, DimensionRegion* pDimRgn, buffer_t* pExternalDecompressionBuffer = NULL);
+             file_offset_t ReadAndLoop(void* pBuffer, file_offset_t SampleCount, playback_state_t* pPlaybackState, DimensionRegion* pDimRgn, buffer_t* pExternalDecompressionBuffer = NULL);
-             unsigned long Write(void* pBuffer, unsigned long SampleCount);
+             file_offset_t Write(void* pBuffer, file_offset_t SampleCount);
              Group*        GetGroup() const;
-             virtual void  UpdateChunks();
+             virtual void  UpdateChunks(progress_t* pProgress) OVERRIDE;
              void CopyAssignMeta(const Sample* orig);
              void CopyAssignWave(const Sample* orig);
+             uint32_t GetWaveDataCRC32Checksum();
+             bool VerifyWaveData(uint32_t* pActually = NULL);
          protected:
-             static unsigned int  Instances;               ///< Number of instances of class Sample.
+             static size_t        Instances;               ///< Number of instances of class Sample.
              static buffer_t      InternalDecompressionBuffer; ///< Buffer used for decompression as well as for truncation of 24 Bit -> 16 Bit samples.
              Group*               pGroup;                  ///< pointer to the Group this sample belongs to (always not-NULL)
-             unsigned long        FrameOffset;             ///< Current offset (sample points) in current sample frame (for decompression only).
+             file_offset_t        FrameOffset;             ///< Current offset (sample points) in current sample frame (for decompression only).
-             unsigned long*       FrameTable;              ///< For positioning within compressed samples only: stores the offset values for each frame.
+             file_offset_t*       FrameTable;              ///< For positioning within compressed samples only: stores the offset values for each frame.
-             unsigned long        SamplePos;               ///< For compressed samples only: stores the current position (in sample points).
+             file_offset_t        SamplePos;               ///< For compressed samples only: stores the current position (in sample points).
-             unsigned long        SamplesInLastFrame;      ///< For compressed samples only: length of the last sample frame.
+             file_offset_t        SamplesInLastFrame;      ///< For compressed samples only: length of the last sample frame.
-             unsigned long        WorstCaseFrameSize;      ///< For compressed samples only: size (in bytes) of the largest possible sample frame.
+             file_offset_t        WorstCaseFrameSize;      ///< For compressed samples only: size (in bytes) of the largest possible sample frame.
-             unsigned long        SamplesPerFrame;         ///< For compressed samples only: number of samples in a full sample frame.
+             file_offset_t        SamplesPerFrame;         ///< For compressed samples only: number of samples in a full sample frame.
              buffer_t             RAMCache;                ///< Buffers samples (already uncompressed) in RAM.
              unsigned long        FileNo;                  ///< File number (> 0 when sample is stored in an extension file, 0 when it's in the gig)
              RIFF::Chunk*         pCk3gix;
              RIFF::Chunk*         pCkSmpl;
-             uint32_t             crc;                     ///< CRC-32 checksum of the raw sample data
+             uint32_t             crc;                     ///< Reflects CRC-32 checksum of the raw sample data at the last time when the sample's raw wave form data has been modified consciously by the user by calling Write().
-             Sample(File* pFile, RIFF::List* waveList, unsigned long WavePoolOffset, unsigned long fileNo = 0);
+             Sample(File* pFile, RIFF::List* waveList, file_offset_t WavePoolOffset, unsigned long fileNo = 0, int index = -1);
             ~Sample();
+             uint32_t CalculateWaveDataChecksum();
              // Guess size (in bytes) of a compressed sample
-             inline unsigned long GuessSize(unsigned long samples) {
+             inline file_offset_t GuessSize(file_offset_t samples) {
                  // 16 bit: assume all frames are compressed - 1 byte
                  // per sample and 5 bytes header per 2048 samples
                  // 24 bit: assume next best compression rate - 1.5
                  // bytes per sample and 13 bytes header per 256
                  // samples
-                 const unsigned long size =
+                 const file_offset_t size =
                      BitDepth == 24 ? samples + (samples >> 1) + (samples >> 8) * 13
                                     : samples + (samples >> 10) * 5;
                  // Double for stereo and add one worst case sample
-Line 687 
 namespace gig {
+Line 886 
 namespace gig {
              // Worst case amount of sample points that can be read with the
              // given decompression buffer.
-             inline unsigned long WorstCaseMaxSamples(buffer_t* pDecompressionBuffer) {
+             inline file_offset_t WorstCaseMaxSamples(buffer_t* pDecompressionBuffer) {
-                 return (unsigned long) ((float)pDecompressionBuffer->Size / (float)WorstCaseFrameSize * (float)SamplesPerFrame);
+                 return (file_offset_t) ((float)pDecompressionBuffer->Size / (float)WorstCaseFrameSize * (float)SamplesPerFrame);
              }
          private:
              void ScanCompressedSample();
-Line 698 
 namespace gig {
+Line 897 
 namespace gig {
      };
      // TODO: <3dnl> list not used yet - not important though (just contains optional descriptions for the dimensions)
-     /** @brief Defines Region information of an Instrument.
+     /** @brief Defines Region information of a Gigasampler/GigaStudio instrument.
       *
-      * A Region reflects a consecutive area on the keyboard. The individual
+      * A Region reflects a consecutive area (key range) on the keyboard. The
-      * regions in the gig format may not overlap with other regions (of the same
+      * individual regions in the gig format may not overlap with other regions
-      * instrument). Further, in the gig format a Region is merely a container
+      * (of the same instrument that is). Further, in the gig format a Region is
-      * for DimensionRegions (a.k.a. "Cases"). The Region itself does not provide
+      * merely a container for DimensionRegions (a.k.a. "Cases"). The Region
-      * the sample mapping or articulation informations used, even though the
+      * itself does not provide the sample mapping or articulation informations
-      * data structures indeed provide such informations. The latter is however
+      * used, even though the data structures of regions indeed provide such
-      * just of historical nature, because the gig format was derived from the
+      * informations. The latter is however just of historical nature, because
-      * DLS format.
+      * the gig file format was derived from the DLS file format.
       *
       * Each Region consists of at least one or more DimensionRegions. The actual
       * amount of DimensionRegions depends on which kind of "dimensions" are
       * defined for this region, and on the split / zone amount for each of those
       * dimensions.
+      *
+      * Since the gig format was designed as extension to the DLS file format,
+      * this class is derived from the DLS::Region class. So also refer to
+      * DLS::Region for additional informations, class attributes and methods.
       */
      class Region : public DLS::Region {
          public:
-Line 732 
 namespace gig {
+Line 935 
 namespace gig {
              dimension_def_t* GetDimensionDefinition(dimension_t type);
              void             DeleteDimensionZone(dimension_t type, int zone);
              void             SplitDimensionZone(dimension_t type, int zone);
+             void             SetDimensionType(dimension_t oldType, dimension_t newType);
              // overridden methods
-             virtual void     SetKeyRange(uint16_t Low, uint16_t High);
+             virtual void     SetKeyRange(uint16_t Low, uint16_t High) OVERRIDE;
-             virtual void     UpdateChunks();
+             virtual void     UpdateChunks(progress_t* pProgress) OVERRIDE;
              virtual void     CopyAssign(const Region* orig);
          protected:
              Region(Instrument* pInstrument, RIFF::List* rgnList);
-Line 747 
 namespace gig {
+Line 951 
 namespace gig {
              friend class Instrument;
      };
-     /** Abstract base class for all MIDI rules. */
+     /** @brief Abstract base class for all MIDI rules.
+      *
+      * Note: Instead of using MIDI rules, we recommend you using real-time
+      * instrument scripts instead. Read about the reasons below.
+      *
+      * MIDI Rules (also called "iMIDI rules" or "intelligent MIDI rules") were
+      * introduced with GigaStudio 4 as an attempt to increase the power of
+      * potential user controls over sounds. At that point other samplers already
+      * supported certain powerful user control features, which were not possible
+      * with GigaStudio yet. For example triggering new notes by MIDI CC
+      * controller.
+      *
+      * Such extended features however were usually implemented by other samplers
+      * by requiring the sound designer to write an instrument script which the
+      * designer would then bundle with the respective instrument file. Such
+      * scripts are essentially text files, using a very specific programming
+      * language for the purpose of controlling the sampler in real-time. Since
+      * however musicians are not typically keen to writing such cumbersome
+      * script files, the GigaStudio designers decided to implement such extended
+      * features completely without instrument scripts. Instead they created a
+      * set of rules, which could be defined and altered conveniently by mouse
+      * clicks in GSt's instrument editor application. The downside of this
+      * overall approach however, was that those MIDI rules were very limited in
+      * practice. As sound designer you easily came across the possiblities such
+      * MIDI rules were able to offer.
+      *
+      * Due to such severe use case constraints, support for MIDI rules is quite
+      * limited in libgig. At the moment only the "Control Trigger", "Alternator"
+      * and the "Legato" MIDI rules are supported by libgig. Consequently the
+      * graphical instrument editor application gigedit just supports the
+      * "Control Trigger" and "Legato" MIDI rules, and LinuxSampler even does not
+      * support any MIDI rule type at all and LinuxSampler probably will not
+      * support MIDI rules in future either.
+      *
+      * Instead of using MIDI rules, we introduced real-time instrument scripts
+      * as extension to the original GigaStudio file format. This script based
+      * solution is much more powerful than MIDI rules and is already supported
+      * by libgig, gigedit and LinuxSampler.
+      *
+      * @deprecated Just provided for backward compatiblity, use Script for new
+      *             instruments instead.
+      */
      class MidiRule {
          public:
              virtual ~MidiRule() { }
-Line 756 
 namespace gig {
+Line 1001 
 namespace gig {
              friend class Instrument;
      };
-     /** MIDI rule for triggering notes by control change events. */
+     /** @brief MIDI rule for triggering notes by control change events.
+      *
+      * A "Control Trigger MIDI rule" allows to trigger new notes by sending MIDI
+      * control change events to the sampler.
+      *
+      * Note: "Control Trigger" MIDI rules are only supported by gigedit, but not
+      * by LinuxSampler. We recommend you using real-time instrument scripts
+      * instead. Read more about the details and reasons for this in the
+      * description of the MidiRule base class.
+      *
+      * @deprecated Just provided for backward compatiblity, use Script for new
+      *             instruments instead. See description of MidiRule for details.
+      */
      class MidiRuleCtrlTrigger : public MidiRule {
          public:
              uint8_t ControllerNumber;   ///< MIDI controller number.
-Line 774 
 namespace gig {
+Line 1031 
 namespace gig {
          protected:
              MidiRuleCtrlTrigger(RIFF::Chunk* _3ewg);
              MidiRuleCtrlTrigger();
-             void UpdateChunks(uint8_t* pData) const;
+             void UpdateChunks(uint8_t* pData) const OVERRIDE;
              friend class Instrument;
      };
-     /** MIDI rule for instruments with legato samples. */
+     /** @brief MIDI rule for instruments with legato samples.
+      *
+      * A "Legato MIDI rule" allows playing instruments resembling the legato
+      * playing technique. In the past such legato articulations were tried to be
+      * simulated by pitching the samples of the instrument. However since
+      * usually a high amount of pitch is needed for legatos, this always sounded
+      * very artificial and unrealistic. The "Legato MIDI rule" thus uses another
+      * approach. Instead of pitching the samples, it allows the sound designer
+      * to bundle separate, additional samples for the individual legato
+      * situations and the legato rules defined which samples to be played in
+      * which situation.
+      *
+      * Note: "Legato MIDI rules" are only supported by gigedit, but not
+      * by LinuxSampler. We recommend you using real-time instrument scripts
+      * instead. Read more about the details and reasons for this in the
+      * description of the MidiRule base class.
+      *
+      * @deprecated Just provided for backward compatiblity, use Script for new
+      *             instruments instead. See description of MidiRule for details.
+      */
      class MidiRuleLegato : public MidiRule {
          public:
              uint8_t LegatoSamples;     ///< Number of legato samples per key in each direction (always 12)
-Line 795 
 namespace gig {
+Line 1071 
 namespace gig {
          protected:
              MidiRuleLegato(RIFF::Chunk* _3ewg);
              MidiRuleLegato();
-             void UpdateChunks(uint8_t* pData) const;
+             void UpdateChunks(uint8_t* pData) const OVERRIDE;
              friend class Instrument;
      };
-     /** MIDI rule to automatically cycle through specified sequences of different articulations. The instrument must be using the smartmidi dimension. */
+     /** @brief MIDI rule to automatically cycle through specified sequences of different articulations.
+      *
+      * The instrument must be using the smartmidi dimension.
+      *
+      * Note: "Alternator" MIDI rules are neither supported by gigedit nor by
+      * LinuxSampler. We recommend you using real-time instrument scripts
+      * instead. Read more about the details and reasons for this in the
+      * description of the MidiRule base class.
+      *
+      * @deprecated Just provided for backward compatiblity, use Script for new
+      *             instruments instead. See description of MidiRule for details.
+      */
      class MidiRuleAlternator : public MidiRule {
          public:
              uint8_t Articulations;     ///< Number of articulations in the instrument
-Line 836 
 namespace gig {
+Line 1123 
 namespace gig {
          protected:
              MidiRuleAlternator(RIFF::Chunk* _3ewg);
              MidiRuleAlternator();
-             void UpdateChunks(uint8_t* pData) const;
+             void UpdateChunks(uint8_t* pData) const OVERRIDE;
              friend class Instrument;
      };
-     /** A MIDI rule not yet implemented by libgig. */
+     /** @brief A MIDI rule not yet implemented by libgig.
+      *
+      * This class is currently used as a place holder by libgig for MIDI rule
+      * types which are not supported by libgig yet.
+      *
+      * Note: Support for missing MIDI rule types are probably never added to
+      * libgig. We recommend you using real-time instrument scripts instead.
+      * Read more about the details and reasons for this in the description of
+      * the MidiRule base class.
+      *
+      * @deprecated Just provided for backward compatiblity, use Script for new
+      *             instruments instead. See description of MidiRule for details.
+      */
      class MidiRuleUnknown : public MidiRule {
          protected:
              MidiRuleUnknown() { }
-             void UpdateChunks(uint8_t* pData) const { }
+             void UpdateChunks(uint8_t* pData) const OVERRIDE { }
              friend class Instrument;
      };
-Line 857 
 namespace gig {
+Line 1156 
 namespace gig {
       *
       * This is an extension of the GigaStudio format, thus a feature which was
       * not available in the GigaStudio 4 software. It is currently only
-      * supported by LinuxSampler and gigedit.
+      * supported by LinuxSampler and gigedit. Scripts will not load with the
+      * original GigaStudio software.
+      *
+      * You find more informations about Instrument Scripts on the LinuxSampler
+      * documentation site:
+      *
+      * - <a href="http://doc.linuxsampler.org/Instrument_Scripts/">About Instrument Scripts in General</a>
+      * - <a href="http://doc.linuxsampler.org/Instrument_Scripts/NKSP_Language">Introduction to the NKSP Script Language</a>
+      * - <a href="http://doc.linuxsampler.org/Instrument_Scripts/NKSP_Language/Reference/">NKSP Reference Manual</a>
+      * - <a href="http://doc.linuxsampler.org/Gigedit/Managing_Scripts">Using Instrument Scripts with Gigedit</a>
       */
-     class Script {
+     class Script : protected DLS::Storage {
          public:
              enum Encoding_t {
                  ENCODING_ASCII = 0 ///< Standard 8 bit US ASCII character encoding (default).
-Line 868 
 namespace gig {
+Line 1176 
 namespace gig {
                  COMPRESSION_NONE = 0 ///< Is not compressed at all (default).
              };
              enum Language_t {
-                 LANGUAGE_NKSP = 0 ///< NKSP stands for "Is Not KSP" (default).
+                 LANGUAGE_NKSP = 0 ///< NKSP stands for "Is Not KSP" (default). Refer to the <a href="http://doc.linuxsampler.org/Instrument_Scripts/NKSP_Language/Reference/">NKSP Reference Manual</a> for details about this script language.
              };
              String         Name;        ///< Arbitrary name of the script, which may be displayed i.e. in an instrument editor.
-Line 880 
 namespace gig {
+Line 1188 
 namespace gig {
              String GetScriptAsText();
              void   SetScriptAsText(const String& text);
              void   SetGroup(ScriptGroup* pGroup);
+             ScriptGroup* GetGroup() const;
+             void   CopyAssign(const Script* orig);
          protected:
              Script(ScriptGroup* group, RIFF::Chunk* ckScri);
              virtual ~Script();
-             void UpdateChunks();
+             void UpdateChunks(progress_t* pProgress) OVERRIDE;
+             void DeleteChunks() OVERRIDE;
              void RemoveAllScriptReferences();
              friend class ScriptGroup;
              friend class Instrument;
-Line 905 
 namespace gig {
+Line 1216 
 namespace gig {
       * not available in the GigaStudio 4 software. It is currently only
       * supported by LinuxSampler and gigedit.
       */
-     class ScriptGroup {
+     class ScriptGroup : protected DLS::Storage {
          public:
              String   Name; ///< Name of this script group. For example to be displayed in an instrument editor.
-Line 916 
 namespace gig {
+Line 1227 
 namespace gig {
              ScriptGroup(File* file, RIFF::List* lstRTIS);
              virtual ~ScriptGroup();
              void LoadScripts();
-             void UpdateChunks();
+             virtual void UpdateChunks(progress_t* pProgress) OVERRIDE;
+             virtual void DeleteChunks() OVERRIDE;
              friend class Script;
              friend class File;
          private:
-Line 925 
 namespace gig {
+Line 1237 
 namespace gig {
              std::list<Script*>*  pScripts;
      };
-     /** Provides all neccessary information for the synthesis of an <i>Instrument</i>. */
+     /** @brief Provides access to a Gigasampler/GigaStudio instrument.
+      *
+      * This class provides access to Gigasampler/GigaStudio instruments
+      * contained in .gig files. A gig instrument is merely a set of keyboard
+      * ranges (called Region), plus some additional global informations about
+      * the instrument. The major part of the actual instrument definition used
+      * for the synthesis of the instrument is contained in the respective Region
+      * object (or actually in the respective DimensionRegion object being, see
+      * description of Region for details).
+      *
+      * Since the gig format was designed as extension to the DLS file format,
+      * this class is derived from the DLS::Instrument class. So also refer to
+      * DLS::Instrument for additional informations, class attributes and
+      * methods.
+      */
      class Instrument : protected DLS::Instrument {
          public:
              // derived attributes from DLS::Resource
-Line 954 
 namespace gig {
+Line 1280 
 namespace gig {
              Region*   GetNextRegion();
              Region*   AddRegion();
              void      DeleteRegion(Region* pRegion);
-             virtual void UpdateChunks();
+             void      MoveTo(Instrument* dst);
+             virtual void UpdateChunks(progress_t* pProgress) OVERRIDE;
              virtual void CopyAssign(const Instrument* orig);
              // own methods
              Region*   GetRegion(unsigned int Key);
-Line 980 
 namespace gig {
+Line 1307 
 namespace gig {
              void CopyAssign(const Instrument* orig, const std::map<Sample*,Sample*>* mSamples);
              void UpdateRegionKeyTable();
              void LoadScripts();
+             void UpdateScriptFileOffsets();
              friend class File;
              friend class Region; // so Region can call UpdateRegionKeyTable()
          private:
-Line 996 
 namespace gig {
+Line 1324 
 namespace gig {
              std::vector<_ScriptPooolRef>* pScriptRefs;
      };
-     /** @brief Group of Gigasampler objects
+     /** @brief Group of Gigasampler samples
       *
-      * Groups help to organize a huge collection of Gigasampler objects.
+      * Groups help to organize a huge collection of Gigasampler samples.
       * Groups are not concerned at all for the synthesis, but they help
       * sound library developers when working on complex instruments with an
       * instrument editor (as long as that instrument editor supports it ;-).
       *
-      * At the moment, it seems as only samples can be grouped together in
-      * the Gigasampler format yet. If this is false in the meantime, please
-      * tell us !
-      *
       * A sample is always assigned to exactly one Group. This also means
       * there is always at least one Group in a .gig file, no matter if you
       * created one yet or not.
       */
-     class Group {
+     class Group : public DLS::Storage {
          public:
              String Name; ///< Stores the name of this Group.
-Line 1021 
 namespace gig {
+Line 1345 
 namespace gig {
          protected:
              Group(File* file, RIFF::Chunk* ck3gnm);
              virtual ~Group();
-             virtual void UpdateChunks();
+             virtual void UpdateChunks(progress_t* pProgress) OVERRIDE;
+             virtual void DeleteChunks() OVERRIDE;
              void MoveAll();
              friend class File;
          private:
-Line 1029 
 namespace gig {
+Line 1354 
 namespace gig {
              RIFF::Chunk* pNameChunk; ///< '3gnm' chunk
      };
-     /** Parses Gigasampler files and provides abstract access to the data. */
+     /** @brief Provides convenient access to Gigasampler/GigaStudio .gig files.
+      *
+      * This is the entry class for accesing a Gigasampler/GigaStudio (.gig) file
+      * with libgig. It allows you to open existing .gig files, modifying them
+      * and saving them persistently either under the same file name or under a
+      * different location.
+      *
+      * A .gig file is merely a monolithic file. That means samples and the
+      * defintion of the virtual instruments are contained in the same file. A
+      * .gig file contains an arbitrary amount of samples, and an arbitrary
+      * amount of instruments which are referencing those samples. It is also
+      * possible to store samples in .gig files not being referenced by any
+      * instrument. This is not an error from the file format's point of view and
+      * it is actually often used in practice during the design phase of new gig
+      * instruments.
+      *
+      * So on toplevel of the gig file format you have:
+      *
+      * - A set of samples (see Sample).
+      * - A set of virtual instruments (see Instrument).
+      *
+      * And as extension to the original GigaStudio format, we added:
+      *
+      * - Real-time instrument scripts (see Script).
+      *
+      * Note that the latter however is only supported by libgig, gigedit and
+      * LinuxSampler. Scripts are not supported by the original GigaStudio
+      * software.
+      *
+      * All released Gigasampler/GigaStudio file format versions are supported
+      * (so from first Gigasampler version up to including GigaStudio 4).
+      *
+      * Since the gig format was designed as extension to the DLS file format,
+      * this class is derived from the DLS::File class. So also refer to
+      * DLS::File for additional informations, class attributes and methods.
+      */
      class File : protected DLS::File {
          public:
              static const DLS::version_t VERSION_2;
              static const DLS::version_t VERSION_3;
+             static const DLS::version_t VERSION_4;
              // derived attributes from DLS::Resource
              using DLS::Resource::pInfo;
-Line 1048 
 namespace gig {
+Line 1409 
 namespace gig {
              using DLS::File::Save;
              using DLS::File::GetFileName;
              using DLS::File::SetFileName;
+             using DLS::File::GetRiffFile;
              // overridden  methods
              File();
              File(RIFF::File* pRIFF);
-Line 1055 
 namespace gig {
+Line 1417 
 namespace gig {
              Sample*     GetNextSample();      ///< Returns a pointer to the next <i>Sample</i> object of the file, <i>NULL</i> otherwise.
              Sample*     GetSample(uint index);
              Sample*     AddSample();
+             size_t      CountSamples();
              void        DeleteSample(Sample* pSample);
              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, progress_t* pProgress = NULL);
              Instrument* AddInstrument();
              Instrument* AddDuplicateInstrument(const Instrument* orig);
+             size_t      CountInstruments();
              void        DeleteInstrument(Instrument* pInstrument);
              Group*      GetFirstGroup(); ///< Returns a pointer to the first <i>Group</i> object of the file, <i>NULL</i> otherwise.
              Group*      GetNextGroup();  ///< Returns a pointer to the next <i>Group</i> object of the file, <i>NULL</i> otherwise.
-Line 1077 
 namespace gig {
+Line 1441 
 namespace gig {
              ScriptGroup* AddScriptGroup();
              void        DeleteScriptGroup(ScriptGroup* pGroup);
              virtual    ~File();
-             virtual void UpdateChunks();
+             virtual void UpdateChunks(progress_t* pProgress) OVERRIDE;
          protected:
              // overridden protected methods from DLS::File
-             virtual void LoadSamples();
+             virtual void LoadSamples() OVERRIDE;
-             virtual void LoadInstruments();
+             virtual void LoadInstruments() OVERRIDE;
              virtual void LoadGroups();
+             virtual void UpdateFileOffsets() OVERRIDE;
              // own protected methods
              virtual void LoadSamples(progress_t* pProgress);
              virtual void LoadInstruments(progress_t* pProgress);
              virtual void LoadScriptGroups();
              void SetSampleChecksum(Sample* pSample, uint32_t crc);
+             uint32_t GetSampleChecksum(Sample* pSample);
+             uint32_t GetSampleChecksumByIndex(int index);
+             bool VerifySampleChecksumTable();
+             bool RebuildSampleChecksumTable();
+             int  GetWaveTableIndexOf(gig::Sample* pSample);
              friend class Region;
              friend class Sample;
+             friend class Instrument;
              friend class Group; // so Group can access protected member pRIFF
              friend class ScriptGroup; // so ScriptGroup can access protected member pRIFF
          private:
-Line 1109 
 namespace gig {
+Line 1480 
 namespace gig {
       */
      class Exception : public DLS::Exception {
          public:
-             Exception(String Message);
+             Exception(String format, ...);
+             Exception(String format, va_list arg);
              void PrintMessage();
+         protected:
+             Exception();
      };
+ #if HAVE_RTTI
+     size_t enumCount(const std::type_info& type);
+     const char* enumKey(const std::type_info& type, size_t value);
+     bool        enumKey(const std::type_info& type, String key);
+     const char** enumKeys(const std::type_info& type);
+ #endif // HAVE_RTTI
+     size_t enumCount(String typeName);
+     const char* enumKey(String typeName, size_t value);
+     bool        enumKey(String typeName, String key);
+     const char** enumKeys(String typeName);
+     size_t enumValue(String key);
      String libraryName();
      String libraryVersion();

 Legend:



Removed from v.2599
 


changed lines


 
Added in v.3645
 Legend:



Removed from v.2599
 


changed lines


 
Added in v.3645
-Removed from v.2599
+Added in v.3645

	ViewVC Help
Powered by ViewVC