--- libgig/trunk/src/gig.h 2007/03/11 17:44:31 1093
+++ libgig/trunk/src/gig.h 2007/08/25 09:59:53 1301
@@ -38,6 +38,8 @@
# define CHUNK_ID_3EWG 0x33657767
# define CHUNK_ID_EWAV 0x65776176
# define CHUNK_ID_3GNM 0x33676E6D
+# define CHUNK_ID_EINF 0x65696E66
+# define CHUNK_ID_3CRC 0x33637263
#else // little endian
# define LIST_TYPE_3PRG 0x67727033
# define LIST_TYPE_3EWL 0x6C776533
@@ -50,6 +52,8 @@
# define CHUNK_ID_3EWG 0x67776533
# define CHUNK_ID_EWAV 0x76617765
# define CHUNK_ID_3GNM 0x6D6E6733
+# define CHUNK_ID_EINF 0x666E6965
+# define CHUNK_ID_3CRC 0x63726333
#endif // WORDS_BIGENDIAN
/** Gigasampler specific classes and definitions */
@@ -319,6 +323,35 @@
progress_t();
};
+ /** @brief CRC-32 checksum implementation
+ *
+ * This class is used to calculate checksums of the sample data in
+ * a gig file. The checksums are stored in the 3crc chunk of the
+ * gig file and automatically updated when a sample is written
+ * with Sample::Write().
+ */
+ class CRC {
+ private:
+ uint32_t value;
+ static const uint32_t* table;
+ static uint32_t* initTable();
+ public:
+ CRC() {
+ reset();
+ }
+ void reset() {
+ value = 0xffffffff;
+ }
+ void update(unsigned char* buf, int len) {
+ for (int i = 0 ; i < len ; i++) {
+ value = table[(value ^ buf[i]) & 0xff] ^ (value >> 8);
+ }
+ }
+ uint32_t getValue() {
+ return value ^ 0xffffffff;
+ }
+ };
+
// just symbol prototyping
class File;
class Instrument;
@@ -437,11 +470,15 @@
double GetVelocityAttenuation(uint8_t MIDIKeyVelocity);
double GetVelocityRelease(uint8_t MIDIKeyVelocity);
double GetVelocityCutoff(uint8_t MIDIKeyVelocity);
+ // derived methods
+ DLS::Sampler::AddSampleLoop;
+ DLS::Sampler::DeleteSampleLoop;
// overridden methods
virtual void UpdateChunks();
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.
DimensionRegion(RIFF::List* _3ewl);
+ DimensionRegion(RIFF::List* _3ewl, const DimensionRegion& src);
~DimensionRegion();
friend class Region;
private:
@@ -496,6 +533,11 @@
* will create the mandatory RIFF chunk which will hold the sample wave
* data and / or resize the file so you will be able to Write() the
* sample data directly to disk.
+ *
+ * @e Caution: for gig synthesis, most looping relevant information are
+ * 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.
*/
class Sample : public DLS::Sample {
public:
@@ -506,14 +548,14 @@
uint32_t FineTune; ///< Specifies the fraction of a semitone up from the specified MIDI unity note field. A value of 0x80000000 means 1/2 semitone (50 cents) and a value of 0x00000000 means no fine tuning between semitones.
smpte_format_t SMPTEFormat; ///< Specifies the Society of Motion Pictures and Television E time format used in the following SMPTEOffset field. If a value of 0 is set, SMPTEOffset should also be set to 0.
uint32_t SMPTEOffset; ///< The SMPTE Offset value specifies the time offset to be used for the synchronization / calibration to the first sample in the waveform. This value uses a format of 0xhhmmssff where hh is a signed value that specifies the number of hours (-23 to 23), mm is an unsigned value that specifies the number of minutes (0 to 59), ss is an unsigned value that specifies the number of seconds (0 to 59) and ff is an unsigned value that specifies the number of frames (0 to -1).
- uint32_t Loops; ///< Number of defined sample loops (so far only seen single loops in gig files - please report me if you encounter more!).
+ uint32_t Loops; ///< @e Caution: Use the respective field in the DimensionRegion instead of this one! (Intended purpose: Number of defined sample loops. So far only seen single loops in gig files - please report if you encounter more!)
uint32_t LoopID; ///< Specifies the unique ID that corresponds to one of the defined cue points in the cue point list (only if Loops > 0), as the Gigasampler format only allows one loop definition at the moment, this attribute isn't really useful for anything.
- loop_type_t LoopType; ///< The type field defines how the waveform samples will be looped (only if Loops > 0).
- uint32_t LoopStart; ///< The start value specifies the offset (in sample points) in the waveform data of the first sample to be played in the loop (only if Loops > 0).
- uint32_t LoopEnd; ///< The end value specifies the offset (in sample points) in the waveform data which represents the end of the loop (only if Loops > 0).
- uint32_t LoopSize; ///< Length of the looping area (in sample points) which is equivalent to LoopEnd - LoopStart.
- uint32_t LoopFraction; ///< The fractional value specifies a fraction of a sample at which to loop (only if Loops > 0). This allows a loop to be fine tuned at a resolution greater than one sample. A value of 0 means no fraction, a value of 0x80000000 means 1/2 of a sample length. 0xFFFFFFFF is the smallest fraction of a sample that can be represented.
- uint32_t LoopPlayCount; ///< Number of times the loop should be played (only if Loops > 0, a value of 0 = infinite).
+ loop_type_t LoopType; ///< @e Caution: Use the respective field in the DimensionRegion instead of this one! (Intended purpose: The type field defines how the waveform samples will be looped.)
+ uint32_t LoopStart; ///< @e Caution: Use the respective field in the DimensionRegion instead of this one! (Intended purpose: The start value specifies the offset [in sample points] in the waveform data of the first sample to be played in the loop [only if Loops > 0].)
+ uint32_t LoopEnd; ///< @e Caution: Use the respective field in the DimensionRegion instead of this one! (Intended purpose: The end value specifies the offset [in sample points] in the waveform data which represents the end of the loop [only if Loops > 0].)
+ uint32_t LoopSize; ///< @e Caution: Use the respective fields in the DimensionRegion instead of this one! (Intended purpose: Length of the looping area [in sample points] which is equivalent to @code LoopEnd - LoopStart @endcode.)
+ uint32_t LoopFraction; ///< The fractional value specifies a fraction of a sample at which to loop. This allows a loop to be fine tuned at a resolution greater than one sample. A value of 0 means no fraction, a value of 0x80000000 means 1/2 of a sample length. 0xFFFFFFFF is the smallest fraction of a sample that can be represented.
+ uint32_t LoopPlayCount; ///< Number of times the loop should be played (a value of 0 = infinite).
bool Compressed; ///< If the sample wave is compressed (probably just interesting for instrument and sample editors, as this library already handles the decompression in it's sample access methods anyway).
uint32_t TruncatedBits; ///< For 24-bit compressed samples only: number of bits truncated during compression (0, 4 or 6)
bool Dithered; ///< For 24-bit compressed samples only: if dithering was used during compression with bit reduction
@@ -551,6 +593,7 @@
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;
+ CRC crc; ///< CRC-32 checksum of the raw sample data
Sample(File* pFile, RIFF::List* waveList, unsigned long WavePoolOffset, unsigned long fileNo = 0);
~Sample();
@@ -632,6 +675,8 @@
// derived methods from DLS::Resource
DLS::Resource::GetParent;
+ // derived methods from DLS::Instrument
+ DLS::Instrument::MoveRegion;
// overridden methods
Region* GetFirstRegion();
Region* GetNextRegion();
@@ -685,6 +730,9 @@
/** Parses Gigasampler files and provides abstract access to the data. */
class File : protected DLS::File {
public:
+ static const DLS::version_t VERSION_2;
+ static const DLS::version_t VERSION_3;
+
// derived attributes from DLS::Resource
DLS::Resource::pInfo;
DLS::Resource::pDLSID;
@@ -715,6 +763,7 @@
void DeleteGroup(Group* pGroup);
void DeleteGroupOnly(Group* pGroup);
virtual ~File();
+ virtual void UpdateChunks();
protected:
// overridden protected methods from DLS::File
virtual void LoadSamples();
@@ -723,10 +772,12 @@
// own protected methods
virtual void LoadSamples(progress_t* pProgress);
virtual void LoadInstruments(progress_t* pProgress);
+ void SetSampleChecksum(Sample* pSample, uint32_t crc);
friend class Region;
friend class Sample;
friend class Group; // so Group can access protected member pRIFF
private:
+ static const DLS::Info::FixedStringLength FixedStringLengths[];
std::list* pGroups;
std::list::iterator GroupsIterator;
};