[Scummvm-cvs-logs] SF.net SVN: scummvm: [31114] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Wed Mar 12 19:42:47 CET 2008
Revision: 31114
http://scummvm.svn.sourceforge.net/scummvm/?rev=31114&view=rev
Author: fingolfin
Date: 2008-03-12 11:42:47 -0700 (Wed, 12 Mar 2008)
Log Message:
-----------
Removed remaining traces of the dead MorphOS backend, which itself was removed about one year ago
Modified Paths:
--------------
scummvm/trunk/backends/module.mk
scummvm/trunk/common/scummsys.h
scummvm/trunk/common/system.cpp
scummvm/trunk/sound/mididrv.cpp
Removed Paths:
-------------
scummvm/trunk/backends/fs/morphos/
scummvm/trunk/backends/midi/morphos.cpp
Deleted: scummvm/trunk/backends/midi/morphos.cpp
===================================================================
--- scummvm/trunk/backends/midi/morphos.cpp 2008-03-12 18:38:03 UTC (rev 31113)
+++ scummvm/trunk/backends/midi/morphos.cpp 2008-03-12 18:42:47 UTC (rev 31114)
@@ -1,101 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- */
-
-#if defined(__MORPHOS__)
-
-#include <exec/memory.h>
-#include <exec/types.h>
-#include <devices/etude.h>
-
-#include <clib/alib_protos.h>
-#include <proto/exec.h>
-#include <proto/dos.h>
-#include <proto/etude.h>
-
-#include "common/endian.h"
-#include "sound/mpu401.h"
-#include "common/util.h"
-#include "morphos.h"
-#include "morphos_sound.h"
-
-/*
- * MorphOS MIDI driver for Etude device
- */
-
-class MidiDriver_ETUDE : public MidiDriver_MPU401 {
-public:
- MidiDriver_ETUDE();
- int open();
- void close();
- void send(uint32 b);
-
-private:
- bool _isOpen;
-};
-
-MidiDriver_ETUDE::MidiDriver_ETUDE()
-{
- _isOpen = false;
-}
-
-int MidiDriver_ETUDE::open()
-{
- if (_isOpen)
- return MERR_ALREADY_OPEN;
- _isOpen = true;
- if (!init_morphos_music(ScummMidiUnit, ETUDEF_DIRECT))
- return MERR_DEVICE_NOT_AVAILABLE;
-
- return 0;
-}
-
-void MidiDriver_ETUDE::close()
-{
- MidiDriver_MPU401::close();
- exit_morphos_music();
- _isOpen = false;
-}
-
-void MidiDriver_ETUDE::send(uint32 b)
-{
- if (!_isOpen)
- error("MidiDriver_ETUDE::send called but driver was no opened");
-
- if (ScummMidiRequest) {
- ULONG midi_data = READ_LE_UINT32(&b);
- SendShortMidiMsg(ScummMidiRequest, midi_data);
- }
-}
-
-extern MidiDriver* EtudeMidiDriver;
-
-MidiDriver *MidiDriver_ETUDE_create()
-{
- if (!EtudeMidiDriver)
- EtudeMidiDriver = new MidiDriver_ETUDE();
- return EtudeMidiDriver;
-}
-
-#endif
-
Modified: scummvm/trunk/backends/module.mk
===================================================================
--- scummvm/trunk/backends/module.mk 2008-03-12 18:38:03 UTC (rev 31113)
+++ scummvm/trunk/backends/module.mk 2008-03-12 18:42:47 UTC (rev 31114)
@@ -4,7 +4,6 @@
fs/amigaos4/amigaos4-fs-factory.o \
fs/ds/ds-fs-factory.o \
fs/gp32/gp32-fs-factory.o \
- fs/morphos/abox-fs-factory.o \
fs/palmos/palmos-fs-factory.o \
fs/posix/posix-fs-factory.o \
fs/ps2/ps2-fs-factory.o \
@@ -16,7 +15,6 @@
midi/camd.o \
midi/coreaudio.o \
midi/coremidi.o \
- midi/morphos.o \
midi/quicktime.o \
midi/seq.o \
midi/timidity.o \
Modified: scummvm/trunk/common/scummsys.h
===================================================================
--- scummvm/trunk/common/scummsys.h 2008-03-12 18:38:03 UTC (rev 31113)
+++ scummvm/trunk/common/scummsys.h 2008-03-12 18:42:47 UTC (rev 31114)
@@ -301,14 +301,6 @@
# undef UNUSED
#endif
-#elif defined(__MORPHOS__)
-
- #define scumm_stricmp stricmp
- #define scumm_strnicmp strnicmp
-
- #define SCUMM_BIG_ENDIAN
- #define SCUMM_NEED_ALIGNMENT
-
#elif defined(__DC__)
#define scumm_stricmp strcasecmp
Modified: scummvm/trunk/common/system.cpp
===================================================================
--- scummvm/trunk/common/system.cpp 2008-03-12 18:38:03 UTC (rev 31113)
+++ scummvm/trunk/common/system.cpp 2008-03-12 18:42:47 UTC (rev 31114)
@@ -142,8 +142,6 @@
#include "backends/fs/ds/ds-fs-factory.h"
#elif defined(__GP32__)
#include "backends/fs/gp32/gp32-fs-factory.h"
-#elif defined(__MORPHOS__)
- #include "backends/fs/morphos/abox-fs-factory.h"
#elif defined(PALMOS_MODE)
#include "backends/fs/palmos/palmos-fs-factory.h"
#elif defined(__PLAYSTATION2__)
@@ -160,8 +158,6 @@
return &DSFilesystemFactory::instance();
#elif defined(__GP32__)
return &GP32FilesystemFactory::instance();
- #elif defined(__MORPHOS__)
- return &ABoxFilesystemFactory::instance();
#elif defined(PALMOS_MODE)
return &PalmOSFilesystemFactory::instance();
#elif defined(__PLAYSTATION2__)
Modified: scummvm/trunk/sound/mididrv.cpp
===================================================================
--- scummvm/trunk/sound/mididrv.cpp 2008-03-12 18:38:03 UTC (rev 31113)
+++ scummvm/trunk/sound/mididrv.cpp 2008-03-12 18:42:47 UTC (rev 31114)
@@ -73,9 +73,6 @@
# endif
#endif
-#if defined(__MORPHOS__)
- {"etude", "Etude", MD_ETUDE, MDT_MIDI},
-#endif
#ifdef USE_FLUIDSYNTH
{"fluidsynth", "FluidSynth", MD_FLUIDSYNTH, MDT_MIDI},
#endif
@@ -165,8 +162,6 @@
#else
return MD_NULL;
#endif
-#elif defined(__MORPHOS__)
- return MD_ETUDE;
#else
return MD_NULL;
#endif
@@ -252,9 +247,6 @@
#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
case MD_WINDOWS: return MidiDriver_WIN_create();
#endif
-#if defined(__MORPHOS__)
- case MD_ETUDE: return MidiDriver_ETUDE_create();
-#endif
#if defined(UNIX) && !defined(__BEOS__) && !defined(MACOSX) && !defined(__MAEMO__)
case MD_SEQ: return MidiDriver_SEQ_create();
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list