From bd559389858370fdd696fa93f88ff999e95fff2d Mon Sep 17 00:00:00 2001
From: Sergey Bugaev <bugaevc@gmail.com>
Date: Tue, 26 Nov 2019 19:33:48 +0300
Subject: [PATCH] AudioServer: Port to socket takeover

---
 Base/etc/SystemServer.ini                | 1 +
 Libraries/LibAudio/AClientConnection.cpp | 2 +-
 Servers/AudioServer/ASEventLoop.cpp      | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Base/etc/SystemServer.ini b/Base/etc/SystemServer.ini
index 40381e257f..e8bc9ca2d0 100644
--- a/Base/etc/SystemServer.ini
+++ b/Base/etc/SystemServer.ini
@@ -21,6 +21,7 @@ KeepAlive=1
 User=anon
 
 [AudioServer]
+Socket=/tmp/portal/audio
 Priority=high
 KeepAlive=1
 User=anon
diff --git a/Libraries/LibAudio/AClientConnection.cpp b/Libraries/LibAudio/AClientConnection.cpp
index 4ca4e0d71c..42ffaece93 100644
--- a/Libraries/LibAudio/AClientConnection.cpp
+++ b/Libraries/LibAudio/AClientConnection.cpp
@@ -3,7 +3,7 @@
 #include <SharedBuffer.h>
 
 AClientConnection::AClientConnection()
-    : ConnectionNG(*this, "/tmp/asportal")
+    : ConnectionNG(*this, "/tmp/portal/audio")
 {
 }
 
diff --git a/Servers/AudioServer/ASEventLoop.cpp b/Servers/AudioServer/ASEventLoop.cpp
index 4df03e522d..3792bba505 100644
--- a/Servers/AudioServer/ASEventLoop.cpp
+++ b/Servers/AudioServer/ASEventLoop.cpp
@@ -7,8 +7,8 @@
 ASEventLoop::ASEventLoop()
     : m_server(CLocalServer::construct())
 {
-    unlink("/tmp/asportal");
-    m_server->listen("/tmp/asportal");
+    bool ok = m_server->take_over_from_system_server();
+    ASSERT(ok);
     m_server->on_ready_to_accept = [this] {
         auto client_socket = m_server->accept();
         if (!client_socket) {