diff options
| author | Travis Howell | 2003-09-24 06:56:30 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-09-24 06:56:30 +0000 |
| commit | 4a62eb3e3b75944bca5af3bbab9e05dfecd77dcd (patch) | |
| tree | fcd1210b4b896122ade69adf498a7054e23cd8d4 /scumm/scummvm.cpp | |
| parent | 09a01e4cbeada86167d83608cd0dcd77d7a0168f (diff) | |
| download | scummvm-rg350-4a62eb3e3b75944bca5af3bbab9e05dfecd77dcd.tar.gz scummvm-rg350-4a62eb3e3b75944bca5af3bbab9e05dfecd77dcd.tar.bz2 scummvm-rg350-4a62eb3e3b75944bca5af3bbab9e05dfecd77dcd.zip | |
More Amiga V2/V3 sound updates from _Q_:
1. A Player_MOD class, basically acts as a simplified mixer that mixes at 60Hz intervals (or whatever interval you specify), this gives smooth music playback in player_v3a
2. Some changes to player_v3a as a result of #1, including reduced music volume
3. player_v2a, and the necessary additions to scummvm.cpp/scumm.h
svn-id: r10392
Diffstat (limited to 'scumm/scummvm.cpp')
| -rw-r--r-- | scumm/scummvm.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 4831260dce..6ca8325896 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -44,6 +44,7 @@ #include "scumm/object.h" #include "scumm/player_v1.h" #include "scumm/player_v2.h" +#include "scumm/player_v2a.h" #include "scumm/player_v3a.h" #include "scumm/resource.h" #include "scumm/scumm.h" @@ -719,10 +720,13 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst) _imuse = NULL; _imuseDigital = NULL; _playerV2 = NULL; + _playerV2A = NULL; _playerV3A = NULL; _musicEngine = NULL; if (_features & GF_DIGI_IMUSE) { _musicEngine = _imuseDigital = new IMuseDigital(this); + } else if ((_features & GF_AMIGA) && (_version == 2)) { + _musicEngine = _playerV2A = new Player_V2A(this); } else if ((_features & GF_AMIGA) && (_version == 3)) { _musicEngine = _playerV3A = new Player_V3A(this); } else if ((_features & GF_AMIGA) && (_version < 5)) { @@ -1329,6 +1333,8 @@ int Scumm::scummLoop(int delta) { // Covered automatically by the Sound class } else if (_playerV2) { VAR(VAR_MUSIC_TIMER) = _playerV2->getMusicTimer(); + } else if (_playerV2A) { + VAR(VAR_MUSIC_TIMER) = _playerV2A->getMusicTimer(); } else if (_playerV3A) { VAR(VAR_MUSIC_TIMER) = _playerV3A->getMusicTimer(); } else if (_imuse) { |