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

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

Parent Directory | Revision Log | View Patch Patch

-revision 2699 by schoenebeck,
Mon Jan 12 17:12:05 2015 UTC
+revision 3169 by schoenebeck,
Wed May 10 21:17:10 2017 UTC
 Line 2
   *                                                                         *
   *   libgig - C++ cross-platform Gigasampler format file access library    *
   *                                                                         *
-  *   Copyright (C) 2003-2015 by Christian Schoenebeck                      *
+  *   Copyright (C) 2003-2017 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>
+ #endif
  #if WORDS_BIGENDIAN
  # define LIST_TYPE_3PRG 0x33707267
  # define LIST_TYPE_3EWL 0x3365776C
-Line 65
+Line 79
  # define CHUNK_ID_SCSL  0x4c534353 // own gig format extension
  #endif // WORDS_BIGENDIAN
+ #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 80 
 namespace gig {
+Line 102 
 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 89 
 namespace gig {
+Line 111 
 namespace gig {
          }
      };
-     /** Standard types of sample loops. */
+     /** Standard types of sample loops.
-     typedef enum {
+      *
+      * @see countEnum(), enumKey(), enumKeys(), enumValue()
+      */
+     GIG_DECLARE_ENUM(loop_type_t,
          loop_type_normal        = 0x00000000,  ///< Loop forward (normal)
          loop_type_bidirectional = 0x00000001,  ///< Alternating loop (forward/backward, also known as Ping Pong)
          loop_type_backward      = 0x00000002   ///< Loop backward (reverse)
-     } loop_type_t;
+     );
-     /** Society of Motion Pictures and Television E time format. */
+     /** Society of Motion Pictures and Television E time format.
-     typedef enum {
+      *
+      * @see countEnum(), enumKey(), enumKeys(), enumValue()
+      */
+     GIG_DECLARE_ENUM(smpte_format_t,
          smpte_format_no_offset          = 0x00000000,  ///< no SMPTE offset
          smpte_format_24_frames          = 0x00000018,  ///< 24 frames per second
          smpte_format_25_frames          = 0x00000019,  ///< 25 frames per second
          smpte_format_30_frames_dropping = 0x0000001D,  ///< 30 frames per second with frame dropping (30 drop)
          smpte_format_30_frames          = 0x0000001E   ///< 30 frames per second
-     } smpte_format_t;
+     );
-     /** Defines the shape of a function graph. */
+     /** Defines the shape of a function graph.
-     typedef enum {
+      *
+      * @see countEnum(), enumKey(), enumKeys(), enumValue()
+      */
+     GIG_DECLARE_ENUM(curve_type_t,
          curve_type_nonlinear = 0,
          curve_type_linear    = 1,
          curve_type_special   = 2,
          curve_type_unknown   = 0xffffffff
-     } curve_type_t;
+     );
-     /** Dimensions allow to bypass one of the following controllers. */
+     /** Dimensions allow to bypass one of the following controllers.
-     typedef enum {
+      *
+      * @see countEnum(), enumKey(), enumKeys(), enumValue()
+      */
+     GIG_DECLARE_ENUM(dim_bypass_ctrl_t,
          dim_bypass_ctrl_none,
          dim_bypass_ctrl_94,   ///< Effect 4 Depth (MIDI Controller 94)
          dim_bypass_ctrl_95    ///< Effect 5 Depth (MIDI Controller 95)
-     } dim_bypass_ctrl_t;
+     );
-     /** Defines how LFO3 is controlled by. */
+     /** Defines how LFO3 is controlled by.
-     typedef enum {
+      *
+      * @see countEnum(), enumKey(), enumKeys(), enumValue()
+      */
+     GIG_DECLARE_ENUM(lfo3_ctrl_t,
          lfo3_ctrl_internal            = 0x00, ///< Only internally controlled.
          lfo3_ctrl_modwheel            = 0x01, ///< Only controlled by external modulation wheel.
          lfo3_ctrl_aftertouch          = 0x02, ///< Only controlled by aftertouch controller.
          lfo3_ctrl_internal_modwheel   = 0x03, ///< Controlled internally and by external modulation wheel.
          lfo3_ctrl_internal_aftertouch = 0x04  ///< Controlled internally and by aftertouch controller.
-     } lfo3_ctrl_t;
+     );
-     /** Defines how LFO2 is controlled by. */
+     /** Defines how LFO2 is controlled by.
-     typedef enum {
+      *
+      * @see countEnum(), enumKey(), enumKeys(), enumValue()
+      */
+     GIG_DECLARE_ENUM(lfo2_ctrl_t,
          lfo2_ctrl_internal            = 0x00, ///< Only internally controlled.
          lfo2_ctrl_modwheel            = 0x01, ///< Only controlled by external modulation wheel.
          lfo2_ctrl_foot                = 0x02, ///< Only controlled by external foot controller.
          lfo2_ctrl_internal_modwheel   = 0x03, ///< Controlled internally and by external modulation wheel.
          lfo2_ctrl_internal_foot       = 0x04  ///< Controlled internally and by external foot controller.
-     } lfo2_ctrl_t;
+     );
-     /** Defines how LFO1 is controlled by. */
+     /** Defines how LFO1 is controlled by.
-     typedef enum {
+      *
+      * @see countEnum(), 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.
-     } lfo1_ctrl_t;
+     );
-     /** Defines how the filter cutoff frequency is controlled by. */
+     /** Defines how the filter cutoff frequency is controlled by.
-     typedef enum {
+      *
+      * @see countEnum(), enumKey(), enumKeys(), enumValue()
+      */
+     GIG_DECLARE_ENUM(vcf_cutoff_ctrl_t,
          vcf_cutoff_ctrl_none         = 0x00,
          vcf_cutoff_ctrl_none2        = 0x01,  ///< The difference between none and none2 is unknown
          vcf_cutoff_ctrl_modwheel     = 0x81,  ///< Modulation Wheel (MIDI Controller 1)
-Line 161 
 namespace gig {
+Line 207 
 namespace gig {
          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
-     } vcf_cutoff_ctrl_t;
+     );
-     /** Defines how the filter resonance is controlled by. */
+     /** Defines how the filter resonance is controlled by.
-     typedef enum {
+      *
+      * @see countEnum(), enumKey(), enumKeys(), enumValue()
+      */
+     GIG_DECLARE_ENUM(vcf_res_ctrl_t,
          vcf_res_ctrl_none        = 0xffffffff,
          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)
-     } vcf_res_ctrl_t;
+     );
      /**
       * Defines a controller that has a certain contrained influence on a
-Line 181 
 namespace gig {
+Line 230 
 namespace gig {
       * attenuation_ctrl_t, eg1_ctrl_t or eg2_ctrl_t) in your code!
       */
      struct leverage_ctrl_t {
-         typedef enum {
+         /** Defines possible controllers.
+          *
+          * @see countEnum(), enumKey(), enumKeys(), enumValue()
+          */
+         GIG_DECLARE_ENUM(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_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 219 
 namespace gig {
+Line 274 
 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 countEnum(), enumKey(), enumKeys(), enumValue()
       */
-     typedef enum {
+     GIG_DECLARE_ENUM(dimension_t,
          dimension_none              = 0x00, ///< Dimension not in use.
          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).
-Line 255 
 namespace gig {
+Line 312 
 namespace gig {
          dimension_effect3depth      = 0x5d, ///< Effect 3 Depth (MIDI Controller 93)
          dimension_effect4depth      = 0x5e, ///< Effect 4 Depth (MIDI Controller 94)
          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 countEnum(), enumKey(), enumKeys(), enumValue()
       */
-     typedef enum {
+     GIG_DECLARE_ENUM(split_type_t,
          split_type_normal,         ///< dimension value between 0-127
          split_type_bit             ///< dimension values are already the sought bit number
-     } split_type_t;
+     );
      /** General dimension definition. */
      struct dimension_def_t {
-Line 275 
 namespace gig {
+Line 334 
 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. */
+     /** Defines which frequencies are filtered by the VCF.
-     typedef enum {
+      *
+      * @see countEnum(), enumKey(), enumKeys(), enumValue()
+      */
+     GIG_DECLARE_ENUM(vcf_type_t,
          vcf_type_lowpass      = 0x00,
          vcf_type_lowpassturbo = 0xff, ///< More poles than normal lowpass
          vcf_type_bandpass     = 0x01,
          vcf_type_highpass     = 0x02,
          vcf_type_bandreject   = 0x03
-     } vcf_type_t;
+     );
      /**
       * Defines the envelope of a crossfade.
-Line 303 
 namespace gig {
+Line 365 
 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.
      };
      // just symbol prototyping
-Line 485 
 namespace gig {
+Line 549 
 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 588 
 namespace gig {
+Line 654 
 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 651 
 namespace gig {
+Line 717 
 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(progress_t* pProgress);
              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 707 
 namespace gig {
+Line 776 
 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 979 
 namespace gig {
+Line 1048 
 namespace gig {
       * not available in the GigaStudio 4 software. It is currently only
       * 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 {
          public:
-Line 989 
 namespace gig {
+Line 1066 
 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 1002 
 namespace gig {
+Line 1079 
 namespace gig {
              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();
-Line 1090 
 namespace gig {
+Line 1168 
 namespace gig {
              Region*   GetNextRegion();
              Region*   AddRegion();
              void      DeleteRegion(Region* pRegion);
+             void      MoveTo(Instrument* dst);
              virtual void UpdateChunks(progress_t* pProgress);
              virtual void CopyAssign(const Instrument* orig);
              // own methods
-Line 1257 
 namespace gig {
+Line 1336 
 namespace gig {
              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 1282 
 namespace gig {
+Line 1367 
 namespace gig {
              void PrintMessage();
      };
+ #if HAVE_RTTI
+     size_t countEnum(const std::type_info& type);
+     size_t countEnum(String typeName);
+     const char* enumKey(const std::type_info& type, size_t value);
+     const char* enumKey(String typeName, size_t value);
+     bool        enumKey(const std::type_info& type, String key);
+     bool        enumKey(String typeName, String key);
+     const char** enumKeys(const std::type_info& type);
+     const char** enumKeys(String typeName);
+     size_t enumValue(String key);
+ #endif // HAVE_RTTI
      String libraryName();
      String libraryVersion();

 Legend:



Removed from v.2699
 


changed lines


 
Added in v.3169
 Legend:



Removed from v.2699
 


changed lines


 
Added in v.3169
-Removed from v.2699
+Added in v.3169

	ViewVC Help
Powered by ViewVC