diff options
| author | Filippos Karapetis | 2014-12-16 01:05:01 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2014-12-16 01:58:55 +0200 |
| commit | 2463b4580436b41a46500e53b4868789c9c7b21e (patch) | |
| tree | 0f89c3af6e75740cbca4f47b5f68607f088ca338 | |
| parent | 4b2b5e686b6ac2105f11983b2072037358d9ad7f (diff) | |
| download | scummvm-rg350-2463b4580436b41a46500e53b4868789c9c7b21e.tar.gz scummvm-rg350-2463b4580436b41a46500e53b4868789c9c7b21e.tar.bz2 scummvm-rg350-2463b4580436b41a46500e53b4868789c9c7b21e.zip | |
ZVISION: Move the MIDI code together with the rest of the sound code
| -rw-r--r-- | engines/zvision/module.mk | 2 | ||||
| -rw-r--r-- | engines/zvision/scripting/sidefx/music_node.cpp | 2 | ||||
| -rw-r--r-- | engines/zvision/sound/midi.cpp (renamed from engines/zvision/core/midi.cpp) | 2 | ||||
| -rw-r--r-- | engines/zvision/sound/midi.h (renamed from engines/zvision/core/midi.h) | 0 | ||||
| -rw-r--r-- | engines/zvision/zvision.cpp | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk index 604b697ec7..c9a1cb7187 100644 --- a/engines/zvision/module.mk +++ b/engines/zvision/module.mk @@ -4,7 +4,6 @@ MODULE_OBJS := \ core/console.o \ core/events.o \ core/menu.o \ - core/midi.o \ core/save_manager.o \ core/search_manager.o \ detection.o \ @@ -39,6 +38,7 @@ MODULE_OBJS := \ scripting/sidefx/syncsound_node.o \ scripting/sidefx/timer_node.o \ scripting/sidefx/ttytext_node.o \ + sound/midi.o \ sound/zork_raw.o \ text/string_manager.o \ text/text.o \ diff --git a/engines/zvision/scripting/sidefx/music_node.cpp b/engines/zvision/scripting/sidefx/music_node.cpp index 8316c1a76b..c79dd0296d 100644 --- a/engines/zvision/scripting/sidefx/music_node.cpp +++ b/engines/zvision/scripting/sidefx/music_node.cpp @@ -25,9 +25,9 @@ #include "zvision/scripting/sidefx/music_node.h" #include "zvision/zvision.h" -#include "zvision/core/midi.h" #include "zvision/scripting/script_manager.h" #include "zvision/graphics/render_manager.h" +#include "zvision/sound/midi.h" #include "zvision/sound/zork_raw.h" #include "common/stream.h" diff --git a/engines/zvision/core/midi.cpp b/engines/zvision/sound/midi.cpp index 736be1311d..920002c7c3 100644 --- a/engines/zvision/core/midi.cpp +++ b/engines/zvision/sound/midi.cpp @@ -22,7 +22,7 @@ #include "common/scummsys.h" -#include "zvision/core/midi.h" +#include "zvision/sound/midi.h" namespace ZVision { diff --git a/engines/zvision/core/midi.h b/engines/zvision/sound/midi.h index a3bac19636..a3bac19636 100644 --- a/engines/zvision/core/midi.h +++ b/engines/zvision/sound/midi.h diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp index 34fe0794bd..45dc124b58 100644 --- a/engines/zvision/zvision.cpp +++ b/engines/zvision/zvision.cpp @@ -34,7 +34,7 @@ #include "zvision/core/search_manager.h" #include "zvision/text/text.h" #include "zvision/graphics/truetype_font.h" -#include "zvision/core/midi.h" +#include "zvision/sound/midi.h" #include "zvision/utility/zfs_archive.h" #include "common/config-manager.h" |