libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 23:31:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MT32: Get rid of ANSIFile.

Browse Source 
svn-id: r54827
This commit is contained in:
Johannes Schickel 2010-12-08 01:35:12 +00:00
parent 08262d90fb
commit d451084fb4
3 changed files with 50 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
sound/softsynth/mt32/mt32_file.cpp
View File

@ -20,95 +20,51 @@
*/
// FIXME: Disable symbol overrides so that we can use system headers.
// But we *really* should get rid of this usage of FILE, fopen etc.
#define FORBIDDEN_SYMBOL_ALLOW_ALL
#include <stdio.h>
#include "mt32emu.h"
namespace MT32Emu {
bool ANSIFile::open(const char *filename, OpenMode mode) {
const char *fmode;
if (mode == OpenMode_read) {
fmode = "rb";
} else {
fmode = "wb";
}
fp = fopen(filename, fmode);
return (fp != NULL);
}
void ANSIFile::close() {
fclose((FILE *)fp);
}
size_t ANSIFile::read(void *in, size_t size) {
return fread(in, 1, size, (FILE *)fp);
}
bool ANSIFile::readBit8u(Bit8u *in) {
int c = fgetc((FILE *)fp);
if (c == EOF)
return false;
*in = (Bit8u)c;
return true;
}
bool File::readBit16u(Bit16u *in) {
Bit8u b[2];
if (read(&b[0], 2) != 2)
return false;
*in = ((b[0] << 8) | b[1]);
return true;
}
bool File::readBit32u(Bit32u *in) {
Bit8u b[4];
if (read(&b[0], 4) != 4)
return false;
*in = ((b[0] << 24) | (b[1] << 16) | (b[2] << 8) | b[3]);
return true;
}
size_t ANSIFile::write(const void *out, size_t size) {
return fwrite(out, 1, size, (FILE *)fp);
}
bool ANSIFile::writeBit8u(Bit8u out) {
return fputc(out, (FILE *)fp) != EOF;
}
bool File::writeBit16u(Bit16u out) {
if (!writeBit8u((Bit8u)((out & 0xFF00) >> 8))) {
return false;
}
if (!writeBit8u((Bit8u)(out & 0x00FF))) {
return false;
}
return true;
}
bool File::writeBit32u(Bit32u out) {
if (!writeBit8u((Bit8u)((out & 0xFF000000) >> 24))) {
return false;
}
if (!writeBit8u((Bit8u)((out & 0x00FF0000) >> 16))) {
return false;
}
if (!writeBit8u((Bit8u)((out & 0x0000FF00) >> 8))) {
return false;
}
if (!writeBit8u((Bit8u)(out & 0x000000FF))) {
return false;
}
return true;
}
bool ANSIFile::isEOF() {
return feof((FILE *)fp) != 0;
}
bool File::readBit16u(Bit16u *in) {
Bit8u b[2];
if (read(&b[0], 2) != 2)
return false;
*in = ((b[0] << 8) | b[1]);
return true;
}
bool File::readBit32u(Bit32u *in) {
Bit8u b[4];
if (read(&b[0], 4) != 4)
return false;
*in = ((b[0] << 24) | (b[1] << 16) | (b[2] << 8) | b[3]);
return true;
}
bool File::writeBit16u(Bit16u out) {
if (!writeBit8u((Bit8u)((out & 0xFF00) >> 8))) {
return false;
}
if (!writeBit8u((Bit8u)(out & 0x00FF))) {
return false;
}
return true;
}
bool File::writeBit32u(Bit32u out) {
if (!writeBit8u((Bit8u)((out & 0xFF000000) >> 24))) {
return false;
}
if (!writeBit8u((Bit8u)((out & 0x00FF0000) >> 16))) {
return false;
}
if (!writeBit8u((Bit8u)((out & 0x0000FF00) >> 8))) {
return false;
}
if (!writeBit8u((Bit8u)(out & 0x000000FF))) {
return false;
}
return true;
}
} // End of namespace MT32Emu

17
sound/softsynth/mt32/mt32_file.h
View File

@ -22,7 +22,7 @@
#ifndef MT32EMU_FILE_H
#define MT32EMU_FILE_H
#include <stdio.h>
#include "common/scummsys.h"
namespace MT32Emu {
@ -47,19 +47,6 @@ public:
virtual bool isEOF() = 0;
};
class ANSIFile: public File {
private:
void *fp;
public:
bool open(const char *filename, OpenMode mode);
void close();
size_t read(void *in, size_t size);
bool readBit8u(Bit8u *in);
size_t write(const void *out, size_t size);
bool writeBit8u(Bit8u out);
bool isEOF();
};
}
} // End of namespace MT32Emu
#endif

20
sound/softsynth/mt32/synth.cpp
View File

@ -162,21 +162,11 @@ void Synth::initReverb(Bit8u newRevMode, Bit8u newRevTime, Bit8u newRevLevel) {
}
File *Synth::openFile(const char *filename, File::OpenMode mode) {
if (myProp.openFile != NULL) {
return myProp.openFile(myProp.userData, filename, mode);
}
char pathBuf[2048];
if (myProp.baseDir != NULL) {
strcpy(&pathBuf[0], myProp.baseDir);
strcat(&pathBuf[0], filename);
filename = pathBuf;
}
ANSIFile *file = new ANSIFile();
if (!file->open(filename, mode)) {
delete file;
return NULL;
}
return file;
// It should never happen that openFile is NULL in our use case.
// Just to cover the case where something is horrible wrong we
// use an assert here.
assert(myProp.openFile != NULL);
return myProp.openFile(myProp.userData, filename, mode);
}
void Synth::closeFile(File *file) {