--- libgig/trunk/src/DLS.cpp 2005/11/12 19:16:01 804 +++ libgig/trunk/src/DLS.cpp 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 * @@ -45,7 +45,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 +142,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); + memcpy(&pData[0], &HeaderSize, 2); + memcpy(&pData[2], &Connections, 2); 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); + 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); } } @@ -228,11 +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; pResourceListChunk = list; if (list) { RIFF::List* lstINFO = list->GetSubList(LIST_TYPE_INFO); @@ -253,10 +254,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 +269,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. @@ -285,19 +286,12 @@ * @param lstINFO - parent (INFO) RIFF list chunk * @param s - current value of info field * @param sDefault - default value + * @param bUseFixedLengthStrings - should a specific string size be forced in the chunk? + * @param size - wanted size of the INFO chunk. This is ignored if bUseFixedLengthStrings is false. */ - void Info::SaveString(uint32_t ChunkID, RIFF::List* lstINFO, const String& s, const String& sDefault) { + void Info::SaveString(uint32_t ChunkID, RIFF::List* lstINFO, const String& s, const String& sDefault, bool bUseFixedLengthStrings, int size) { 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); - } + ::SaveString(ChunkID, ck, lstINFO, s, sDefault, bUseFixedLengthStrings, size); // function from helper.h } /** @brief Update chunks with current info values. @@ -310,36 +304,60 @@ // 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_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_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_ISRC, lstINFO, Source, String("")); - SaveString(CHUNK_ID_ISRF, lstINFO, SourceForm, String("")); - SaveString(CHUNK_ID_ICMS, lstINFO, Commissioned, String("")); + + // (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, UseFixedLengthStrings, + resourceType == RIFF_TYPE_DLS ? 128 : 64); + SaveString(CHUNK_ID_IARL, lstINFO, ArchivalLocation, String(""), UseFixedLengthStrings, 256); + SaveString(CHUNK_ID_ICRD, lstINFO, CreationDate, defaultCreationDate, UseFixedLengthStrings, 128); + SaveString(CHUNK_ID_ICMT, lstINFO, Comments, defaultComments, UseFixedLengthStrings, 1024); + SaveString(CHUNK_ID_IPRD, lstINFO, Product, String(""), UseFixedLengthStrings, 128); + SaveString(CHUNK_ID_ICOP, lstINFO, Copyright, String(""), UseFixedLengthStrings, 128); + SaveString(CHUNK_ID_IART, lstINFO, Artists, String(""), UseFixedLengthStrings, 128); + SaveString(CHUNK_ID_IGNR, lstINFO, Genre, String(""), UseFixedLengthStrings, 128); + SaveString(CHUNK_ID_IKEY, lstINFO, Keywords, String(""), UseFixedLengthStrings, 128); + SaveString(CHUNK_ID_IENG, lstINFO, Engineer, String(""), UseFixedLengthStrings, 128); + SaveString(CHUNK_ID_ITCH, lstINFO, Technician, String(""), UseFixedLengthStrings, 128); + SaveString(CHUNK_ID_ISFT, lstINFO, Software, defaultSoftware, UseFixedLengthStrings, + resourceType == LIST_TYPE_INS ? + (Software == "" ? defaultSoftware.length() : Software.length()) : 128); + SaveString(CHUNK_ID_IMED, lstINFO, Medium, String(""), UseFixedLengthStrings, 128); + SaveString(CHUNK_ID_ISRC, lstINFO, Source, String(""), UseFixedLengthStrings, 128); + SaveString(CHUNK_ID_ISRF, lstINFO, SourceForm, String(""), UseFixedLengthStrings, 128); + SaveString(CHUNK_ID_ICMS, lstINFO, Commissioned, String(""), UseFixedLengthStrings, 128); + SaveString(CHUNK_ID_ISBJ, lstINFO, Subject, String(""), UseFixedLengthStrings, 128); } @@ -445,16 +463,21 @@ } uint8_t* pData = (uint8_t*) wsmp->LoadChunkData(); // update headers size - memccpy(&pData[0], &uiHeaderSize, 1, 4); + memcpy(&pData[0], &uiHeaderSize, 4); // 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); // 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); + memcpy(&pData[uiHeaderSize + i * 16], pSampleLoops + i, 4 * 4); } } @@ -493,8 +516,7 @@ // PCM format specific if (FormatTag == 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; @@ -694,12 +716,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 + 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 } @@ -791,20 +813,20 @@ 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); + 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); - // 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(); @@ -834,10 +856,10 @@ 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); + memcpy(&pData[0], &WaveLinkOptionFlags, 2); + memcpy(&pData[2], &PhaseGroup, 2); + memcpy(&pData[4], &Channel, 4); + memcpy(&pData[8], &WavePoolTableIndex, 4); } @@ -895,26 +917,28 @@ } 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; } @@ -923,6 +947,7 @@ RegionList::iterator iter = find(pRegions->begin(), pRegions->end(), pRegion); if (iter == pRegions->end()) return; pRegions->erase(iter); + Regions = pRegions->size(); delete pRegion; } @@ -947,8 +972,8 @@ 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); + memcpy(&pData[0], &Regions, 4); + memcpy(&pData[4], &locale, 2 * 4); // update Region's chunks if (!pRegions) return; RegionList::iterator iter = pRegions->begin(); @@ -1033,25 +1058,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 +1114,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 +1132,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 +1152,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 +1169,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 +1208,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 +1229,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 +1238,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 +1269,7 @@ 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); + memcpy(pData, pVersion, 2 * 4); } // update 'colh' chunk @@ -1244,7 +1277,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); + memcpy(pData, &Instruments, 4); // update instrument's chunks if (pInstruments) { @@ -1264,7 +1297,7 @@ ptbl->Resize(iPtblSize); pData = (uint8_t*) ptbl->LoadChunkData(); WavePoolCount = iSamples; - memccpy(&pData[4], &WavePoolCount, 1, 4); + memcpy(&pData[4], &WavePoolCount, 4); // we actually update the sample offsets in the pool table when we Save() memset(&pData[WavePoolHeaderSize], 0, iPtblSize - WavePoolHeaderSize);