Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove now-unnecessary wrapper _AtracSetData

Browse source
This commit is contained in:
Henrik Rydgård 2025-03-16 11:32:00 +01:00
parent 3d143a0cba
commit 6a4a46025b
1 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Core/HLE/sceAtrac.cpp
View file

@ -553,15 +553,6 @@ static u32 sceAtracResetPlayPosition(int atracID, int sample, int bytesWrittenFi
return hleDelayResult(hleLogDebugOrError(Log::ME, res), "reset play pos", 3000 + delay ? 200 : 0);
}
static int _AtracSetData(int atracID, u32 buffer, u32 readSize, u32 bufferSize, int outputChannels) {
AtracBase *atrac = getAtrac(atracID);
// Don't use AtracValidateManaged here.
if (!atrac) {
return SCE_ERROR_ATRAC_BAD_ATRACID;
}
return atrac->SetData(buffer, readSize, bufferSize, outputChannels);
}
static u32 sceAtracSetHalfwayBuffer(int atracID, u32 buffer, u32 readSize, u32 bufferSize) {
AtracBase *atrac = getAtrac(atracID);
// Don't use AtracValidateManaged here.
@ -578,7 +569,7 @@ static u32 sceAtracSetHalfwayBuffer(int atracID, u32 buffer, u32 readSize, u32 b
return hleLogError(Log::ME, ret);
}
ret = _AtracSetData(atracID, buffer, readSize, bufferSize, 2);
ret = atrac->SetData(buffer, readSize, bufferSize, 2);
// not sure the real delay time
return hleDelayResult(hleLogDebugOrError(Log::ME, ret), "atrac set data", 100);
}
@ -608,7 +599,7 @@ static u32 sceAtracSetData(int atracID, u32 buffer, u32 bufferSize) {
return hleReportError(Log::ME, SCE_ERROR_ATRAC_WRONG_CODECTYPE, "atracID uses different codec type than data");
}
ret = _AtracSetData(atracID, buffer, bufferSize, bufferSize, 2);
ret = atrac->SetData(buffer, bufferSize, bufferSize, 2);
return hleDelayResult(hleLogDebugOrError(Log::ME, ret), "atrac set data", 100);
}
@ -632,7 +623,7 @@ static int sceAtracSetDataAndGetID(u32 buffer, int bufferSize) {
return hleLogError(Log::ME, atracID, "no free ID");
}
ret = _AtracSetData(atracID, buffer, bufferSize, bufferSize, 2);
ret = atrac->SetData(buffer, bufferSize, bufferSize, 2);
return hleDelayResult(hleLogDebugOrError(Log::ME, ret == 0 ? atracID : ret), "atrac set data", 100);
}
@ -651,7 +642,7 @@ static int sceAtracSetHalfwayBufferAndGetID(u32 buffer, u32 readSize, u32 buffer
delete atrac;
return hleLogError(Log::ME, atracID, "no free ID");
}
ret = _AtracSetData(atracID, buffer, readSize, bufferSize, 2);
ret = atrac->SetData(buffer, readSize, bufferSize, 2);
return hleDelayResult(hleLogDebugOrError(Log::ME, ret == 0 ? atracID : ret), "atrac set data", 100);
}
@ -763,7 +754,7 @@ static int sceAtracSetMOutHalfwayBuffer(int atracID, u32 buffer, u32 readSize, u
atrac->SetData(buffer, readSize, bufferSize, 2);
return hleReportError(Log::ME, SCE_ERROR_ATRAC_NOT_MONO, "not mono data");
} else {
ret = _AtracSetData(atracID, buffer, readSize, bufferSize, 1);
ret = atrac->SetData(buffer, readSize, bufferSize, 1);
return hleDelayResult(hleLogDebugOrError(Log::ME, ret), "atrac set data mono", 100);
}
}
@ -785,7 +776,7 @@ static u32 sceAtracSetMOutData(int atracID, u32 buffer, u32 bufferSize) {
atrac->SetData(buffer, bufferSize, bufferSize, 2);
return hleReportError(Log::ME, SCE_ERROR_ATRAC_NOT_MONO, "not mono data");
} else {
ret = _AtracSetData(atracID, buffer, bufferSize, bufferSize, 1);
ret = atrac->SetData(buffer, bufferSize, bufferSize, 1);
return hleDelayResult(hleLogDebugOrError(Log::ME, ret), "atrac set data mono", 100);
}
}
@ -808,7 +799,7 @@ static int sceAtracSetMOutDataAndGetID(u32 buffer, u32 bufferSize) {
return hleLogError(Log::ME, atracID, "no free ID");
}
ret = _AtracSetData(atracID, buffer, bufferSize, bufferSize, 1);
ret = atrac->SetData(buffer, bufferSize, bufferSize, 1);
return hleDelayResult(hleLogDebugOrError(Log::ME, ret == 0 ? atracID : ret), "atrac set data", 100);
}
@ -832,7 +823,7 @@ static int sceAtracSetMOutHalfwayBufferAndGetID(u32 buffer, u32 readSize, u32 bu
return hleLogError(Log::ME, atracID, "no free ID");
}
ret = _AtracSetData(atracID, buffer, readSize, bufferSize, 1);
ret = atrac->SetData(buffer, readSize, bufferSize, 1);
return hleDelayResult(hleLogDebugOrError(Log::ME, ret == 0 ? atracID : ret), "atrac set data", 100);
}
@ -849,7 +840,7 @@ static int sceAtracSetAA3DataAndGetID(u32 buffer, u32 bufferSize, u32 fileSize,
return hleLogError(Log::ME, atracID, "no free ID");
}
ret = _AtracSetData(atracID, buffer, bufferSize, bufferSize, 2);
ret = atrac->SetData(buffer, bufferSize, bufferSize, 2);
return hleDelayResult(hleLogDebugOrError(Log::ME, ret == 0 ? atracID : ret), "atrac set data", 100);
}
@ -971,7 +962,7 @@ static int sceAtracSetAA3HalfwayBufferAndGetID(u32 buffer, u32 readSize, u32 buf
return hleLogError(Log::ME, atracID, "no free ID");
}
ret = _AtracSetData(atracID, buffer, readSize, bufferSize, 2);
ret = atrac->SetData(buffer, readSize, bufferSize, 2);
return hleDelayResult(hleLogDebugOrError(Log::ME, ret == 0 ? atracID : ret), "atrac set data", 100);
}