From a93205199bba04ce9592381a52304d77aa82bb55 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Mon, 29 Nov 2021 21:15:44 +0100 Subject: [PATCH] AudioServer: Port to LibMain :^) --- Userland/Services/AudioServer/CMakeLists.txt | 2 +- Userland/Services/AudioServer/main.cpp | 37 +++++++------------- 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/Userland/Services/AudioServer/CMakeLists.txt b/Userland/Services/AudioServer/CMakeLists.txt index a1a0d8803b..e589ea2815 100644 --- a/Userland/Services/AudioServer/CMakeLists.txt +++ b/Userland/Services/AudioServer/CMakeLists.txt @@ -16,4 +16,4 @@ set(SOURCES ) serenity_bin(AudioServer) -target_link_libraries(AudioServer LibCore LibThreading LibIPC) +target_link_libraries(AudioServer LibCore LibThreading LibIPC LibMain) diff --git a/Userland/Services/AudioServer/main.cpp b/Userland/Services/AudioServer/main.cpp index 510c4f5f93..e3a89fb5ce 100644 --- a/Userland/Services/AudioServer/main.cpp +++ b/Userland/Services/AudioServer/main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2018-2021, Andreas Kling * Copyright (c) 2021, kleines Filmröllchen * * SPDX-License-Identifier: BSD-2-Clause @@ -7,31 +7,22 @@ #include "Mixer.h" #include -#include #include +#include +#include -int main(int, char**) +ErrorOr serenity_main(Main::Arguments) { - if (pledge("stdio recvfd thread accept cpath rpath wpath unix", nullptr) < 0) { - perror("pledge"); - return 1; - } + TRY(Core::System::pledge("stdio recvfd thread accept cpath rpath wpath unix")); auto config = Core::ConfigFile::open_for_app("Audio", Core::ConfigFile::AllowWriting::Yes); - if (unveil(config->filename().characters(), "rwc") < 0) { - perror("unveil"); - return 1; - } - if (unveil("/dev/audio", "wc") < 0) { - perror("unveil"); - return 1; - } - unveil(nullptr, nullptr); + TRY(Core::System::unveil(config->filename(), "rwc")); + TRY(Core::System::unveil("/dev/audio", "wc")); + TRY(Core::System::unveil(nullptr, nullptr)); Core::EventLoop event_loop; - auto mixer = AudioServer::Mixer::construct(config); - - auto server = Core::LocalServer::construct(); + auto mixer = TRY(AudioServer::Mixer::try_create(config)); + auto server = TRY(Core::LocalServer::try_create()); bool ok = server->take_over_from_system_server(); VERIFY(ok); @@ -41,12 +32,8 @@ int main(int, char**) IPC::new_client_connection(move(client_socket), client_id, *mixer); }; - if (pledge("stdio recvfd thread accept cpath rpath wpath", nullptr) < 0) { - perror("pledge"); - return 1; - } - - unveil(nullptr, nullptr); + TRY(Core::System::pledge("stdio recvfd thread accept cpath rpath wpath")); + TRY(Core::System::unveil(nullptr, nullptr)); return event_loop.exec(); }