diff --git a/Core/Config.cpp b/Core/Config.cpp index 2d7c53fafb..394eed1ec3 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -2047,7 +2047,7 @@ void PlayTimeTracker::Start(const std::string &gameId) { if (gameId.empty()) { return; } - INFO_LOG(Log::System, "GameTimeTracker::Start(%s)", gameId.c_str()); + VERBOSE_LOG(Log::System, "GameTimeTracker::Start(%s)", gameId.c_str()); auto iter = tracker_.find(std::string(gameId)); if (iter != tracker_.end()) { @@ -2070,7 +2070,7 @@ void PlayTimeTracker::Stop(const std::string &gameId) { return; } - INFO_LOG(Log::System, "GameTimeTracker::Stop(%s)", gameId.c_str()); + VERBOSE_LOG(Log::System, "GameTimeTracker::Stop(%s)", gameId.c_str()); auto iter = tracker_.find(std::string(gameId)); if (iter != tracker_.end()) { diff --git a/Core/HLE/AtracCtx.cpp b/Core/HLE/AtracCtx.cpp index 9a9ce6e2d2..441ca10636 100644 --- a/Core/HLE/AtracCtx.cpp +++ b/Core/HLE/AtracCtx.cpp @@ -860,6 +860,7 @@ u32 Atrac::GetNextSamples() { if (numSamples > track_.SamplesPerFrame()) numSamples = track_.SamplesPerFrame(); if (bufferState_ == ATRAC_STATUS_STREAMED_LOOP_FROM_END && (int)numSamples + currentSample_ > track_.endSample) { + // This probably only happens in PPSSPP due to our internal buffer, which needs to go away. bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; } return numSamples; diff --git a/Core/HLE/sceKernelThread.cpp b/Core/HLE/sceKernelThread.cpp index f9cd9986a2..6484f267a0 100644 --- a/Core/HLE/sceKernelThread.cpp +++ b/Core/HLE/sceKernelThread.cpp @@ -1347,7 +1347,14 @@ int sceKernelGetThreadExitStatus(SceUID threadID) { int status = __KernelGetThreadExitStatus(threadID); // Seems this is called in a tight-ish loop, maybe awaiting an interrupt - issue #13698 hleEatCycles(330); - return hleLogDebugOrError(Log::sceKernel, status); + + // Some return values don't deserve to be considered errors for logging. + switch (status) { + case SCE_KERNEL_ERROR_NOT_DORMANT: + return hleLogDebug(Log::sceKernel, status); + default: + return hleLogDebugOrError(Log::sceKernel, status); + } } u32 sceKernelGetThreadmanIdType(u32 uid) { diff --git a/UI/DebugOverlay.cpp b/UI/DebugOverlay.cpp index b07fae0244..436e5c0dde 100644 --- a/UI/DebugOverlay.cpp +++ b/UI/DebugOverlay.cpp @@ -467,7 +467,6 @@ void DrawFPS(UIContext *ctx, const Bounds &bounds) { } if (System_GetPropertyBool(SYSPROP_CAN_READ_BATTERY_PERCENTAGE)) { if (g_Config.iShowStatusFlags & (int)ShowStatusFlags::BATTERY_PERCENT) { - char temp[256]; const int percentage = System_GetPropertyInt(SYSPROP_BATTERY_PERCENTAGE); // Just plain append battery. Add linebreak? buffer.Printf(" Battery: %d%%", percentage); diff --git a/UI/ImDebugger/ImDebugger.cpp b/UI/ImDebugger/ImDebugger.cpp index 1d39b5cebc..cf2f72c164 100644 --- a/UI/ImDebugger/ImDebugger.cpp +++ b/UI/ImDebugger/ImDebugger.cpp @@ -1000,7 +1000,7 @@ void DrawAudioDecodersView(ImConfig &cfg, ImControl &control) { // Show details about the selected atrac context here. char header[32]; snprintf(header, sizeof(header), "Atrac context %d", cfg.selectedAtracCtx); - if (ImGui::CollapsingHeader(header, ImGuiTreeNodeFlags_DefaultOpen)) { + if (ctx && ImGui::CollapsingHeader(header, ImGuiTreeNodeFlags_DefaultOpen)) { ImGui::ProgressBar((float)ctx->CurrentSample() / 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); diff --git a/UI/ImDebugger/ImDebugger.h b/UI/ImDebugger/ImDebugger.h index f5616975ba..490e8b2d74 100644 --- a/UI/ImDebugger/ImDebugger.h +++ b/UI/ImDebugger/ImDebugger.h @@ -160,7 +160,7 @@ struct ImConfig { int selectedFramebuffer = -1; int selectedBreakpoint = -1; int selectedMemCheck = -1; - int selectedAtracCtx = -1; + int selectedAtracCtx = 0; uint64_t selectedTexAddr = 0; bool realtimePixelPreview = false;