--- libgig/trunk/src/DLS.h 2005/11/10 19:53:34 802 +++ libgig/trunk/src/DLS.h 2006/11/24 12:50:05 933 @@ -1,8 +1,8 @@ /*************************************************************************** * * - * libgig - C++ cross-platform Gigasampler format file loader library * + * libgig - C++ cross-platform Gigasampler format file access library * * * - * Copyright (C) 2003-2005 by Christian Schoenebeck * + * Copyright (C) 2003-2006 by Christian Schoenebeck * * * * * * This library is free software; you can redistribute it and/or modify * @@ -90,7 +90,7 @@ # define CHUNK_ID_IENG 0x474E4549 # define CHUNK_ID_IGNR 0x524E4749 # define CHUNK_ID_IKEY 0x59454B49 -# define CHUNK_ID_IMED 0x44525049 +# define CHUNK_ID_IMED 0x44454D49 # define CHUNK_ID_INAM 0x4D414E49 # define CHUNK_ID_IPRD 0x44525049 # define CHUNK_ID_ISBJ 0x4A425349 @@ -315,14 +315,17 @@ String Source; ///< . Identifies the name of the person or organization who supplied the original subject of the file. String SourceForm; ///< . 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 Medium. String Commissioned; ///< . Lists the name of the person or organization that commissioned the subject of the file, e.g., Pope Julian II. + String Subject; ///< . 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. Info(RIFF::List* list); + virtual ~Info(); virtual void UpdateChunks(); private: RIFF::List* pResourceListChunk; - void LoadString(uint32_t ChunkID, RIFF::List* lstINFO, String& s); - void SaveString(uint32_t ChunkID, RIFF::List* lstINFO, const String& s, const String& sDefault); + 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); }; /** Abstract base class which encapsulates data structures which all DLS resources are able to provide. */ @@ -364,19 +367,21 @@ /** @brief Encapsulates sample waves used for playback. * * In case you created a new sample with File::AddSample(), you should - * first call Resize() with the desired sample size. This will create + * first update all attributes with the desired meta informations + * (amount of channels, bit depth, sample rate, etc.), then call + * Resize() with the desired sample size. The latter will create * the mandatory RIFF chunk which will hold the sample wave data. */ class Sample : public Resource { public: - uint16_t FormatTag; ///< Format ID of the waveform data (should be WAVE_FORMAT_PCM for DLS1 compliant files). - uint16_t Channels; ///< Number of channels represented in the waveform data, e.g. 1 for mono, 2 for stereo (). - uint32_t SamplesPerSecond; ///< Sampling rate at which each channel should be played. + uint16_t FormatTag; ///< Format ID of the waveform data (should be WAVE_FORMAT_PCM for DLS1 compliant files, this is also the default value if Sample was created with Instrument::AddSample()). + uint16_t Channels; ///< Number of channels represented in the waveform data, e.g. 1 for mono, 2 for stereo (defaults to 1=mono if Sample was created with Instrument::AddSample() previously). + uint32_t SamplesPerSecond; ///< Sampling rate at which each channel should be played (defaults to 44100 if Sample was created with Instrument::AddSample() previously). uint32_t AverageBytesPerSecond; ///< The average number of bytes per second at which the waveform data should be transferred (Playback software can estimate the buffer size using this value). uint16_t BlockAlign; ///< The block alignment (in bytes) of the waveform data. Playback software needs to process a multiple of BlockAlign bytes of data at a time, so the value of BlockAlign can be used for buffer alignment. uint16_t BitDepth; ///< Size of each sample per channel (only if known sample data format is used, 0 otherwise). unsigned long SamplesTotal; ///< Reflects total number of sample points (only if known sample data format is used, 0 otherwise), do not bother to change this value, it will not be saved. - uint FrameSize; ///< Reflects the size (in bytes) of one single sample point (only if known sample data format is used, 0 otherwise). + uint FrameSize; ///< Reflects the size (in bytes) of one single sample point (only if known sample data format is used, 0 otherwise). Caution: with the current version of libgig you have to upate this field by yourself whenever you change one of the following fields: Channels, BitDepth ! Ignoring this might lead to undesired behavior when i.e. calling Resize(), SetPos(), Write() or Read(). void* LoadSampleData(); void ReleaseSampleData(); @@ -453,7 +458,7 @@ RegionList::iterator RegionsIterator; Instrument(File* pFile, RIFF::List* insList); - void LoadRegions(); + virtual void LoadRegions(); virtual ~Instrument(); friend class File; }; @@ -483,6 +488,7 @@ typedef std::list InstrumentList; RIFF::File* pRIFF; + std::list ExtensionFiles; SampleList* pSamples; SampleList::iterator SamplesIterator; InstrumentList* pInstruments; @@ -493,8 +499,8 @@ uint32_t* pWavePoolTableHi; bool b64BitWavePoolOffsets; - void LoadSamples(); - void LoadInstruments(); + virtual void LoadSamples(); + virtual void LoadInstruments(); void __ensureMandatoryChunksExist(); friend class Region; // Region has to look in the wave pool table to get its sample private: