Skip to content

Reimplement Atrac-through-SAS #20156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hrydgard merged 10 commits into from
Mar 25, 2025
Merged

Reimplement Atrac-through-SAS #20156

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4b123a2
Move the sceSas error codes into the big enum
hrydgard Mar 25, 2025
d8f82b5
Minor cleanup
hrydgard Mar 25, 2025
1bd5cff
Initial work on re-implementing atrac-through-sas
hrydgard Mar 25, 2025
172e542
Refactor a bit to make it easier to expose the streaming state to the…
hrydgard Mar 25, 2025
5ea7729
More work on atrac-through-sas
hrydgard Mar 25, 2025
c418513
Fix bad check, add some comments
hrydgard Mar 25, 2025
96ca0e9
Cleanup logging
hrydgard Mar 25, 2025
870995a
Mostly restore the old code path
hrydgard Mar 25, 2025
8403597
Fix an unrelated issue where "Cache full iso in RAM" didn't actually …
hrydgard Mar 25, 2025
2af71d0
Lost this behavior by mistake. Should fix the tests.
hrydgard Mar 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Minor cleanup
  • Loading branch information
@hrydgard
hrydgard committed Mar 25, 2025
commit d8f82b5875134c7ae050375b2343c8fb2b4031d5
4 changes: 2 additions & 2 deletions Core/WebServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,8 +426,8 @@ static void ExecuteWebServer() {
RegisterServer(http->Port());
double lastRegister = time_now_d();
while (RetrieveStatus() == ServerStatus::RUNNING) {
http->RunSlice(1.0);

constexpr double webServerSliceSeconds = 0.2f;
http->RunSlice(webServerSliceSeconds);
double now = time_now_d();
if (now > lastRegister + 540.0) {
RegisterServer(http->Port());
Expand Down
4 changes: 4 additions & 0 deletions Core/WebServer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,16 @@

#pragma once

#include "Common/Common.h"

enum class WebServerFlags {
NONE = 0,
DISCS = 1,
DEBUGGER = 2,

ALL = 1 | 2,
};
ENUM_CLASS_BITOPS(WebServerFlags);

bool StartWebServer(WebServerFlags flags);
bool StopWebServer(WebServerFlags flags);
Expand Down
14 changes: 9 additions & 5 deletions UI/NativeApp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,12 +749,16 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
// Easy testing
// screenManager->push(new GPUDriverTestScreen());

if (g_Config.bRemoteShareOnStartup && g_Config.bRemoteDebuggerOnStartup)
WebServerFlags flags = (WebServerFlags)0;
if (g_Config.bRemoteShareOnStartup) {
flags |= WebServerFlags::DISCS;
}
if (g_Config.bRemoteDebuggerOnStartup) {
flags |= WebServerFlags::DEBUGGER;
}
if (flags != WebServerFlags::NONE) {
StartWebServer(WebServerFlags::ALL);
else if (g_Config.bRemoteShareOnStartup)
StartWebServer(WebServerFlags::DISCS);
else if (g_Config.bRemoteDebuggerOnStartup)
StartWebServer(WebServerFlags::DEBUGGER);
}

std::string sysName = System_GetProperty(SYSPROP_NAME);

Expand Down