diff --git a/Core/HLE/ErrorCodes.h b/Core/HLE/ErrorCodes.h index 3a9b49b6ac..450ddf5caf 100644 --- a/Core/HLE/ErrorCodes.h +++ b/Core/HLE/ErrorCodes.h @@ -2,7 +2,7 @@ #include "Common/CommonTypes.h" -enum : u32 { +enum PSPErrorCode : u32 { SCE_KERNEL_ERROR_OK = 0, SCE_KERNEL_ERROR_ALREADY = 0x80000020, SCE_KERNEL_ERROR_BUSY = 0x80000021, diff --git a/Core/HLE/sceKernelThread.cpp b/Core/HLE/sceKernelThread.cpp index 6484f267a0..58f8d3bb46 100644 --- a/Core/HLE/sceKernelThread.cpp +++ b/Core/HLE/sceKernelThread.cpp @@ -1349,7 +1349,7 @@ int sceKernelGetThreadExitStatus(SceUID threadID) { hleEatCycles(330); // Some return values don't deserve to be considered errors for logging. - switch (status) { + switch ((PSPErrorCode)status) { case SCE_KERNEL_ERROR_NOT_DORMANT: return hleLogDebug(Log::sceKernel, status); default: diff --git a/UI/ImDebugger/ImDebugger.cpp b/UI/ImDebugger/ImDebugger.cpp index cf2f72c164..0b0be25333 100644 --- a/UI/ImDebugger/ImDebugger.cpp +++ b/UI/ImDebugger/ImDebugger.cpp @@ -996,12 +996,12 @@ void DrawAudioDecodersView(ImConfig &cfg, ImControl &control) { if (cfg.selectedAtracCtx >= 0 && cfg.selectedAtracCtx < PSP_NUM_ATRAC_IDS) { u32 type = 0; - const AtracCtx *ctx = __AtracGetCtx(cfg.selectedAtracCtx, &type); + const AtracBase *ctx = __AtracGetCtx(cfg.selectedAtracCtx, &type); // Show details about the selected atrac context here. char header[32]; snprintf(header, sizeof(header), "Atrac context %d", cfg.selectedAtracCtx); if (ctx && ImGui::CollapsingHeader(header, ImGuiTreeNodeFlags_DefaultOpen)) { - ImGui::ProgressBar((float)ctx->CurrentSample() / ctx->GetTrack().endSample, ImVec2(200.0f, 0.0f)); + ImGui::ProgressBar((float)ctx->CurrentSample() / (float)ctx->GetTrack().endSample, ImVec2(200.0f, 0.0f)); ImGui::Text("Status: %s", AtracStatusToString(ctx->BufferState())); ImGui::Text("cur/end sample: %d/%d", ctx->CurrentSample(), ctx->GetTrack().endSample); ImGui::Text("ctx addr: "); ImGui::SameLine(); ImClickableValue("addr", ctx->Decoder()->GetCtxPtr(), control, ImCmd::SHOW_IN_MEMORY_VIEWER);