--- libgig/trunk/src/DLS.cpp 2005/11/12 19:16:01 804 +++ libgig/trunk/src/DLS.cpp 2007/08/02 14:12:55 1266 @@ -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 * @@ -25,6 +25,12 @@ #include +#ifdef __APPLE__ +#include +#elif defined(HAVE_UUID_UUID_H) +#include +#endif + #include "helper.h" // macros to decode connection transforms @@ -45,7 +51,7 @@ #define CONN_TRANSFORM_INVERT_SRC_ENCODE(x) ((x) ? 0x8000 : 0) #define CONN_TRANSFORM_INVERT_CTL_ENCODE(x) ((x) ? 0x0200 : 0) -#define DRUM_TYPE_MASK 0x00000001 +#define DRUM_TYPE_MASK 0x80000000 #define F_RGN_OPTION_SELFNONEXCLUSIVE 0x0001 @@ -142,15 +148,15 @@ const int iEntrySize = 12; // 12 bytes per connection block pArticulationCk->Resize(HeaderSize + Connections * iEntrySize); uint8_t* pData = (uint8_t*) pArticulationCk->LoadChunkData(); - memccpy(&pData[0], &HeaderSize, 1, 2); - memccpy(&pData[2], &Connections, 1, 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(); - memccpy(&pData[HeaderSize + i * iEntrySize], &c.source, 1, 2); - memccpy(&pData[HeaderSize + i * iEntrySize + 2], &c.control, 1, 2); - memccpy(&pData[HeaderSize + i * iEntrySize + 4], &c.destination, 1, 2); - memccpy(&pData[HeaderSize + i * iEntrySize + 6], &c.transform, 1, 2); - memccpy(&pData[HeaderSize + i * iEntrySize + 8], &c.scale, 1, 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,11 +234,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) { + FixedStringLengths = NULL; pResourceListChunk = list; if (list) { RIFF::List* lstINFO = list->GetSubList(LIST_TYPE_INFO); @@ -253,10 +260,14 @@ LoadString(CHUNK_ID_ISRC, lstINFO, Source); LoadString(CHUNK_ID_ISRF, lstINFO, SourceForm); LoadString(CHUNK_ID_ICMS, lstINFO, Commissioned); + LoadString(CHUNK_ID_ISBJ, lstINFO, Subject); } } } + Info::~Info() { + } + /** @brief Load given INFO field. * * Load INFO field from INFO chunk with chunk ID \a ChunkID from INFO @@ -264,11 +275,7 @@ */ void Info::LoadString(uint32_t ChunkID, RIFF::List* lstINFO, String& s) { RIFF::Chunk* ck = lstINFO->GetSubChunk(ChunkID); - if (ck) { - // TODO: no check for ZSTR terminated strings yet - s = (char*) ck->LoadChunkData(); - ck->ReleaseChunkData(); - } + ::LoadString(ck, s); // function from helper.h } /** @brief Apply given INFO field to the respective chunk. @@ -287,17 +294,17 @@ * @param sDefault - default value */ void Info::SaveString(uint32_t ChunkID, RIFF::List* lstINFO, const String& s, const String& sDefault) { - RIFF::Chunk* ck = lstINFO->GetSubChunk(ChunkID); - if (ck) { // if chunk exists already, use 's' as value - ck->Resize(s.size() + 1); - char* pData = (char*) ck->LoadChunkData(); - memcpy(pData, s.c_str(), s.size() + 1); - } else if (s != "" || sDefault != "") { // create chunk - const String& sToSave = (s != "") ? s : sDefault; - ck = lstINFO->AddSubChunk(ChunkID, sToSave.size() + 1); - char* pData = (char*) ck->LoadChunkData(); - memcpy(pData, sToSave.c_str(), sToSave.size() + 1); + int size = 0; + if (FixedStringLengths) { + for (int i = 0 ; FixedStringLengths[i].length ; i++) { + if (FixedStringLengths[i].chunkId == ChunkID) { + size = FixedStringLengths[i].length; + break; + } + } } + 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. @@ -310,36 +317,55 @@ // make sure INFO list chunk exists RIFF::List* lstINFO = pResourceListChunk->GetSubList(LIST_TYPE_INFO); - if (!lstINFO) lstINFO = pResourceListChunk->AddSubList(LIST_TYPE_INFO); - // assemble default values in case the respective chunk is missing yet - String defaultName = "NONAME"; - // get current date - time_t now = time(NULL); - tm* pNowBroken = localtime(&now); - String defaultCreationDate = ToString(1900 + pNowBroken->tm_year) + "-" + - ToString(pNowBroken->tm_mon + 1) + "-" + - ToString(pNowBroken->tm_mday); - String defaultSoftware = libraryName() + " " + libraryVersion(); - String defaultComments = "Created with " + libraryName() + " " + libraryVersion(); + String defaultName = ""; + String defaultCreationDate = ""; + String defaultSoftware = ""; + String defaultComments = ""; + + uint32_t resourceType = pResourceListChunk->GetListType(); + + if (!lstINFO) { + lstINFO = pResourceListChunk->AddSubList(LIST_TYPE_INFO); + + // assemble default values + defaultName = "NONAME"; + + if (resourceType == RIFF_TYPE_DLS) { + // get current date + time_t now = time(NULL); + tm* pNowBroken = localtime(&now); + char buf[11]; + strftime(buf, 11, "%F", pNowBroken); + defaultCreationDate = buf; + + defaultComments = "Created with " + libraryName() + " " + libraryVersion(); + } + if (resourceType == RIFF_TYPE_DLS || resourceType == LIST_TYPE_INS) + { + defaultSoftware = libraryName() + " " + libraryVersion(); + } + } // save values - SaveString(CHUNK_ID_INAM, lstINFO, Name, defaultName); + SaveString(CHUNK_ID_IARL, lstINFO, ArchivalLocation, String("")); - SaveString(CHUNK_ID_ICRD, lstINFO, CreationDate, defaultCreationDate); + SaveString(CHUNK_ID_IART, lstINFO, Artists, String("")); + SaveString(CHUNK_ID_ICMS, lstINFO, Commissioned, String("")); SaveString(CHUNK_ID_ICMT, lstINFO, Comments, defaultComments); - SaveString(CHUNK_ID_IPRD, lstINFO, Product, String("")); SaveString(CHUNK_ID_ICOP, lstINFO, Copyright, String("")); - SaveString(CHUNK_ID_IART, lstINFO, Artists, 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_IENG, lstINFO, Engineer, String("")); - SaveString(CHUNK_ID_ITCH, lstINFO, Technician, String("")); - SaveString(CHUNK_ID_ISFT, lstINFO, Software, defaultSoftware); 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_ICMS, lstINFO, Commissioned, String("")); + SaveString(CHUNK_ID_ITCH, lstINFO, Technician, String("")); } @@ -388,9 +414,63 @@ */ void Resource::UpdateChunks() { pInfo->UpdateChunks(); - //TODO: save DLSID + + if (pDLSID) { + // make sure 'dlid' chunk exists + RIFF::Chunk* ckDLSID = pResourceList->GetSubChunk(CHUNK_ID_DLID); + if (!ckDLSID) ckDLSID = pResourceList->AddSubChunk(CHUNK_ID_DLID, 16); + uint8_t* pData = (uint8_t*)ckDLSID->LoadChunkData(); + // update 'dlid' chunk + store32(&pData[0], pDLSID->ulData1); + store16(&pData[4], pDLSID->usData2); + store16(&pData[6], pDLSID->usData3); + memcpy(&pData[8], pDLSID->abData, 8); + } } + /** + * Generates a new DLSID for the resource. + */ + void Resource::GenerateDLSID() { +#if defined(WIN32) || defined(__APPLE__) || defined(HAVE_UUID_GENERATE) + + if (!pDLSID) pDLSID = new dlsid_t; + +#ifdef WIN32 + + UUID uuid; + UuidCreate(&uuid); + pDLSID->ulData1 = uuid.Data1; + pDLSID->usData1 = uuid.Data2; + pDLSID->usData2 = uuid.Data3; + memcpy(pDLSID->abData, uuid.Data4, 8); + +#elif defined(__APPLE__) + + CFUUIDRef uuidRef = CFUUIDCreate(NULL); + CFUUIDBytes uuid = CFUUIDGetUUIDBytes(uuidRef); + CFRelease(uuidRef); + pDLSID->ulData1 = uuid.byte0 | uuid.byte1 << 8 | uuid.byte2 << 16 | uuid.byte3 << 24; + pDLSID->usData2 = uuid.byte4 | uuid.byte5 << 8; + pDLSID->usData3 = uuid.byte6 | uuid.byte7 << 8; + pDLSID->abData[0] = uuid.byte8; + pDLSID->abData[1] = uuid.byte9; + pDLSID->abData[2] = uuid.byte10; + pDLSID->abData[3] = uuid.byte11; + pDLSID->abData[4] = uuid.byte12; + pDLSID->abData[5] = uuid.byte13; + pDLSID->abData[6] = uuid.byte14; + pDLSID->abData[7] = uuid.byte15; +#else + uuid_t uuid; + uuid_generate(uuid); + pDLSID->ulData1 = uuid[0] | uuid[1] << 8 | uuid[2] << 16 | uuid[3] << 24; + pDLSID->usData2 = uuid[4] | uuid[5] << 8; + pDLSID->usData3 = uuid[6] | uuid[7] << 8; + memcpy(pDLSID->abData, &uuid[8], 8); +#endif +#endif + } // *************** Sampler *************** @@ -408,7 +488,7 @@ SampleLoops = wsmp->ReadUint32(); } else { // 'wsmp' chunk missing uiHeaderSize = 0; - UnityNote = 64; + UnityNote = 60; FineTune = 0; // +- 0 cents Gain = 0; // 0 dB SamplerOptions = F_WSMP_NO_COMPRESSION; @@ -445,19 +525,70 @@ } uint8_t* pData = (uint8_t*) wsmp->LoadChunkData(); // update headers size - memccpy(&pData[0], &uiHeaderSize, 1, 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); + 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 - memccpy(&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 pLoopDef - 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 *************** @@ -491,16 +622,15 @@ AverageBytesPerSecond = pCkFormat->ReadUint32(); BlockAlign = pCkFormat->ReadUint16(); // PCM format specific - if (FormatTag == WAVE_FORMAT_PCM) { + if (FormatTag == DLS_WAVE_FORMAT_PCM) { BitDepth = pCkFormat->ReadUint16(); - FrameSize = (FormatTag == WAVE_FORMAT_PCM) ? (BitDepth / 8) * Channels - : 0; + FrameSize = (BitDepth / 8) * Channels; } else { // unsupported sample data format BitDepth = 0; FrameSize = 0; } } else { // 'fmt' chunk missing - FormatTag = WAVE_FORMAT_PCM; + FormatTag = DLS_WAVE_FORMAT_PCM; BitDepth = 16; Channels = 1; SamplesPerSecond = 44100; @@ -508,8 +638,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; } @@ -569,11 +699,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; } @@ -595,18 +725,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); @@ -619,19 +749,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); @@ -649,7 +779,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? } @@ -669,7 +799,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? } @@ -678,11 +808,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) @@ -694,12 +824,12 @@ if (!pCkFormat) pCkFormat = pWaveList->AddSubChunk(CHUNK_ID_FMT, 16); // assumes PCM format uint8_t* pData = (uint8_t*) pCkFormat->LoadChunkData(); // update 'fmt' chunk - memccpy(&pData[0], &FormatTag, 1, 2); - memccpy(&pData[2], &Channels, 1, 2); - memccpy(&pData[4], &SamplesPerSecond, 1, 4); - memccpy(&pData[8], &AverageBytesPerSecond, 1, 4); - memccpy(&pData[12], &BlockAlign, 1, 2); - memccpy(&pData[14], &BitDepth, 1, 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 } @@ -791,20 +921,22 @@ void Region::UpdateChunks() { // make sure 'rgnh' chunk exists RIFF::Chunk* rgnh = pCkRegion->GetSubChunk(CHUNK_ID_RGNH); - if (!rgnh) rgnh = pCkRegion->AddSubChunk(CHUNK_ID_RGNH, 14); + if (!rgnh) rgnh = pCkRegion->AddSubChunk(CHUNK_ID_RGNH, Layer ? 14 : 12); uint8_t* pData = (uint8_t*) rgnh->LoadChunkData(); FormatOptionFlags = (SelfNonExclusive) ? FormatOptionFlags | F_RGN_OPTION_SELFNONEXCLUSIVE : FormatOptionFlags & (~F_RGN_OPTION_SELFNONEXCLUSIVE); // update 'rgnh' chunk - memccpy(&pData[0], &KeyRange, 2, 2); - memccpy(&pData[4], &VelocityRange, 2, 2); - memccpy(&pData[8], &FormatOptionFlags, 1, 2); - memccpy(&pData[10], &KeyGroup, 1, 2); - memccpy(&pData[12], &Layer, 1, 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 - Resource::UpdateChunks(); + // update chunks of base classes as well (but skip Resource, + // as a rgn doesn't seem to have dlid and INFO chunks) Articulator::UpdateChunks(); Sampler::UpdateChunks(); @@ -831,13 +963,12 @@ } } } - if (index < 0) throw Exception("Could not save Region, could not find Region's sample"); WavePoolTableIndex = index; // update 'wlnk' chunk - memccpy(&pData[0], &WaveLinkOptionFlags, 1, 2); - memccpy(&pData[2], &PhaseGroup, 1, 2); - memccpy(&pData[4], &Channel, 1, 4); - memccpy(&pData[8], &WavePoolTableIndex, 1, 4); + store16(&pData[0], WaveLinkOptionFlags); + store16(&pData[2], PhaseGroup); + store32(&pData[4], Channel); + store32(&pData[8], WavePoolTableIndex); } @@ -895,34 +1026,46 @@ } void Instrument::LoadRegions() { + if (!pRegions) pRegions = new RegionList; RIFF::List* lrgn = pCkInstrument->GetSubList(LIST_TYPE_LRGN); - if (!lrgn) throw DLS::Exception("DLS::Instrument doesn't seem to have any Region (mandatory chunks in chunk not found)"); - uint32_t regionCkType = (lrgn->GetSubList(LIST_TYPE_RGN2)) ? LIST_TYPE_RGN2 : LIST_TYPE_RGN; // prefer regions level 2 - RIFF::List* rgn = lrgn->GetFirstSubList(); - while (rgn) { - if (rgn->GetListType() == regionCkType) { - if (!pRegions) pRegions = new RegionList; - pRegions->push_back(new Region(this, rgn)); + if (lrgn) { + uint32_t regionCkType = (lrgn->GetSubList(LIST_TYPE_RGN2)) ? LIST_TYPE_RGN2 : LIST_TYPE_RGN; // prefer regions level 2 + RIFF::List* rgn = lrgn->GetFirstSubList(); + while (rgn) { + if (rgn->GetListType() == regionCkType) { + pRegions->push_back(new Region(this, rgn)); + } + rgn = lrgn->GetNextSubList(); } - rgn = lrgn->GetNextSubList(); } } Region* Instrument::AddRegion() { - if (!pRegions) pRegions = new RegionList; + if (!pRegions) LoadRegions(); RIFF::List* lrgn = pCkInstrument->GetSubList(LIST_TYPE_LRGN); if (!lrgn) lrgn = pCkInstrument->AddSubList(LIST_TYPE_LRGN); RIFF::List* rgn = lrgn->AddSubList(LIST_TYPE_RGN); Region* pNewRegion = new Region(this, rgn); pRegions->push_back(pNewRegion); + Regions = pRegions->size(); 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); if (iter == pRegions->end()) return; pRegions->erase(iter); + Regions = pRegions->size(); delete pRegion; } @@ -947,8 +1090,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 - memccpy(&pData[0], &Regions, 1, 4); - memccpy(&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(); @@ -990,6 +1134,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; @@ -1033,25 +1178,32 @@ Instruments = colh->ReadUint32(); RIFF::Chunk* ptbl = pRIFF->GetSubChunk(CHUNK_ID_PTBL); - if (!ptbl) throw DLS::Exception("Mandatory chunk not found."); - WavePoolHeaderSize = ptbl->ReadUint32(); - WavePoolCount = ptbl->ReadUint32(); - pWavePoolTable = new uint32_t[WavePoolCount]; - pWavePoolTableHi = new uint32_t[WavePoolCount]; - ptbl->SetPos(WavePoolHeaderSize); - - // Check for 64 bit offsets (used in gig v3 files) - b64BitWavePoolOffsets = (ptbl->GetSize() - WavePoolHeaderSize == WavePoolCount * 8); - if (b64BitWavePoolOffsets) { - for (int i = 0 ; i < WavePoolCount ; i++) { - pWavePoolTableHi[i] = ptbl->ReadUint32(); - pWavePoolTable[i] = ptbl->ReadUint32(); - if (pWavePoolTable[i] & 0x80000000) - throw DLS::Exception("Files larger than 2 GB not yet supported"); + if (!ptbl) { // pool table is missing - this is probably an ".art" file + WavePoolCount = 0; + pWavePoolTable = NULL; + pWavePoolTableHi = NULL; + WavePoolHeaderSize = 8; + b64BitWavePoolOffsets = false; + } else { + WavePoolHeaderSize = ptbl->ReadUint32(); + WavePoolCount = ptbl->ReadUint32(); + pWavePoolTable = new uint32_t[WavePoolCount]; + pWavePoolTableHi = new uint32_t[WavePoolCount]; + ptbl->SetPos(WavePoolHeaderSize); + + // Check for 64 bit offsets (used in gig v3 files) + b64BitWavePoolOffsets = (ptbl->GetSize() - WavePoolHeaderSize == WavePoolCount * 8); + if (b64BitWavePoolOffsets) { + for (int i = 0 ; i < WavePoolCount ; i++) { + pWavePoolTableHi[i] = ptbl->ReadUint32(); + pWavePoolTable[i] = ptbl->ReadUint32(); + if (pWavePoolTable[i] & 0x80000000) + throw DLS::Exception("Files larger than 2 GB not yet supported"); + } + } else { // conventional 32 bit offsets + ptbl->Read(pWavePoolTable, WavePoolCount, sizeof(uint32_t)); + for (int i = 0 ; i < WavePoolCount ; i++) pWavePoolTableHi[i] = 0; } - } else { // conventional 32 bit offsets - ptbl->Read(pWavePoolTable, WavePoolCount, sizeof(uint32_t)); - for (int i = 0 ; i < WavePoolCount ; i++) pWavePoolTableHi[i] = 0; } pSamples = NULL; @@ -1082,6 +1234,8 @@ if (pWavePoolTable) delete[] pWavePoolTable; if (pWavePoolTableHi) delete[] pWavePoolTableHi; if (pVersion) delete pVersion; + for (std::list::iterator i = ExtensionFiles.begin() ; i != ExtensionFiles.end() ; i++) + delete *i; } Sample* File::GetFirstSample() { @@ -1098,13 +1252,13 @@ } void File::LoadSamples() { + if (!pSamples) pSamples = new SampleList; RIFF::List* wvpl = pRIFF->GetSubList(LIST_TYPE_WVPL); if (wvpl) { unsigned long wvplFileOffset = wvpl->GetFilePos(); RIFF::List* wave = wvpl->GetFirstSubList(); while (wave) { if (wave->GetListType() == LIST_TYPE_WAVE) { - if (!pSamples) pSamples = new SampleList; unsigned long waveFileOffset = wave->GetFilePos(); pSamples->push_back(new Sample(this, wave, waveFileOffset - wvplFileOffset)); } @@ -1118,7 +1272,6 @@ RIFF::List* wave = dwpl->GetFirstSubList(); while (wave) { if (wave->GetListType() == LIST_TYPE_WAVE) { - if (!pSamples) pSamples = new SampleList; unsigned long waveFileOffset = wave->GetFilePos(); pSamples->push_back(new Sample(this, wave, waveFileOffset - dwplFileOffset)); } @@ -1136,10 +1289,10 @@ * @returns pointer to new Sample object */ Sample* File::AddSample() { + if (!pSamples) LoadSamples(); __ensureMandatoryChunksExist(); RIFF::List* wvpl = pRIFF->GetSubList(LIST_TYPE_WVPL); // create new Sample object and its respective 'wave' list chunk - if (!pSamples) pSamples = new SampleList; RIFF::List* wave = wvpl->AddSubList(LIST_TYPE_WAVE); Sample* pSample = new Sample(this, wave, 0 /*arbitrary value, we update offsets when we save*/); pSamples->push_back(pSample); @@ -1175,12 +1328,12 @@ } void File::LoadInstruments() { + if (!pInstruments) pInstruments = new InstrumentList; RIFF::List* lstInstruments = pRIFF->GetSubList(LIST_TYPE_LINS); if (lstInstruments) { RIFF::List* lstInstr = lstInstruments->GetFirstSubList(); while (lstInstr) { if (lstInstr->GetListType() == LIST_TYPE_INS) { - if (!pInstruments) pInstruments = new InstrumentList; pInstruments->push_back(new Instrument(this, lstInstr)); } lstInstr = lstInstruments->GetNextSubList(); @@ -1196,8 +1349,8 @@ * @returns pointer to new Instrument object */ Instrument* File::AddInstrument() { + if (!pInstruments) LoadInstruments(); __ensureMandatoryChunksExist(); - if (!pInstruments) pInstruments = new InstrumentList; RIFF::List* lstInstruments = pRIFF->GetSubList(LIST_TYPE_LINS); RIFF::List* lstInstr = lstInstruments->AddSubList(LIST_TYPE_INS); Instrument* pInstrument = new Instrument(this, lstInstr); @@ -1205,7 +1358,7 @@ return pInstrument; } - /** @brief Delete a instrument. + /** @brief Delete an instrument. * * This will delete the given Instrument object from the DLS file. You * have to call Save() to make this persistent to the file. @@ -1236,7 +1389,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(); - memccpy(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 @@ -1244,7 +1400,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(); - memccpy(pData, &Instruments, 1, 4); + store32(pData, Instruments); // update instrument's chunks if (pInstruments) { @@ -1264,7 +1420,7 @@ ptbl->Resize(iPtblSize); pData = (uint8_t*) ptbl->LoadChunkData(); WavePoolCount = iSamples; - memccpy(&pData[4], &WavePoolCount, 1, 4); + store32(&pData[4], WavePoolCount); // we actually update the sample offsets in the pool table when we Save() memset(&pData[WavePoolHeaderSize], 0, iPtblSize - WavePoolHeaderSize); @@ -1353,18 +1509,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);