--- libgig/trunk/src/DLS.cpp 2006/10/24 19:32:47 928 +++ libgig/trunk/src/DLS.cpp 2007/05/13 13:24:22 1184 @@ -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-2007 by Christian Schoenebeck * * * * * * This library is free software; you can redistribute it and/or modify * @@ -142,15 +142,15 @@ const int iEntrySize = 12; // 12 bytes per connection block pArticulationCk->Resize(HeaderSize + Connections * iEntrySize); uint8_t* pData = (uint8_t*) pArticulationCk->LoadChunkData(); - memcpy(&pData[0], &HeaderSize, 2); - memcpy(&pData[2], &Connections, 2); + store16(&pData[0], HeaderSize); + store16(&pData[2], Connections); for (uint32_t i = 0; i < Connections; i++) { Connection::conn_block_t c = pConnections[i].ToConnBlock(); - memcpy(&pData[HeaderSize + i * iEntrySize], &c.source, 2); - memcpy(&pData[HeaderSize + i * iEntrySize + 2], &c.control, 2); - memcpy(&pData[HeaderSize + i * iEntrySize + 4], &c.destination, 2); - memcpy(&pData[HeaderSize + i * iEntrySize + 6], &c.transform, 2); - memcpy(&pData[HeaderSize + i * iEntrySize + 8], &c.scale, 4); + store16(&pData[HeaderSize + i * iEntrySize], c.source); + store16(&pData[HeaderSize + i * iEntrySize + 2], c.control); + store16(&pData[HeaderSize + i * iEntrySize + 4], c.destination); + store16(&pData[HeaderSize + i * iEntrySize + 6], c.transform); + store32(&pData[HeaderSize + i * iEntrySize + 8], c.scale); } } @@ -228,12 +228,12 @@ /** @brief Constructor. * - * Initializes the info strings with values provided by a INFO list chunk. + * Initializes the info strings with values provided by an INFO list chunk. * - * @param list - pointer to a list chunk which contains a INFO list chunk + * @param list - pointer to a list chunk which contains an INFO list chunk */ Info::Info(RIFF::List* list) { - UseFixedLengthStrings = false; + FixedStringLengths = NULL; pResourceListChunk = list; if (list) { RIFF::List* lstINFO = list->GetSubList(LIST_TYPE_INFO); @@ -269,15 +269,7 @@ */ void Info::LoadString(uint32_t ChunkID, RIFF::List* lstINFO, String& s) { RIFF::Chunk* ck = lstINFO->GetSubChunk(ChunkID); - if (ck) { - const char* str = (char*)ck->LoadChunkData(); - int size = ck->GetSize(); - int len; - for (len = 0 ; len < size ; len++) - if (str[len] == '\0') break; - s.assign(str, len); - ck->ReleaseChunkData(); - } + ::LoadString(ck, s); // function from helper.h } /** @brief Apply given INFO field to the respective chunk. @@ -294,22 +286,18 @@ * @param lstINFO - parent (INFO) RIFF list chunk * @param s - current value of info field * @param sDefault - default value - * @param size - wanted size of the INFO chunk. This is ignored if UseFixedLengthStrings is false. */ - void Info::SaveString(uint32_t ChunkID, RIFF::List* lstINFO, const String& s, const String& sDefault, int size) { - RIFF::Chunk* ck = lstINFO->GetSubChunk(ChunkID); - if (ck) { // if chunk exists already, use 's' as value - if (!UseFixedLengthStrings) size = s.size() + 1; - ck->Resize(size); - char* pData = (char*) ck->LoadChunkData(); - strncpy(pData, s.c_str(), size); - } else if (s != "" || sDefault != "") { // create chunk - const String& sToSave = (s != "") ? s : sDefault; - if (!UseFixedLengthStrings) size = sToSave.size() + 1; - ck = lstINFO->AddSubChunk(ChunkID, size); - char* pData = (char*) ck->LoadChunkData(); - strncpy(pData, sToSave.c_str(), size); + void Info::SaveString(uint32_t ChunkID, RIFF::List* lstINFO, const String& s, const String& sDefault) { + int size = 0; + if (FixedStringLengths) { + for (int i = 0 ; FixedStringLengths[i].length ; i++) { + if (FixedStringLengths[i].chunkId == ChunkID) { + size = FixedStringLengths[i].length; + } + } } + RIFF::Chunk* ck = lstINFO->GetSubChunk(ChunkID); + ::SaveString(ChunkID, ck, lstINFO, s, sDefault, size != 0, size); // function from helper.h } /** @brief Update chunks with current info values. @@ -354,28 +342,23 @@ // save values - // (the string size values are for gig files; they are only - // used if UseFixedLengthStrings is set to true) - SaveString(CHUNK_ID_INAM, lstINFO, Name, defaultName, - resourceType == RIFF_TYPE_DLS ? 128 : 64); - SaveString(CHUNK_ID_IARL, lstINFO, ArchivalLocation, String(""), 256); - SaveString(CHUNK_ID_ICRD, lstINFO, CreationDate, defaultCreationDate, 128); - SaveString(CHUNK_ID_ICMT, lstINFO, Comments, defaultComments, 1024); - SaveString(CHUNK_ID_IPRD, lstINFO, Product, String(""), 128); - SaveString(CHUNK_ID_ICOP, lstINFO, Copyright, String(""), 128); - SaveString(CHUNK_ID_IART, lstINFO, Artists, String(""), 128); - SaveString(CHUNK_ID_IGNR, lstINFO, Genre, String(""), 128); - SaveString(CHUNK_ID_IKEY, lstINFO, Keywords, String(""), 128); - SaveString(CHUNK_ID_IENG, lstINFO, Engineer, String(""), 128); - SaveString(CHUNK_ID_ITCH, lstINFO, Technician, String(""), 128); - SaveString(CHUNK_ID_ISFT, lstINFO, Software, defaultSoftware, - resourceType == LIST_TYPE_INS ? - (Software == "" ? defaultSoftware.length() : Software.length()) : 128); - SaveString(CHUNK_ID_IMED, lstINFO, Medium, String(""), 128); - SaveString(CHUNK_ID_ISRC, lstINFO, Source, String(""), 128); - SaveString(CHUNK_ID_ISRF, lstINFO, SourceForm, String(""), 128); - SaveString(CHUNK_ID_ICMS, lstINFO, Commissioned, String(""), 128); - SaveString(CHUNK_ID_ISBJ, lstINFO, Subject, String(""), 128); + SaveString(CHUNK_ID_IARL, lstINFO, ArchivalLocation, String("")); + SaveString(CHUNK_ID_IART, lstINFO, Artists, String("")); + SaveString(CHUNK_ID_ICMS, lstINFO, Commissioned, String("")); + SaveString(CHUNK_ID_ICMT, lstINFO, Comments, defaultComments); + SaveString(CHUNK_ID_ICOP, lstINFO, Copyright, String("")); + SaveString(CHUNK_ID_ICRD, lstINFO, CreationDate, defaultCreationDate); + SaveString(CHUNK_ID_IENG, lstINFO, Engineer, String("")); + SaveString(CHUNK_ID_IGNR, lstINFO, Genre, String("")); + SaveString(CHUNK_ID_IKEY, lstINFO, Keywords, String("")); + SaveString(CHUNK_ID_IMED, lstINFO, Medium, String("")); + SaveString(CHUNK_ID_INAM, lstINFO, Name, defaultName); + SaveString(CHUNK_ID_IPRD, lstINFO, Product, String("")); + SaveString(CHUNK_ID_ISBJ, lstINFO, Subject, String("")); + SaveString(CHUNK_ID_ISFT, lstINFO, Software, defaultSoftware); + SaveString(CHUNK_ID_ISRC, lstINFO, Source, String("")); + SaveString(CHUNK_ID_ISRF, lstINFO, SourceForm, String("")); + SaveString(CHUNK_ID_ITCH, lstINFO, Technician, String("")); } @@ -481,24 +464,70 @@ } uint8_t* pData = (uint8_t*) wsmp->LoadChunkData(); // update headers size - memcpy(&pData[0], &uiHeaderSize, 4); + store32(&pData[0], uiHeaderSize); // update respective sampler options bits SamplerOptions = (NoSampleDepthTruncation) ? SamplerOptions | F_WSMP_NO_TRUNCATION : SamplerOptions & (~F_WSMP_NO_TRUNCATION); SamplerOptions = (NoSampleCompression) ? SamplerOptions | F_WSMP_NO_COMPRESSION : SamplerOptions & (~F_WSMP_NO_COMPRESSION); - memcpy(&pData[4], &UnityNote, 2); - memcpy(&pData[6], &FineTune, 2); - memcpy(&pData[8], &Gain, 4); - memcpy(&pData[12], &SamplerOptions, 4); - memcpy(&pData[16], &SampleLoops, 4); + store16(&pData[4], UnityNote); + store16(&pData[6], FineTune); + store32(&pData[8], Gain); + store32(&pData[12], SamplerOptions); + store32(&pData[16], SampleLoops); // update loop definitions for (uint32_t i = 0; i < SampleLoops; i++) { //FIXME: this does not handle extended loop structs correctly - memcpy(&pData[uiHeaderSize + i * 16], pSampleLoops + i, 4 * 4); + store32(&pData[uiHeaderSize + i * 16], pSampleLoops[i].Size); + store32(&pData[uiHeaderSize + i * 16 + 4], pSampleLoops[i].LoopType); + store32(&pData[uiHeaderSize + i * 16 + 8], pSampleLoops[i].LoopStart); + store32(&pData[uiHeaderSize + i * 16 + 12], pSampleLoops[i].LoopLength); } } + /** + * Adds a new sample loop with the provided loop definition. + * + * @param - points to a loop definition that is to be copied + */ + void Sampler::AddSampleLoop(sample_loop_t* pLoopDef) { + sample_loop_t* pNewLoops = new sample_loop_t[SampleLoops + 1]; + // copy old loops array + for (int i = 0; i < SampleLoops; i++) { + pNewLoops[i] = pSampleLoops[i]; + } + // add the new loop + pNewLoops[SampleLoops] = *pLoopDef; + // auto correct size field + pNewLoops[SampleLoops].Size = sizeof(DLS::sample_loop_t); + // free the old array and update the member variables + if (SampleLoops) delete[] pSampleLoops; + pSampleLoops = pNewLoops; + SampleLoops++; + } + + /** + * Deletes an existing sample loop. + * + * @param pLoopDef - pointer to existing loop definition + * @throws Exception - if given loop definition does not exist + */ + void Sampler::DeleteSampleLoop(sample_loop_t* pLoopDef) { + sample_loop_t* pNewLoops = new sample_loop_t[SampleLoops - 1]; + // copy old loops array (skipping given loop) + for (int i = 0, o = 0; i < SampleLoops; i++) { + if (&pSampleLoops[i] == pLoopDef) continue; + if (o == SampleLoops - 1) + throw Exception("Could not delete Sample Loop, because it does not exist"); + pNewLoops[o] = pSampleLoops[i]; + o++; + } + // free the old array and update the member variables + if (SampleLoops) delete[] pSampleLoops; + pSampleLoops = pNewLoops; + SampleLoops--; + } + // *************** Sample *************** @@ -532,7 +561,7 @@ AverageBytesPerSecond = pCkFormat->ReadUint32(); BlockAlign = pCkFormat->ReadUint16(); // PCM format specific - if (FormatTag == WAVE_FORMAT_PCM) { + if (FormatTag == DLS_WAVE_FORMAT_PCM) { BitDepth = pCkFormat->ReadUint16(); FrameSize = (BitDepth / 8) * Channels; } else { // unsupported sample data format @@ -540,7 +569,7 @@ FrameSize = 0; } } else { // 'fmt' chunk missing - FormatTag = WAVE_FORMAT_PCM; + FormatTag = DLS_WAVE_FORMAT_PCM; BitDepth = 16; Channels = 1; SamplesPerSecond = 44100; @@ -548,8 +577,8 @@ FrameSize = (BitDepth / 8) * Channels; BlockAlign = FrameSize; } - SamplesTotal = (pCkData) ? (FormatTag == WAVE_FORMAT_PCM) ? pCkData->GetSize() / FrameSize - : 0 + SamplesTotal = (pCkData) ? (FormatTag == DLS_WAVE_FORMAT_PCM) ? pCkData->GetSize() / FrameSize + : 0 : 0; } @@ -609,11 +638,11 @@ * the RIFF chunk which encapsulates the sample's wave data. The * returned value is dependant to the current FrameSize value. * - * @returns number of sample points or 0 if FormatTag != WAVE_FORMAT_PCM + * @returns number of sample points or 0 if FormatTag != DLS_WAVE_FORMAT_PCM * @see FrameSize, FormatTag */ unsigned long Sample::GetSize() { - if (FormatTag != WAVE_FORMAT_PCM) return 0; + if (FormatTag != DLS_WAVE_FORMAT_PCM) return 0; return (pCkData) ? pCkData->GetSize() / FrameSize : 0; } @@ -635,18 +664,18 @@ * calling File::Save() as this might exceed the current sample's * boundary! * - * Also note: only WAVE_FORMAT_PCM is currently supported, that is - * FormatTag must be WAVE_FORMAT_PCM. Trying to resize samples with + * Also note: only DLS_WAVE_FORMAT_PCM is currently supported, that is + * FormatTag must be DLS_WAVE_FORMAT_PCM. Trying to resize samples with * other formats will fail! * * @param iNewSize - new sample wave data size in sample points (must be * greater than zero) - * @throws Excecption if FormatTag != WAVE_FORMAT_PCM + * @throws Excecption if FormatTag != DLS_WAVE_FORMAT_PCM * @throws Exception if \a iNewSize is less than 1 * @see File::Save(), FrameSize, FormatTag */ void Sample::Resize(int iNewSize) { - if (FormatTag != WAVE_FORMAT_PCM) throw Exception("Sample's format is not WAVE_FORMAT_PCM"); + if (FormatTag != DLS_WAVE_FORMAT_PCM) throw Exception("Sample's format is not DLS_WAVE_FORMAT_PCM"); if (iNewSize < 1) throw Exception("Sample size must be at least one sample point"); const int iSizeInBytes = iNewSize * FrameSize; pCkData = pWaveList->GetSubChunk(CHUNK_ID_DATA); @@ -659,19 +688,19 @@ * bytes). Use this method and Read() if you don't want to load * the sample into RAM, thus for disk streaming. * - * Also note: only WAVE_FORMAT_PCM is currently supported, that is - * FormatTag must be WAVE_FORMAT_PCM. Trying to reposition the sample + * Also note: only DLS_WAVE_FORMAT_PCM is currently supported, that is + * FormatTag must be DLS_WAVE_FORMAT_PCM. Trying to reposition the sample * with other formats will fail! * * @param SampleCount number of sample points * @param Whence to which relation \a SampleCount refers to * @returns new position within the sample, 0 if - * FormatTag != WAVE_FORMAT_PCM + * FormatTag != DLS_WAVE_FORMAT_PCM * @throws Exception if no data RIFF chunk was created for the sample yet * @see FrameSize, FormatTag */ unsigned long Sample::SetPos(unsigned long SampleCount, RIFF::stream_whence_t Whence) { - if (FormatTag != WAVE_FORMAT_PCM) return 0; // failed: wave data not PCM format + if (FormatTag != DLS_WAVE_FORMAT_PCM) return 0; // failed: wave data not PCM format if (!pCkData) throw Exception("No data chunk created for sample yet, call Sample::Resize() to create one"); unsigned long orderedBytes = SampleCount * FrameSize; unsigned long result = pCkData->SetPos(orderedBytes, Whence); @@ -689,7 +718,7 @@ * @param SampleCount number of sample points to read */ unsigned long Sample::Read(void* pBuffer, unsigned long SampleCount) { - if (FormatTag != WAVE_FORMAT_PCM) return 0; // failed: wave data not PCM format + if (FormatTag != DLS_WAVE_FORMAT_PCM) return 0; // failed: wave data not PCM format return pCkData->Read(pBuffer, SampleCount, FrameSize); // FIXME: channel inversion due to endian correction? } @@ -709,7 +738,7 @@ * @see LoadSampleData() */ unsigned long Sample::Write(void* pBuffer, unsigned long SampleCount) { - if (FormatTag != WAVE_FORMAT_PCM) return 0; // failed: wave data not PCM format + if (FormatTag != DLS_WAVE_FORMAT_PCM) return 0; // failed: wave data not PCM format if (GetSize() < SampleCount) throw Exception("Could not write sample data, current sample size to small"); return pCkData->Write(pBuffer, SampleCount, FrameSize); // FIXME: channel inversion due to endian correction? } @@ -718,11 +747,11 @@ * Apply sample and its settings to the respective RIFF chunks. You have * to call File::Save() to make changes persistent. * - * @throws Exception if FormatTag != WAVE_FORMAT_PCM or no sample data + * @throws Exception if FormatTag != DLS_WAVE_FORMAT_PCM or no sample data * was provided yet */ void Sample::UpdateChunks() { - if (FormatTag != WAVE_FORMAT_PCM) + if (FormatTag != DLS_WAVE_FORMAT_PCM) throw Exception("Could not save sample, only PCM format is supported"); // we refuse to do anything if not sample wave form was provided yet if (!pCkData) @@ -734,12 +763,12 @@ if (!pCkFormat) pCkFormat = pWaveList->AddSubChunk(CHUNK_ID_FMT, 16); // assumes PCM format uint8_t* pData = (uint8_t*) pCkFormat->LoadChunkData(); // update 'fmt' chunk - memcpy(&pData[0], &FormatTag, 2); - memcpy(&pData[2], &Channels, 2); - memcpy(&pData[4], &SamplesPerSecond, 4); - memcpy(&pData[8], &AverageBytesPerSecond, 4); - memcpy(&pData[12], &BlockAlign, 2); - memcpy(&pData[14], &BitDepth, 2); // assuming PCM format + store16(&pData[0], FormatTag); + store16(&pData[2], Channels); + store32(&pData[4], SamplesPerSecond); + store32(&pData[8], AverageBytesPerSecond); + store16(&pData[12], BlockAlign); + store16(&pData[14], BitDepth); // assuming PCM format } @@ -837,11 +866,13 @@ ? FormatOptionFlags | F_RGN_OPTION_SELFNONEXCLUSIVE : FormatOptionFlags & (~F_RGN_OPTION_SELFNONEXCLUSIVE); // update 'rgnh' chunk - memcpy(&pData[0], &KeyRange, 2 * 2); - memcpy(&pData[4], &VelocityRange, 2 * 2); - memcpy(&pData[8], &FormatOptionFlags, 2); - memcpy(&pData[10], &KeyGroup, 2); - if (rgnh->GetSize() >= 14) memcpy(&pData[12], &Layer, 2); + store16(&pData[0], KeyRange.low); + store16(&pData[2], KeyRange.high); + store16(&pData[4], VelocityRange.low); + store16(&pData[6], VelocityRange.high); + store16(&pData[8], FormatOptionFlags); + store16(&pData[10], KeyGroup); + if (rgnh->GetSize() >= 14) store16(&pData[12], Layer); // update chunks of base classes as well (but skip Resource, // as a rgn doesn't seem to have dlid and INFO chunks) @@ -874,10 +905,10 @@ if (index < 0) throw Exception("Could not save Region, could not find Region's sample"); WavePoolTableIndex = index; // update 'wlnk' chunk - memcpy(&pData[0], &WaveLinkOptionFlags, 2); - memcpy(&pData[2], &PhaseGroup, 2); - memcpy(&pData[4], &Channel, 4); - memcpy(&pData[8], &WavePoolTableIndex, 4); + store16(&pData[0], WaveLinkOptionFlags); + store16(&pData[2], PhaseGroup); + store32(&pData[4], Channel); + store32(&pData[8], WavePoolTableIndex); } @@ -960,6 +991,15 @@ return pNewRegion; } + void Instrument::MoveRegion(Region* pSrc, Region* pDst) { + RIFF::List* lrgn = pCkInstrument->GetSubList(LIST_TYPE_LRGN); + lrgn->MoveSubChunk(pSrc->pCkRegion, pDst ? pDst->pCkRegion : 0); + + pRegions->remove(pSrc); + RegionList::iterator iter = find(pRegions->begin(), pRegions->end(), pDst); + pRegions->insert(iter, pSrc); + } + void Instrument::DeleteRegion(Region* pRegion) { if (!pRegions) return; RegionList::iterator iter = find(pRegions->begin(), pRegions->end(), pRegion); @@ -990,8 +1030,9 @@ locale.bank = MIDI_BANK_ENCODE(MIDIBankCoarse, MIDIBankFine); locale.bank = (IsDrum) ? locale.bank | DRUM_TYPE_MASK : locale.bank & (~DRUM_TYPE_MASK); MIDIBank = MIDI_BANK_MERGE(MIDIBankCoarse, MIDIBankFine); // just a sync, when we're at it - memcpy(&pData[0], &Regions, 4); - memcpy(&pData[4], &locale, 2 * 4); + store32(&pData[0], Regions); + store32(&pData[4], locale.bank); + store32(&pData[8], locale.instrument); // update Region's chunks if (!pRegions) return; RegionList::iterator iter = pRegions->begin(); @@ -1033,6 +1074,7 @@ * a DLS file. */ File::File() : Resource(NULL, pRIFF = new RIFF::File(RIFF_TYPE_DLS)) { + pRIFF->SetByteOrder(RIFF::endian_little); pVersion = new version_t; pVersion->major = 0; pVersion->minor = 0; @@ -1287,7 +1329,10 @@ RIFF::Chunk* ckVersion = pRIFF->GetSubChunk(CHUNK_ID_VERS); if (!ckVersion) ckVersion = pRIFF->AddSubChunk(CHUNK_ID_VERS, 8); uint8_t* pData = (uint8_t*) ckVersion->LoadChunkData(); - memcpy(pData, pVersion, 2 * 4); + store16(&pData[0], pVersion->minor); + store16(&pData[2], pVersion->major); + store16(&pData[4], pVersion->build); + store16(&pData[6], pVersion->release); } // update 'colh' chunk @@ -1295,7 +1340,7 @@ RIFF::Chunk* colh = pRIFF->GetSubChunk(CHUNK_ID_COLH); if (!colh) colh = pRIFF->AddSubChunk(CHUNK_ID_COLH, 4); uint8_t* pData = (uint8_t*) colh->LoadChunkData(); - memcpy(pData, &Instruments, 4); + store32(pData, Instruments); // update instrument's chunks if (pInstruments) { @@ -1315,7 +1360,7 @@ ptbl->Resize(iPtblSize); pData = (uint8_t*) ptbl->LoadChunkData(); WavePoolCount = iSamples; - memcpy(&pData[4], &WavePoolCount, 4); + store32(&pData[4], WavePoolCount); // we actually update the sample offsets in the pool table when we Save() memset(&pData[WavePoolHeaderSize], 0, iPtblSize - WavePoolHeaderSize); @@ -1404,18 +1449,24 @@ unsigned long ulOriginalPos = ptbl->GetPos(); // update headers ptbl->SetPos(0); - ptbl->WriteUint32(&WavePoolHeaderSize); - ptbl->WriteUint32(&WavePoolCount); + uint32_t tmp = WavePoolHeaderSize; + ptbl->WriteUint32(&tmp); + tmp = WavePoolCount; + ptbl->WriteUint32(&tmp); // update offsets ptbl->SetPos(WavePoolHeaderSize); if (b64BitWavePoolOffsets) { for (int i = 0 ; i < WavePoolCount ; i++) { - ptbl->WriteUint32(&pWavePoolTableHi[i]); - ptbl->WriteUint32(&pWavePoolTable[i]); + tmp = pWavePoolTableHi[i]; + ptbl->WriteUint32(&tmp); + tmp = pWavePoolTable[i]; + ptbl->WriteUint32(&tmp); } } else { // conventional 32 bit offsets - for (int i = 0 ; i < WavePoolCount ; i++) - ptbl->WriteUint32(&pWavePoolTable[i]); + for (int i = 0 ; i < WavePoolCount ; i++) { + tmp = pWavePoolTable[i]; + ptbl->WriteUint32(&tmp); + } } // restore 'ptbl' chunk's original read/write position ptbl->SetPos(ulOriginalPos);