aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamieson Christian2003-08-12 07:32:43 +0000
committerJamieson Christian2003-08-12 07:32:43 +0000
commit442c79671a25dbf3287dd64422bed2467b7f0640 (patch)
tree26c30f3784bb7a3d4c01574102597f1355e730e1
parent6e51f394e84333b5305aad5b9e3b176dd15c5668 (diff)
downloadscummvm-rg350-442c79671a25dbf3287dd64422bed2467b7f0640.tar.gz
scummvm-rg350-442c79671a25dbf3287dd64422bed2467b7f0640.tar.bz2
scummvm-rg350-442c79671a25dbf3287dd64422bed2467b7f0640.zip
Removed unused stuff.
svn-id: r9647
-rw-r--r--scumm/imuse.cpp18
-rw-r--r--scumm/imuse.h1
-rw-r--r--scumm/imuse_internal.h2
3 files changed, 0 insertions, 21 deletions
diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp
index 44ad845a59..8bce602b00 100644
--- a/scumm/imuse.cpp
+++ b/scumm/imuse.cpp
@@ -73,23 +73,6 @@ IMuseInternal::~IMuseInternal() {
terminate();
}
-MidiDriver *IMuseInternal::getMidiDriver() {
- MidiDriver *driver = NULL;
-
- if (_midi_native) {
- driver = _midi_native;
- } else {
- // Route it through Adlib anyway.
- if (!_midi_adlib) {
- _midi_adlib = MidiDriver_ADLIB_create(_mixer);
- initMidiDriver(_midi_adlib);
- }
- driver = _midi_adlib;
- }
-
- return driver;
-}
-
byte *IMuseInternal::findStartOfSound(int sound) {
byte *ptr = NULL;
int32 size, pos;
@@ -1766,7 +1749,6 @@ int32 IMuse::doCommand (int numargs, int args[]) { in(); int32 ret = _target->do
int IMuse::clear_queue() { in(); int ret = _target->clear_queue(); out(); return ret; }
void IMuse::setBase(byte **base) { in(); _target->setBase(base); out(); }
uint32 IMuse::property(int prop, uint32 value) { in(); uint32 ret = _target->property(prop, value); out(); return ret; }
-MidiDriver *IMuse::getMidiDriver() { in(); MidiDriver *ret = _target->getMidiDriver(); out(); return ret; }
// The IMuse::create method provides a front-end factory
// for creating IMuseInternal without exposing that class
diff --git a/scumm/imuse.h b/scumm/imuse.h
index 10280ee25b..7788ddf0ea 100644
--- a/scumm/imuse.h
+++ b/scumm/imuse.h
@@ -72,7 +72,6 @@ public:
int clear_queue();
void setBase(byte **base);
uint32 property(int prop, uint32 value);
- MidiDriver *getMidiDriver();
// Factory methods
static IMuse *create(OSystem *syst, SoundMixer *mixer, MidiDriver *midi);
diff --git a/scumm/imuse_internal.h b/scumm/imuse_internal.h
index 16a9dc11e7..cf5b5d3da0 100644
--- a/scumm/imuse_internal.h
+++ b/scumm/imuse_internal.h
@@ -465,9 +465,7 @@ public:
int32 doCommand (int numargs, int args[]);
int clear_queue();
void setBase(byte **base);
-
uint32 property(int prop, uint32 value);
- MidiDriver *getMidiDriver();
static IMuseInternal *create(OSystem *syst, SoundMixer *mixer, MidiDriver *midi);
};