aboutsummaryrefslogtreecommitdiff
path: root/audio/softsynth
diff options
context:
space:
mode:
authorMatthew Hoops2015-04-29 23:42:01 -0400
committerMatthew Hoops2015-07-07 20:19:46 -0400
commitdce05c520b2e1f273f395c986573f532ee698921 (patch)
tree034c6f504cd14b9adae43fdf721c3a8426a45c16 /audio/softsynth
parentb367ea548d7c129e14fec6164ebe5610d3edeb46 (diff)
downloadscummvm-rg350-dce05c520b2e1f273f395c986573f532ee698921.tar.gz
scummvm-rg350-dce05c520b2e1f273f395c986573f532ee698921.tar.bz2
scummvm-rg350-dce05c520b2e1f273f395c986573f532ee698921.zip
AUDIO: Be consistent with calling stop() in OPL destructors
Diffstat (limited to 'audio/softsynth')
-rw-r--r--audio/softsynth/opl/dosbox.cpp2
-rw-r--r--audio/softsynth/opl/mame.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/audio/softsynth/opl/dosbox.cpp b/audio/softsynth/opl/dosbox.cpp
index 09200c7c8d..6e8b4a94ed 100644
--- a/audio/softsynth/opl/dosbox.cpp
+++ b/audio/softsynth/opl/dosbox.cpp
@@ -149,11 +149,11 @@ OPL::OPL(Config::OplType type) : _type(type), _rate(0), _emulator(0) {
}
OPL::~OPL() {
+ stop();
free();
}
void OPL::free() {
- stopCallbacks();
delete _emulator;
_emulator = 0;
}
diff --git a/audio/softsynth/opl/mame.cpp b/audio/softsynth/opl/mame.cpp
index fe23d300fa..d43f638496 100644
--- a/audio/softsynth/opl/mame.cpp
+++ b/audio/softsynth/opl/mame.cpp
@@ -48,7 +48,7 @@ namespace OPL {
namespace MAME {
OPL::~OPL() {
- stopCallbacks();
+ stop();
MAME::OPLDestroy(_opl);
_opl = 0;
}