[Scummvm-cvs-logs] SF.net SVN: scummvm: [20878] scummvm/trunk/sound

[fingolfin at users.sourceforge.net]

Revision: 20878
Author:   fingolfin
Date:     2006-02-25 06:45:31 -0800 (Sat, 25 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20878&view=rev

Log Message:
-----------
Moved dummy MIDI driver from backends/ to sound/ (this fixes bug #1435221)

Modified Paths:
--------------
    scummvm/trunk/backends/module.mk
    scummvm/trunk/sound/module.mk

Added Paths:
-----------
    scummvm/trunk/sound/null.cpp

Removed Paths:
-------------
    scummvm/trunk/backends/midi/null.cpp
Deleted: scummvm/trunk/backends/midi/null.cpp
===================================================================
--- scummvm/trunk/backends/midi/null.cpp	2006-02-25 14:42:21 UTC (rev 20877)
+++ scummvm/trunk/backends/midi/null.cpp	2006-02-25 14:45:31 UTC (rev 20878)
@@ -1,40 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001-2006 The ScummVM project
- *
- * 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$
- */
-
-#include "common/stdafx.h"
-#include "sound/mpu401.h"
-
-/* NULL driver */
-class MidiDriver_NULL : public MidiDriver_MPU401 {
-public:
-	int open() { return 0; }
-	void send(uint32 b) { }
-};
-
-MidiDriver *MidiDriver_NULL_create() {
-	return new MidiDriver_NULL();
-}
-
-#ifdef DISABLE_ADLIB
-MidiDriver *MidiDriver_ADLIB_create(Audio::Mixer *mixer) {
-	return new MidiDriver_NULL();
-}
-#endif

Modified: scummvm/trunk/backends/module.mk
===================================================================
--- scummvm/trunk/backends/module.mk	2006-02-25 14:42:21 UTC (rev 20877)
+++ scummvm/trunk/backends/module.mk	2006-02-25 14:45:31 UTC (rev 20878)
@@ -10,7 +10,6 @@
 	midi/coreaudio.o \
 	midi/coremidi.o \
 	midi/morphos.o \
-	midi/null.o \
 	midi/quicktime.o \
 	midi/seq.o \
 	midi/windows.o

Modified: scummvm/trunk/sound/module.mk
===================================================================
--- scummvm/trunk/sound/module.mk	2006-02-25 14:42:21 UTC (rev 20877)
+++ scummvm/trunk/sound/module.mk	2006-02-25 14:45:31 UTC (rev 20878)
@@ -13,6 +13,7 @@
 	mixer.o \
 	mp3.o \
 	mpu401.o \
+	null.o \
 	rate.o \
 	voc.o \
 	vorbis.o \

Copied: scummvm/trunk/sound/null.cpp (from rev 20833, scummvm/trunk/backends/midi/null.cpp)
===================================================================
--- scummvm/trunk/sound/null.cpp	                        (rev 0)
+++ scummvm/trunk/sound/null.cpp	2006-02-25 14:45:31 UTC (rev 20878)
@@ -0,0 +1,40 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2001-2006 The ScummVM project
+ *
+ * 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$
+ */
+
+#include "common/stdafx.h"
+#include "sound/mpu401.h"
+
+/* NULL driver */
+class MidiDriver_NULL : public MidiDriver_MPU401 {
+public:
+	int open() { return 0; }
+	void send(uint32 b) { }
+};
+
+MidiDriver *MidiDriver_NULL_create() {
+	return new MidiDriver_NULL();
+}
+
+#ifdef DISABLE_ADLIB
+MidiDriver *MidiDriver_ADLIB_create(Audio::Mixer *mixer) {
+	return new MidiDriver_NULL();
+}
+#endif