--- libgig/trunk/src/DLS.h	2007/03/02 01:04:45	1050
+++ libgig/trunk/src/DLS.h	2007/09/30 18:13:33	1358
@@ -224,10 +224,10 @@
 
     /** Defines Sample Loop Points. */
     struct sample_loop_t {
-        uint32_t Size;
-        uint32_t LoopType;
-        uint32_t LoopStart;
-        uint32_t LoopLength;
+        uint32_t Size;       ///< For internal usage only: usually reflects exactly @c sizeof(sample_loop_t), otherwise if the value is larger then the DLS format was extended!
+        uint32_t LoopType;   ///< Defines how the waveform samples will be looped (appropriate loop types for the gig format are defined by gig::loop_type_t).
+        uint32_t LoopStart;  ///< The start value specifies the offset (in sample points) in the waveform data of the first sample point to be played in the loop.
+        uint32_t LoopLength; ///< Length of the looping area (in sample points).
     };
 
     // just symbol prototyping
@@ -316,8 +316,13 @@
             String SourceForm;       ///< <ISRF-ck>. Identifies the original form of the material that was digitized, such as record, sampling CD, TV sound track. This is not neccessarily the same as <i>Medium</i>.
             String Commissioned;     ///< <ICMS-ck>. Lists the name of the person or organization that commissioned the subject of the file, e.g., Pope Julian II.
             String Subject;          ///< <ISBJ-ck>. Describes the contents of the file.
-            bool UseFixedLengthStrings; ///< Set this to true if the info strings should be stored with a fixed length format. This is used for gig files, not for ordinary DLS files.
+            bool UseFixedLengthStrings; ///< @deprecated Use #FixedStringLengths instead.
 
+            struct FixedStringLength {
+                uint32_t chunkId;
+                int length;
+            };
+            const FixedStringLength* FixedStringLengths; ///< List of IDs and string lengths for strings that should be stored in a fixed length format. This is used for gig files, not for ordinary DLS files.
             Info(RIFF::List* list);
             virtual ~Info();
             virtual void UpdateChunks();
@@ -325,7 +330,7 @@
             RIFF::List* pResourceListChunk;
 
             static void LoadString(uint32_t ChunkID, RIFF::List* lstINFO, String& s);
-            static void SaveString(uint32_t ChunkID, RIFF::List* lstINFO, const String& s, const String& sDefault, bool bUseFixedLengthStrings, int size);
+            void SaveString(uint32_t ChunkID, RIFF::List* lstINFO, const String& s, const String& sDefault);
     };
 
     /** Abstract base class which encapsulates data structures which all DLS resources are able to provide. */
@@ -336,6 +341,7 @@
 
             Resource* GetParent() { return pParent; };
             virtual void UpdateChunks();
+            void GenerateDLSID();
         protected:
             Resource* pParent;
             RIFF::List* pResourceList;
@@ -349,12 +355,15 @@
         public:
             uint8_t        UnityNote;
             int16_t        FineTune;
-            int32_t        Gain;
+            int32_t        Gain; ///< @deprecated Don't alter directly, use SetGain() instead!
             bool           NoSampleDepthTruncation;
             bool           NoSampleCompression;
             uint32_t       SampleLoops;  ///< Reflects the number of sample loops.
             sample_loop_t* pSampleLoops; ///< Points to the beginning of a sample loop array, or is NULL if there are no loops defined.
 
+            void AddSampleLoop(sample_loop_t* pLoopDef);
+            void DeleteSampleLoop(sample_loop_t* pLoopDef);
+            virtual void SetGain(int32_t gain);
             virtual void UpdateChunks();
         protected:
             RIFF::List*    pParentList;
@@ -406,7 +415,7 @@
     /** Defines <i>Region</i> information of an <i>Instrument</i>. */
     class Region : public Resource, public Articulator, public Sampler {
         public:
-            range_t     KeyRange;
+            range_t     KeyRange; ///< @deprecated Only read, don't write! Use SetKeyRange() instead.
             range_t     VelocityRange;
             uint16_t    KeyGroup;
             uint16_t    Layer;
@@ -418,6 +427,7 @@
 
             Sample*     GetSample();
             void        SetSample(Sample* pSample);
+            virtual void SetKeyRange(uint16_t Low, uint16_t High);
             virtual void UpdateChunks();
         protected:
             RIFF::List* pCkRegion;
@@ -461,6 +471,9 @@
             virtual void LoadRegions();
             virtual ~Instrument();
             friend class File;
+            friend class Region;
+        private:
+            void MoveRegion(Region* pSrc, Region* pDst);
     };
 
     /** Parses DLS Level 1 and 2 compliant files and provides abstract access to the data. */
@@ -508,7 +521,13 @@
             void __UpdateWavePoolTable();
     };
 
-    /** Will be thrown whenever a DLS specific error occurs while trying to access a DLS File. */
+    /**
+     * Will be thrown whenever a DLS specific error occurs while trying to
+     * access a DLS File. Note: In your application you should better catch
+     * for RIFF::Exception rather than this one, except you explicitly want
+     * to catch and handle DLS::Exception and RIFF::Exception independently,
+     * which usually shouldn't be necessary though.
+     */
     class Exception : public RIFF::Exception {
         public:
             Exception(String Message);