Skip to content

Commit

Permalink
Update usages of IPC in line with framework changes
Browse files Browse the repository at this point in the history
  • Loading branch information
peppy committed Dec 3, 2024
1 parent be05f2a commit 75781e3
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion osu.Desktop/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public static void Main(string[] args)

var hostOptions = new HostOptions
{
IPCPort = !tournamentClient ? OsuGame.IPC_PORT : null,
IPCPipeName = !tournamentClient ? OsuGame.IPC_PIPE_NAME : null,
FriendlyGameName = OsuGameBase.GAME_NAME,
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public override void SetUpSteps()
});
AddStep("create IPC sender channels", () =>
{
ipcSenderHost = new HeadlessGameHost(gameHost.Name, new HostOptions { IPCPort = OsuGame.IPC_PORT });
ipcSenderHost = new HeadlessGameHost(gameHost.Name, new HostOptions { IPCPipeName = OsuGame.IPC_PIPE_NAME });
osuSchemeLinkIPCSender = new OsuSchemeLinkIPCChannel(ipcSenderHost);
archiveImportIPCSender = new ArchiveImportIPCChannel(ipcSenderHost);
});
Expand Down
4 changes: 2 additions & 2 deletions osu.Game/OsuGame.cs
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ public partial class OsuGame : OsuGameBase, IKeyBindingHandler<GlobalAction>, IL
{
#if DEBUG
// Different port allows running release and debug builds alongside each other.
public const int IPC_PORT = 44824;
public const string IPC_PIPE_NAME = "osu-lazer-debug";
#else
public const int IPC_PORT = 44823;
public const string IPC_PORT = "osu-lazer";
#endif

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion osu.Game/Tests/CleanRunHeadlessGameHost.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public CleanRunHeadlessGameHost(bool bindIPC = false, bool realtime = true, bool
[CallerMemberName] string callingMethodName = @"")
: base($"{callingMethodName}-{Guid.NewGuid()}", new HostOptions
{
IPCPort = bindIPC ? OsuGame.IPC_PORT : null,
IPCPipeName = bindIPC ? OsuGame.IPC_PIPE_NAME : null,

Check failure on line 30 in osu.Game/Tests/CleanRunHeadlessGameHost.cs

View workflow job for this annotation

GitHub Actions / Build only (iOS)

'HostOptions' does not contain a definition for 'IPCPipeName'

Check failure on line 30 in osu.Game/Tests/CleanRunHeadlessGameHost.cs

View workflow job for this annotation

GitHub Actions / Build only (iOS)

'HostOptions' does not contain a definition for 'IPCPipeName'

Check failure on line 30 in osu.Game/Tests/CleanRunHeadlessGameHost.cs

View workflow job for this annotation

GitHub Actions / Build only (Android)

'HostOptions' does not contain a definition for 'IPCPipeName'

Check failure on line 30 in osu.Game/Tests/CleanRunHeadlessGameHost.cs

View workflow job for this annotation

GitHub Actions / Build only (Android)

'HostOptions' does not contain a definition for 'IPCPipeName'

Check failure on line 30 in osu.Game/Tests/CleanRunHeadlessGameHost.cs

View workflow job for this annotation

GitHub Actions / Code Quality

'HostOptions' does not contain a definition for 'IPCPipeName'

Check failure on line 30 in osu.Game/Tests/CleanRunHeadlessGameHost.cs

View workflow job for this annotation

GitHub Actions / Code Quality

'HostOptions' does not contain a definition for 'IPCPipeName'

Check failure on line 30 in osu.Game/Tests/CleanRunHeadlessGameHost.cs

View workflow job for this annotation

GitHub Actions / Test (Windows, windows-latest, SingleThread)

'HostOptions' does not contain a definition for 'IPCPipeName'

Check failure on line 30 in osu.Game/Tests/CleanRunHeadlessGameHost.cs

View workflow job for this annotation

GitHub Actions / Test (Windows, windows-latest, SingleThread)

'HostOptions' does not contain a definition for 'IPCPipeName'

Check failure on line 30 in osu.Game/Tests/CleanRunHeadlessGameHost.cs

View workflow job for this annotation

GitHub Actions / Test (Windows, windows-latest, MultiThreaded)

'HostOptions' does not contain a definition for 'IPCPipeName'

Check failure on line 30 in osu.Game/Tests/CleanRunHeadlessGameHost.cs

View workflow job for this annotation

GitHub Actions / Test (Windows, windows-latest, MultiThreaded)

'HostOptions' does not contain a definition for 'IPCPipeName'

Check failure on line 30 in osu.Game/Tests/CleanRunHeadlessGameHost.cs

View workflow job for this annotation

GitHub Actions / Test (Linux, ubuntu-latest, SingleThread)

'HostOptions' does not contain a definition for 'IPCPipeName'

Check failure on line 30 in osu.Game/Tests/CleanRunHeadlessGameHost.cs

View workflow job for this annotation

GitHub Actions / Test (Linux, ubuntu-latest, SingleThread)

'HostOptions' does not contain a definition for 'IPCPipeName'

Check failure on line 30 in osu.Game/Tests/CleanRunHeadlessGameHost.cs

View workflow job for this annotation

GitHub Actions / Test (Linux, ubuntu-latest, MultiThreaded)

'HostOptions' does not contain a definition for 'IPCPipeName'

Check failure on line 30 in osu.Game/Tests/CleanRunHeadlessGameHost.cs

View workflow job for this annotation

GitHub Actions / Test (Linux, ubuntu-latest, MultiThreaded)

'HostOptions' does not contain a definition for 'IPCPipeName'
}, bypassCleanup: bypassCleanupOnDispose, realtime: realtime)
{
this.bypassCleanupOnSetup = bypassCleanupOnSetup;
Expand Down

0 comments on commit 75781e3

Please sign in to comment.