aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2006-02-25 14:45:31 +0000
committerMax Horn2006-02-25 14:45:31 +0000
commita161b09728a9b90682d55aab347bb79212444134 (patch)
treef323e2af103918d1faf39847425f2127413f5cd6
parent48fb7ea97980861126cee3310cb013007aa9831a (diff)
downloadscummvm-rg350-a161b09728a9b90682d55aab347bb79212444134.tar.gz
scummvm-rg350-a161b09728a9b90682d55aab347bb79212444134.tar.bz2
scummvm-rg350-a161b09728a9b90682d55aab347bb79212444134.zip
Moved dummy MIDI driver from backends/ to sound/ (this fixes bug #1435221)
svn-id: r20878
-rw-r--r--backends/module.mk1
-rw-r--r--sound/module.mk1
-rw-r--r--sound/null.cpp (renamed from backends/midi/null.cpp)0
3 files changed, 1 insertions, 1 deletions
diff --git a/backends/module.mk b/backends/module.mk
index 774ce0c08f..0ed29d3a8d 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -10,7 +10,6 @@ MODULE_OBJS := \
midi/coreaudio.o \
midi/coremidi.o \
midi/morphos.o \
- midi/null.o \
midi/quicktime.o \
midi/seq.o \
midi/windows.o
diff --git a/sound/module.mk b/sound/module.mk
index d63680ef56..4fc43c34d6 100644
--- a/sound/module.mk
+++ b/sound/module.mk
@@ -13,6 +13,7 @@ MODULE_OBJS := \
mixer.o \
mp3.o \
mpu401.o \
+ null.o \
rate.o \
voc.o \
vorbis.o \
diff --git a/backends/midi/null.cpp b/sound/null.cpp
index 6be4bd03ee..6be4bd03ee 100644
--- a/backends/midi/null.cpp
+++ b/sound/null.cpp