diff options
| author | Walter van Niftrik | 2010-01-09 02:14:12 +0000 |
|---|---|---|
| committer | Walter van Niftrik | 2010-01-09 02:14:12 +0000 |
| commit | 6f78bc40dd04b0480c53e81772c3b2f8bd6cf0da (patch) | |
| tree | af77a3ce8d2e40279577b1b0bb84007d5a7e3d1b /engines/sci/sound/iterator/iterator.cpp | |
| parent | be8371fb07936f27934909c4c0eb5184547a2656 (diff) | |
| download | scummvm-rg350-6f78bc40dd04b0480c53e81772c3b2f8bd6cf0da.tar.gz scummvm-rg350-6f78bc40dd04b0480c53e81772c3b2f8bd6cf0da.tar.bz2 scummvm-rg350-6f78bc40dd04b0480c53e81772c3b2f8bd6cf0da.zip | |
SCI: Move music device IDs to drivers.
svn-id: r47190
Diffstat (limited to 'engines/sci/sound/iterator/iterator.cpp')
| -rw-r--r-- | engines/sci/sound/iterator/iterator.cpp | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/engines/sci/sound/iterator/iterator.cpp b/engines/sci/sound/iterator/iterator.cpp index 3359d0155b..9c340b5604 100644 --- a/engines/sci/sound/iterator/iterator.cpp +++ b/engines/sci/sound/iterator/iterator.cpp @@ -666,20 +666,6 @@ SongIterator *Sci0SongIterator::clone(int delta) { /*-- SCI1 song iterators --*/ /***************************/ -#define SCI01_INVALID_DEVICE 0xff - -/* Second index determines whether PCM output is supported */ -static const int sci0_to_sci1_device_map[][2] = { - {0x06, 0x0c}, /* MT-32 */ - {0xff, 0xff}, /* YM FB-01 */ - {0x00, 0x00}, /* CMS/Game Blaster-- we assume OPL/2 here... */ - {0xff, 0xff}, /* Casio MT540/CT460 */ - {0x13, 0x13}, /* Tandy 3-voice */ - {0x12, 0x12}, /* PC speaker */ - {0xff, 0xff}, - {0xff, 0xff}, -}; /* Maps bit number to device ID */ - int Sci1SongIterator::initSample(const int offset) { Sci1Sample sample; int rate; @@ -1008,16 +994,8 @@ SongIterator *Sci1SongIterator::handleMessage(Message msg) { if (msg.ID == ID) { channel_mask = 0; - _deviceId - = sci0_to_sci1_device_map - [sci_ffs(msg._arg.i & 0xff) - 1] - [g_system->getMixer()->isReady()] - ; + _deviceId = msg._arg.i; - if (_deviceId == 0xff) { - warning("[iterator] Device %d(%d) not supported", - msg._arg.i & 0xff, g_system->getMixer()->isReady()); - } if (_initialised) { int i; int toffset = -1; |