diff options
| author | Max Horn | 2007-03-02 15:26:22 +0000 |
|---|---|---|
| committer | Max Horn | 2007-03-02 15:26:22 +0000 |
| commit | 029b8c43238ab363bcc1c518b3c4de312b240ae1 (patch) | |
| tree | a5c171c2759e030b5456a7b367751bf700e7e69e /engines/scumm/player_mod.cpp | |
| parent | d8cf10926b27c86e13755b0132fca4de6931f86c (diff) | |
| download | scummvm-rg350-029b8c43238ab363bcc1c518b3c4de312b240ae1.tar.gz scummvm-rg350-029b8c43238ab363bcc1c518b3c4de312b240ae1.tar.bz2 scummvm-rg350-029b8c43238ab363bcc1c518b3c4de312b240ae1.zip | |
Changed the order of the parameters of makeLinearInputStream to resemble Mixer::playRaw; also made makeLinearInputStream honor FLAG_LOOP (and for this, changed its loop related params slightly)
svn-id: r25926
Diffstat (limited to 'engines/scumm/player_mod.cpp')
| -rw-r--r-- | engines/scumm/player_mod.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/scumm/player_mod.cpp b/engines/scumm/player_mod.cpp index 38a5c8554e..918df6e6dc 100644 --- a/engines/scumm/player_mod.cpp +++ b/engines/scumm/player_mod.cpp @@ -91,7 +91,7 @@ void Player_MOD::startChannel(int id, void *data, int size, int rate, uint8 vol, _channels[i].vol = vol; _channels[i].pan = pan; _channels[i].freq = rate; - _channels[i].input = Audio::makeLinearInputStream(rate, Audio::Mixer::FLAG_AUTOFREE | (loopStart != loopEnd ? Audio::Mixer::FLAG_LOOP : 0), (const byte*)data, size, loopStart, loopEnd - loopStart); + _channels[i].input = Audio::makeLinearInputStream((const byte*)data, size, rate, Audio::Mixer::FLAG_AUTOFREE | (loopStart != loopEnd ? Audio::Mixer::FLAG_LOOP : 0), loopStart, loopEnd); _channels[i].converter = Audio::makeRateConverter(rate, _mixer->getOutputRate(), false, false); } |