From 6f8f614893130e3b0602dc6cc55a81daff1de627 Mon Sep 17 00:00:00 2001 From: Paweł Kołodziejski Date: Fri, 12 Nov 2004 11:09:47 +0000 Subject: renamed file mt32 svn-id: r15793 --- backends/midi/mt32/file.cpp | 66 ---------------------------------------- backends/midi/mt32/file.h | 62 ------------------------------------- backends/midi/mt32/module.mk | 2 +- backends/midi/mt32/mt32_file.cpp | 66 ++++++++++++++++++++++++++++++++++++++++ backends/midi/mt32/mt32_file.h | 62 +++++++++++++++++++++++++++++++++++++ 5 files changed, 129 insertions(+), 129 deletions(-) delete mode 100644 backends/midi/mt32/file.cpp delete mode 100644 backends/midi/mt32/file.h create mode 100644 backends/midi/mt32/mt32_file.cpp create mode 100644 backends/midi/mt32/mt32_file.h (limited to 'backends') diff --git a/backends/midi/mt32/file.cpp b/backends/midi/mt32/file.cpp deleted file mode 100644 index 8660e8314c..0000000000 --- a/backends/midi/mt32/file.cpp +++ /dev/null @@ -1,66 +0,0 @@ -/* 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 - -#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; - } -} diff --git a/backends/midi/mt32/file.h b/backends/midi/mt32/file.h deleted file mode 100644 index 6c02712596..0000000000 --- a/backends/midi/mt32/file.h +++ /dev/null @@ -1,62 +0,0 @@ -/* 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 - -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 diff --git a/backends/midi/mt32/module.mk b/backends/midi/mt32/module.mk index ea6d542cd8..9f0594190f 100644 --- a/backends/midi/mt32/module.mk +++ b/backends/midi/mt32/module.mk @@ -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 \ diff --git a/backends/midi/mt32/mt32_file.cpp b/backends/midi/mt32/mt32_file.cpp new file mode 100644 index 0000000000..8660e8314c --- /dev/null +++ b/backends/midi/mt32/mt32_file.cpp @@ -0,0 +1,66 @@ +/* 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 + +#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; + } +} diff --git a/backends/midi/mt32/mt32_file.h b/backends/midi/mt32/mt32_file.h new file mode 100644 index 0000000000..6c02712596 --- /dev/null +++ b/backends/midi/mt32/mt32_file.h @@ -0,0 +1,62 @@ +/* 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 + +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 -- cgit v1.2.3