libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-11-30 21:00:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCUMM: Partially revert 08c17d4513

Browse Source 
This looks like an unintended WUP code and breaks compilation
This commit is contained in:
Eugene Sandulenko 2024-10-31 00:10:19 +01:00
parent 08c17d4513
commit a726104ee6
No known key found for this signature in database
GPG Key ID: 014D387312D34F08
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/scumm/players/player_mac_new.cpp
View File

@ -32,7 +32,7 @@
namespace Scumm {
#define ASC_DEVICE_RATE 0x56EE8BA3
#define VBL_UPDATE_RATE 0x003C0000;
#define VBL_UPDATE_RATE 0x003C0000
#define PCM_BUFFER_RESERVE 64
#define RATECNV_BIT_PRECSN 24
@ -206,9 +206,7 @@ int MacPlayerAudioStream::readBuffer(int16 *buffer, const int numSamples) {
};
static const char errFnNames[2][8] = {"Buffers", "Drivers"};
int errNo = -1;
for (int i = 0; i < _numGroups && errNo == -1; ++i)
errNo = !_buffers[i].size ? 0 : (_buffers[i].rateConvAcc == -1 ? 1 : -1);
int errNo = (!_buffers[0].size || !_buffers[1].size) ? 0 : ((_buffers[0].rateConvAcc == -1 || _buffers[1].rateConvAcc == -1) ? 1 : -1);
if (errNo != -1)
error("MacPlayerAudioStream::readBuffer(): init%s() must be called before playback", errFnNames[errNo]);