diff options
author | Walter van Niftrik | 2010-01-26 19:25:33 +0000 |
---|---|---|
committer | Walter van Niftrik | 2010-01-26 19:25:33 +0000 |
commit | 9861b04b935b84424b5b7950a2398dbfb44a99f9 (patch) | |
tree | 59a341fbe00b6cc9b4e51134ec2e746445183eff /engines/sci/sound/drivers/amiga.cpp | |
parent | d6bb432a92c3600a5201217316aa7ed0321c898c (diff) | |
download | scummvm-rg350-9861b04b935b84424b5b7950a2398dbfb44a99f9.tar.gz scummvm-rg350-9861b04b935b84424b5b7950a2398dbfb44a99f9.tar.bz2 scummvm-rg350-9861b04b935b84424b5b7950a2398dbfb44a99f9.zip |
SCI: Add driver for Yamaha FB-01. Cleanup.
svn-id: r47571
Diffstat (limited to 'engines/sci/sound/drivers/amiga.cpp')
-rw-r--r-- | engines/sci/sound/drivers/amiga.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/sci/sound/drivers/amiga.cpp b/engines/sci/sound/drivers/amiga.cpp index 1dca092cc2..b9fb17b84d 100644 --- a/engines/sci/sound/drivers/amiga.cpp +++ b/engines/sci/sound/drivers/amiga.cpp @@ -653,8 +653,8 @@ void MidiDriver_Amiga::generateSamples(int16 *data, int len) { class MidiPlayer_Amiga : public MidiPlayer { public: - MidiPlayer_Amiga() { _driver = new MidiDriver_Amiga(g_system->getMixer()); } - byte getPlayId(SciVersion soundVersion); + MidiPlayer_Amiga(SciVersion version) : MidiPlayer(version) { _driver = new MidiDriver_Amiga(g_system->getMixer()); } + byte getPlayId(); int getPolyphony() const { return MidiDriver_Amiga::kVoices; } bool hasRhythmChannel() const { return false; } void setVolume(byte volume) { static_cast<MidiDriver_Amiga *>(_driver)->setVolume(volume); } @@ -662,12 +662,12 @@ public: void loadInstrument(int idx, byte *data); }; -MidiPlayer *MidiPlayer_Amiga_create() { - return new MidiPlayer_Amiga(); +MidiPlayer *MidiPlayer_Amiga_create(SciVersion version) { + return new MidiPlayer_Amiga(version); } -byte MidiPlayer_Amiga::getPlayId(SciVersion soundVersion) { - if (soundVersion != SCI_VERSION_0_LATE) +byte MidiPlayer_Amiga::getPlayId() { + if (_version != SCI_VERSION_0_LATE) error("Amiga sound support not available for this SCI version"); return 0x40; |