[Scummvm-cvs-logs] CVS: scummvm/backends/midi/mt32 mt32_file.cpp,NONE,1.1 mt32_file.h,NONE,1.1 module.mk,1.2,1.3 file.cpp,1.1,NONE file.h,1.1,NONE

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummvm/backends/midi/mt32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27918/scummvm/backends/midi/mt32

Modified Files:
	module.mk 
Added Files:
	mt32_file.cpp mt32_file.h 
Removed Files:
	file.cpp file.h 
Log Message:
renamed file mt32

--- NEW FILE: mt32_file.cpp ---
/* Copyright (c) 2003-2004 Various contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
 * deal in the Software without restriction, including without limitation the
 * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
 * sell copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 * IN THE SOFTWARE.
 */

#include <stdio.h>

#include "file.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(fp);
	}

	int ANSIFile::readByte() {
		return fgetc(fp);
	}

	size_t ANSIFile::read(void *ptr, size_t size) {
		return fread(ptr, 1, size, fp);
	}

	bool ANSIFile::readLine(char *ptr, size_t size) {
		return fgets(ptr, (int)size, fp) != NULL;
	}

	bool ANSIFile::writeByte(unsigned char out) {
		return fputc(out, fp) != EOF;
	}

	size_t ANSIFile::write(const void *ptr, size_t size) {
		return fwrite(ptr, 1, size, fp);
	}

	bool ANSIFile::isEOF() {
		return feof(fp) != 0;
	}
}

--- NEW FILE: mt32_file.h ---
/* Copyright (c) 2003-2004 Various contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
 * deal in the Software without restriction, including without limitation the
 * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
 * sell copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 * IN THE SOFTWARE.
 */

#ifndef MT32EMU_FILE_H
#define MT32EMU_FILE_H

#include <stdio.h>

namespace MT32Emu {

class File {
public:
	enum OpenMode {
		OpenMode_read  = 0,
		OpenMode_write = 1
	};
	virtual ~File() {}
	virtual void close() = 0;
	virtual size_t read(void *ptr, size_t size) = 0;
	virtual bool readLine(char *ptr, size_t size) = 0;
	virtual size_t write(const void *ptr, size_t size) = 0;
	// Returns -1 in case of EOF or error
	virtual int readByte() = 0;
	virtual bool writeByte(unsigned char out) = 0;
	virtual bool isEOF() = 0;
};

class ANSIFile: public File {
private:
	FILE *fp;
public:
	bool open(const char *filename, OpenMode mode);
	void close();
	size_t read(void *ptr, size_t size);
	bool readLine(char *ptr, size_t size);
	size_t write(const void *, size_t size);
	int readByte();
	bool writeByte(unsigned char out);
	bool isEOF();
};

}

#endif

Index: module.mk
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/mt32/module.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- module.mk	6 Nov 2004 09:26:36 -0000	1.2
+++ module.mk	12 Nov 2004 11:09:46 -0000	1.3
@@ -1,7 +1,7 @@
 MODULE := backends/midi/mt32
 
 MODULE_OBJS := \
-	backends/midi/mt32/file.o \
+	backends/midi/mt32/mt32_file.o \
 	backends/midi/mt32/i386.o \
 	backends/midi/mt32/part.o \
 	backends/midi/mt32/partial.o \

--- file.cpp DELETED ---

--- file.h DELETED ---