From 218e6d2f5e96be0f0a3003bd31a535e571635463 Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Sat, 23 Jul 2022 00:35:10 +0200 Subject: [PATCH] Ports/SDL2: Rename LibAudio connection to ConnectionToServer --- .../0001-Add-SerenityOS-platform-support.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Ports/SDL2/patches/0001-Add-SerenityOS-platform-support.patch b/Ports/SDL2/patches/0001-Add-SerenityOS-platform-support.patch index 721ee0af1b..278ba6eba5 100644 --- a/Ports/SDL2/patches/0001-Add-SerenityOS-platform-support.patch +++ b/Ports/SDL2/patches/0001-Add-SerenityOS-platform-support.patch @@ -226,7 +226,7 @@ index 8aa7298..c16af45 100644 diff --git a/src/audio/serenity/SDL_serenityaudio.cpp b/src/audio/serenity/SDL_serenityaudio.cpp new file mode 100644 -index 0000000..7f770ed +index 0000000..8a5abd5 --- /dev/null +++ b/src/audio/serenity/SDL_serenityaudio.cpp @@ -0,0 +1,160 @@ @@ -264,7 +264,7 @@ index 0000000..7f770ed +} + +# include -+# include ++# include +# include +# include +# include "SDL_serenityaudio.h" @@ -315,7 +315,7 @@ index 0000000..7f770ed + if (!h->event_loop) + h->event_loop = make(Core::EventLoop::MakeInspectable::No); + if (!h->client) -+ h->client = MUST(Audio::ConnectionFromClient::try_create()); ++ h->client = MUST(Audio::ConnectionToServer::try_create()); + + h->client->async_start_playback(); + @@ -392,7 +392,7 @@ index 0000000..7f770ed +#endif diff --git a/src/audio/serenity/SDL_serenityaudio.h b/src/audio/serenity/SDL_serenityaudio.h new file mode 100644 -index 0000000..e1b98b3 +index 0000000..8d152ca --- /dev/null +++ b/src/audio/serenity/SDL_serenityaudio.h @@ -0,0 +1,38 @@ @@ -423,13 +423,13 @@ index 0000000..e1b98b3 +#include "../SDL_sysaudio.h" +#include +#include -+#include ++#include +#include + +#define _THIS SDL_AudioDevice* that + +struct SDL_PrivateAudioData { -+ RefPtr client; ++ RefPtr client; + OwnPtr event_loop; + Uint8* mixbuf { nullptr }; + size_t mixlen { 0 }; @@ -596,7 +596,7 @@ index 0000000..89e9e91 +/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/video/serenity/SDL_serenitymessagebox.cpp b/src/video/serenity/SDL_serenitymessagebox.cpp new file mode 100644 -index 0000000..ac5e358 +index 0000000..fe41a8b --- /dev/null +++ b/src/video/serenity/SDL_serenitymessagebox.cpp @@ -0,0 +1,40 @@