aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/module.mk1
-rw-r--r--audio/softsynth/fmtowns_pc98/towns_pc98_plugins.cpp9
-rw-r--r--engines/scumm/imuse/drivers/fmtowns.cpp (renamed from audio/softsynth/fmtowns_pc98/towns_midi.cpp)2
-rw-r--r--engines/scumm/imuse/drivers/fmtowns.h (renamed from audio/softsynth/fmtowns_pc98/towns_midi.h)4
-rw-r--r--engines/scumm/imuse/drivers/mac_m68k.cpp (renamed from engines/scumm/imuse/mac_m68k.cpp)2
-rw-r--r--engines/scumm/imuse/drivers/mac_m68k.h (renamed from engines/scumm/imuse/mac_m68k.h)0
-rw-r--r--engines/scumm/imuse/drivers/pcspk.cpp (renamed from engines/scumm/imuse/pcspk.cpp)2
-rw-r--r--engines/scumm/imuse/drivers/pcspk.h (renamed from engines/scumm/imuse/pcspk.h)0
-rw-r--r--engines/scumm/module.mk5
-rw-r--r--engines/scumm/players/player_towns.h2
-rw-r--r--engines/scumm/scumm.cpp9
11 files changed, 19 insertions, 17 deletions
diff --git a/audio/module.mk b/audio/module.mk
index 686c70be63..c2d764ace4 100644
--- a/audio/module.mk
+++ b/audio/module.mk
@@ -49,7 +49,6 @@ MODULE_OBJS := \
softsynth/fmtowns_pc98/pc98_audio.o \
softsynth/fmtowns_pc98/towns_audio.o \
softsynth/fmtowns_pc98/towns_euphony.o \
- softsynth/fmtowns_pc98/towns_midi.o \
softsynth/fmtowns_pc98/towns_pc98_driver.o \
softsynth/fmtowns_pc98/towns_pc98_fmsynth.o \
softsynth/fmtowns_pc98/towns_pc98_plugins.o \
diff --git a/audio/softsynth/fmtowns_pc98/towns_pc98_plugins.cpp b/audio/softsynth/fmtowns_pc98/towns_pc98_plugins.cpp
index 194bfc41f9..41034846eb 100644
--- a/audio/softsynth/fmtowns_pc98/towns_pc98_plugins.cpp
+++ b/audio/softsynth/fmtowns_pc98/towns_pc98_plugins.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "audio/softsynth/fmtowns_pc98/towns_midi.h"
#include "audio/musicplugin.h"
#include "common/translation.h"
#include "common/error.h"
@@ -48,8 +47,8 @@ MusicDevices TownsEmuMusicPlugin::getDevices() const {
}
Common::Error TownsEmuMusicPlugin::createInstance(MidiDriver **mididriver, MidiDriver::DeviceHandle) const {
- *mididriver = new MidiDriver_TOWNS(g_system->getMixer());
- return Common::kNoError;
+ *mididriver = 0;
+ return Common::kUnknownError;
}
class PC98EmuMusicPlugin : public MusicPluginObject {
@@ -73,8 +72,8 @@ MusicDevices PC98EmuMusicPlugin::getDevices() const {
}
Common::Error PC98EmuMusicPlugin::createInstance(MidiDriver **mididriver, MidiDriver::DeviceHandle) const {
- //*mididriver = /**/
- return Common::kNoError;
+ *mididriver = 0;
+ return Common::kUnknownError;
}
//#if PLUGIN_ENABLED_DYNAMIC(TOWNS)
diff --git a/audio/softsynth/fmtowns_pc98/towns_midi.cpp b/engines/scumm/imuse/drivers/fmtowns.cpp
index c02b047153..37765e07e7 100644
--- a/audio/softsynth/fmtowns_pc98/towns_midi.cpp
+++ b/engines/scumm/imuse/drivers/fmtowns.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "audio/softsynth/fmtowns_pc98/towns_midi.h"
+#include "engines/scumm/imuse/drivers/fmtowns.h"
#include "audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h"
#include "common/textconsole.h"
#include "common/system.h"
diff --git a/audio/softsynth/fmtowns_pc98/towns_midi.h b/engines/scumm/imuse/drivers/fmtowns.h
index 1143dbaa02..5413e3797f 100644
--- a/audio/softsynth/fmtowns_pc98/towns_midi.h
+++ b/engines/scumm/imuse/drivers/fmtowns.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef TOWNS_MIDI_H
-#define TOWNS_MIDI_H
+#ifndef IMUSE_DRV_FMTOWNS_H
+#define IMUSE_DRV_FMTOWNS_H
#include "audio/softsynth/fmtowns_pc98/towns_audio.h"
#include "audio/mididrv.h"
diff --git a/engines/scumm/imuse/mac_m68k.cpp b/engines/scumm/imuse/drivers/mac_m68k.cpp
index 8ebd8e4cca..1bcef44222 100644
--- a/engines/scumm/imuse/mac_m68k.cpp
+++ b/engines/scumm/imuse/drivers/mac_m68k.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "scumm/imuse/mac_m68k.h"
+#include "scumm/imuse/drivers/mac_m68k.h"
#include "common/util.h"
#include "common/macresman.h"
diff --git a/engines/scumm/imuse/mac_m68k.h b/engines/scumm/imuse/drivers/mac_m68k.h
index 31beaf4e66..31beaf4e66 100644
--- a/engines/scumm/imuse/mac_m68k.h
+++ b/engines/scumm/imuse/drivers/mac_m68k.h
diff --git a/engines/scumm/imuse/pcspk.cpp b/engines/scumm/imuse/drivers/pcspk.cpp
index 856b771990..0e516c27aa 100644
--- a/engines/scumm/imuse/pcspk.cpp
+++ b/engines/scumm/imuse/drivers/pcspk.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "scumm/imuse/pcspk.h"
+#include "scumm/imuse/drivers/pcspk.h"
#include "common/util.h"
diff --git a/engines/scumm/imuse/pcspk.h b/engines/scumm/imuse/drivers/pcspk.h
index 6a107e169a..6a107e169a 100644
--- a/engines/scumm/imuse/pcspk.h
+++ b/engines/scumm/imuse/drivers/pcspk.h
diff --git a/engines/scumm/module.mk b/engines/scumm/module.mk
index bcc1eba704..799176f869 100644
--- a/engines/scumm/module.mk
+++ b/engines/scumm/module.mk
@@ -28,11 +28,12 @@ MODULE_OBJS := \
imuse/imuse_part.o \
imuse/imuse_player.o \
imuse/instrument.o \
- imuse/mac_m68k.o \
- imuse/pcspk.o \
imuse/sysex_samnmax.o \
imuse/sysex_scumm.o \
imuse/drivers/amiga.o \
+ imuse/drivers/fmtowns.o \
+ imuse/drivers/mac_m68k.o \
+ imuse/drivers/pcspk.o \
input.o \
midiparser_ro.o \
object.o \
diff --git a/engines/scumm/players/player_towns.h b/engines/scumm/players/player_towns.h
index ad51c3e561..62835471ac 100644
--- a/engines/scumm/players/player_towns.h
+++ b/engines/scumm/players/player_towns.h
@@ -25,8 +25,8 @@
#include "scumm/scumm.h"
#include "scumm/imuse/imuse.h"
+#include "scumm/imuse/drivers/fmtowns.h"
#include "audio/softsynth/fmtowns_pc98/towns_euphony.h"
-#include "audio/softsynth/fmtowns_pc98/towns_midi.h"
namespace Scumm {
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 64f45c1b98..e3919eee05 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -76,9 +76,10 @@
#include "scumm/he/cup_player_he.h"
#include "scumm/util.h"
#include "scumm/verbs.h"
-#include "scumm/imuse/pcspk.h"
-#include "scumm/imuse/mac_m68k.h"
+#include "scumm/imuse/drivers/pcspk.h"
+#include "scumm/imuse/drivers/mac_m68k.h"
#include "scumm/imuse/drivers/amiga.h"
+#include "scumm/imuse/drivers/fmtowns.h"
#include "backends/audiocd/audiocd.h"
@@ -2001,7 +2002,9 @@ void ScummEngine::setupMusic(int midi) {
nativeMidiDriver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
if (!useOnlyNative) {
- if (_sound->_musicType == MDT_ADLIB || _sound->_musicType == MDT_TOWNS || multi_midi) {
+ if (_sound->_musicType == MDT_TOWNS) {
+ adlibMidiDriver = new MidiDriver_TOWNS(_mixer);
+ } else if (_sound->_musicType == MDT_ADLIB || multi_midi) {
adlibMidiDriver = MidiDriver::createMidi(MidiDriver::detectDevice(_sound->_musicType == MDT_TOWNS ? MDT_TOWNS : MDT_ADLIB));
adlibMidiDriver->property(MidiDriver::PROP_OLD_ADLIB, (_game.features & GF_SMALL_HEADER) ? 1 : 0);
// Try to use OPL3 mode for Sam&Max when possible.
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 05:28:24 +0000