OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- renamed FileRdr back to FileReader.

Browse source
This commit is contained in:
Christoph Oelckers 2018-03-11 18:32:00 +01:00
commit b939836846
91 changed files with 479 additions and 477 deletions
Download patch file Download diff file Expand all files Collapse all files

74
src/sound/timidity/instrum_sf2.cpp
View file

@ -28,7 +28,7 @@ class CBadVer {};
struct ListHandler
{
uint32_t ID;
void (*Parser)(SFFile *sf2, FileRdr &f, uint32_t chunkid, uint32_t chunklen);
void (*Parser)(SFFile *sf2, FileReader &f, uint32_t chunkid, uint32_t chunklen);
};
enum
@ -162,15 +162,15 @@ static const SFGenComposite DefaultGenerators =
-1 // overridingRootKey
};
static void ParseIfil(SFFile *sf2, FileRdr &f, uint32_t chunkid, uint32_t chunklen);
static void ParseSmpl(SFFile *sf2, FileRdr &f, uint32_t chunkid, uint32_t chunklen);
static void ParseSm24(SFFile *sf2, FileRdr &f, uint32_t chunkid, uint32_t chunklen);
static void ParsePhdr(SFFile *sf2, FileRdr &f, uint32_t chunkid, uint32_t chunklen);
static void ParseBag(SFFile *sf2, FileRdr &f, uint32_t chunkid, uint32_t chunklen);
static void ParseMod(SFFile *sf2, FileRdr &f, uint32_t chunkid, uint32_t chunklen);
static void ParseGen(SFFile *sf2, FileRdr &f, uint32_t chunkid, uint32_t chunklen);
static void ParseInst(SFFile *sf2, FileRdr &f, uint32_t chunkid, uint32_t chunklen);
static void ParseShdr(SFFile *sf2, FileRdr &f, uint32_t chunkid, uint32_t chunklen);
static void ParseIfil(SFFile *sf2, FileReader &f, uint32_t chunkid, uint32_t chunklen);
static void ParseSmpl(SFFile *sf2, FileReader &f, uint32_t chunkid, uint32_t chunklen);
static void ParseSm24(SFFile *sf2, FileReader &f, uint32_t chunkid, uint32_t chunklen);
static void ParsePhdr(SFFile *sf2, FileReader &f, uint32_t chunkid, uint32_t chunklen);
static void ParseBag(SFFile *sf2, FileReader &f, uint32_t chunkid, uint32_t chunklen);
static void ParseMod(SFFile *sf2, FileReader &f, uint32_t chunkid, uint32_t chunklen);
static void ParseGen(SFFile *sf2, FileReader &f, uint32_t chunkid, uint32_t chunklen);
static void ParseInst(SFFile *sf2, FileReader &f, uint32_t chunkid, uint32_t chunklen);
static void ParseShdr(SFFile *sf2, FileReader &f, uint32_t chunkid, uint32_t chunklen);
ListHandler INFOHandlers[] =
{
@ -225,7 +225,7 @@ static int32_t calc_rate(Renderer *song, int diff, double sec)
}
static inline uint32_t read_id(FileRdr &f)
static inline uint32_t read_id(FileReader &f)
{
uint32_t id;
if (f.Read(&id, 4) != 4)
@ -235,7 +235,7 @@ static inline uint32_t read_id(FileRdr &f)
return id;
}
static inline int read_byte(FileRdr &f)
static inline int read_byte(FileReader &f)
{
uint8_t x;
if (f.Read(&x, 1) != 1)
@ -245,7 +245,7 @@ static inline int read_byte(FileRdr &f)
return x;
}
static inline int read_char(FileRdr &f)
static inline int read_char(FileReader &f)
{
int8_t x;
if (f.Read(&x, 1) != 1)
@ -255,7 +255,7 @@ static inline int read_char(FileRdr &f)
return x;
}
static inline int read_uword(FileRdr &f)
static inline int read_uword(FileReader &f)
{
uint16_t x;
if (f.Read(&x, 2) != 2)
@ -265,7 +265,7 @@ static inline int read_uword(FileRdr &f)
return LittleShort(x);
}
static inline int read_sword(FileRdr &f)
static inline int read_sword(FileReader &f)
{
int16_t x;
if (f.Read(&x, 2) != 2)
@ -275,7 +275,7 @@ static inline int read_sword(FileRdr &f)
return LittleShort(x);
}
static inline uint32_t read_dword(FileRdr &f)
static inline uint32_t read_dword(FileReader &f)
{
uint32_t x;
if (f.Read(&x, 4) != 4)
@ -285,7 +285,7 @@ static inline uint32_t read_dword(FileRdr &f)
return LittleLong(x);
}
static inline void read_name(FileRdr &f, char name[21])
static inline void read_name(FileReader &f, char name[21])
{
if (f.Read(name, 20) != 20)
{
@ -294,18 +294,18 @@ static inline void read_name(FileRdr &f, char name[21])
name[20] = 0;
}
static inline void skip_chunk(FileRdr &f, uint32_t len)
static inline void skip_chunk(FileReader &f, uint32_t len)
{
// RIFF, like IFF, adds an extra pad byte to the end of
// odd-sized chunks so that new chunks are always on even
// byte boundaries.
if (f.Seek(len + (len & 1), FileRdr::SeekCur) != 0)
if (f.Seek(len + (len & 1), FileReader::SeekCur) != 0)
{
throw CIOErr();
}
}
static void check_list(FileRdr &f, uint32_t id, uint32_t filelen, uint32_t &chunklen)
static void check_list(FileReader &f, uint32_t id, uint32_t filelen, uint32_t &chunklen)
{
if (read_id(f) != ID_LIST)
{
@ -322,7 +322,7 @@ static void check_list(FileRdr &f, uint32_t id, uint32_t filelen, uint32_t &chun
}
}
static void ParseIfil(SFFile *sf2, FileRdr &f, uint32_t chunkid, uint32_t chunklen)
static void ParseIfil(SFFile *sf2, FileReader &f, uint32_t chunkid, uint32_t chunklen)
{
uint16_t major, minor;
@ -341,7 +341,7 @@ static void ParseIfil(SFFile *sf2, FileRdr &f, uint32_t chunkid, uint32_t chunkl
sf2->MinorVersion = minor;
}
static void ParseLIST(SFFile *sf2, FileRdr &f, uint32_t chunklen, ListHandler *handlers)
static void ParseLIST(SFFile *sf2, FileReader &f, uint32_t chunklen, ListHandler *handlers)
{
ListHandler *handler;
uint32_t id;
@ -375,7 +375,7 @@ static void ParseLIST(SFFile *sf2, FileRdr &f, uint32_t chunklen, ListHandler *h
}
}
static void ParseINFO(SFFile *sf2, FileRdr &f, uint32_t chunklen)
static void ParseINFO(SFFile *sf2, FileReader &f, uint32_t chunklen)
{
sf2->MinorVersion = -1;
@ -387,7 +387,7 @@ static void ParseINFO(SFFile *sf2, FileRdr &f, uint32_t chunklen)
}
}
static void ParseSdta(SFFile *sf2, FileRdr &f, uint32_t chunklen)
static void ParseSdta(SFFile *sf2, FileReader &f, uint32_t chunklen)
{
ParseLIST(sf2, f, chunklen, SdtaHandlers);
if (sf2->SampleDataOffset == 0)
@ -404,7 +404,7 @@ static void ParseSdta(SFFile *sf2, FileRdr &f, uint32_t chunklen)
}
}
static void ParseSmpl(SFFile *sf2, FileRdr &f, uint32_t chunkid, uint32_t chunklen)
static void ParseSmpl(SFFile *sf2, FileReader &f, uint32_t chunkid, uint32_t chunklen)
{
// Only use the first smpl chunk. (Or should we reject files with more than one?)
if (sf2->SampleDataOffset == 0)
@ -419,7 +419,7 @@ static void ParseSmpl(SFFile *sf2, FileRdr &f, uint32_t chunkid, uint32_t chunkl
skip_chunk(f, chunklen);
}
static void ParseSm24(SFFile *sf2, FileRdr &f, uint32_t chunkid, uint32_t chunklen)
static void ParseSm24(SFFile *sf2, FileReader &f, uint32_t chunkid, uint32_t chunklen)
{
// The sm24 chunk is ignored if the file version is < 2.04
if (sf2->MinorVersion >= 4)
@ -434,12 +434,12 @@ static void ParseSm24(SFFile *sf2, FileRdr &f, uint32_t chunkid, uint32_t chunkl
skip_chunk(f, chunklen);
}
static void ParsePdta(SFFile *sf2, FileRdr &f, uint32_t chunklen)
static void ParsePdta(SFFile *sf2, FileReader &f, uint32_t chunklen)
{
ParseLIST(sf2, f, chunklen, PdtaHandlers);
}
static void ParsePhdr(SFFile *sf2, FileRdr &f, uint32_t chunkid, uint32_t chunklen)
static void ParsePhdr(SFFile *sf2, FileReader &f, uint32_t chunkid, uint32_t chunklen)
{
SFPreset *preset;
@ -477,7 +477,7 @@ static void ParsePhdr(SFFile *sf2, FileRdr &f, uint32_t chunkid, uint32_t chunkl
}
}
static void ParseBag(SFFile *sf2, FileRdr &f, uint32_t chunkid, uint32_t chunklen)
static void ParseBag(SFFile *sf2, FileReader &f, uint32_t chunkid, uint32_t chunklen)
{
SFBag *bags, *bag;
uint16_t prev_mod = 0;
@ -539,7 +539,7 @@ static void ParseBag(SFFile *sf2, FileRdr &f, uint32_t chunkid, uint32_t chunkle
}
}
static void ParseMod(SFFile *sf2, FileRdr &f, uint32_t chunkid, uint32_t chunklen)
static void ParseMod(SFFile *sf2, FileReader &f, uint32_t chunkid, uint32_t chunklen)
{
// Section 7.4, page 23:
// It [the PMOD sub-chunk] is always a multiple of ten bytes in length,
@ -552,7 +552,7 @@ static void ParseMod(SFFile *sf2, FileRdr &f, uint32_t chunkid, uint32_t chunkle
skip_chunk(f, chunklen);
}
static void ParseGen(SFFile *sf2, FileRdr &f, uint32_t chunkid, uint32_t chunklen)
static void ParseGen(SFFile *sf2, FileReader &f, uint32_t chunkid, uint32_t chunklen)
{
SFGenList *gens, *gen;
int numgens;
@ -604,7 +604,7 @@ static void ParseGen(SFFile *sf2, FileRdr &f, uint32_t chunkid, uint32_t chunkle
}
}
static void ParseInst(SFFile *sf2, FileRdr &f, uint32_t chunkid, uint32_t chunklen)
static void ParseInst(SFFile *sf2, FileReader &f, uint32_t chunkid, uint32_t chunklen)
{
int i;
SFInst *inst;
@ -639,7 +639,7 @@ static void ParseInst(SFFile *sf2, FileRdr &f, uint32_t chunkid, uint32_t chunkl
}
}
static void ParseShdr(SFFile *sf2, FileRdr &f, uint32_t chunkid, uint32_t chunklen)
static void ParseShdr(SFFile *sf2, FileReader &f, uint32_t chunkid, uint32_t chunklen)
{
int i;
SFSample *sample;
@ -698,7 +698,7 @@ static void ParseShdr(SFFile *sf2, FileRdr &f, uint32_t chunkid, uint32_t chunkl
}
SFFile *ReadSF2(const char *filename, FileRdr &f)
SFFile *ReadSF2(const char *filename, FileReader &f)
{
SFFile *sf2 = NULL;
uint32_t filelen;
@ -1508,7 +1508,7 @@ void SFFile::ApplyGeneratorsToRegion(SFGenComposite *gen, SFSample *sfsamp, Rend
void SFFile::LoadSample(SFSample *sample)
{
FileRdr fp = gus_sfreader->LookupFile(Filename).first;
FileReader fp = gus_sfreader->LookupFile(Filename).first;
uint32_t i;
if (!fp.isOpen())
@ -1516,7 +1516,7 @@ void SFFile::LoadSample(SFSample *sample)
return;
}
sample->InMemoryData = new float[sample->End - sample->Start + 1];
fp.Seek(SampleDataOffset + sample->Start * 2, FileRdr::SeekSet);
fp.Seek(SampleDataOffset + sample->Start * 2, FileReader::SeekSet);
// Load 16-bit sample data.
for (i = 0; i < sample->End - sample->Start; ++i)
{
@ -1525,7 +1525,7 @@ void SFFile::LoadSample(SFSample *sample)
}
if (SampleDataLSBOffset != 0)
{ // Load lower 8 bits of 24-bit sample data.
fp.Seek(SampleDataLSBOffset + sample->Start, FileRdr::SeekSet);
fp.Seek(SampleDataLSBOffset + sample->Start, FileReader::SeekSet);
for (i = 0; i < sample->End - sample->Start; ++i)
{
uint8_t samp = fp.ReadUInt8();