mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 13:27:35 +00:00
Userland: Rename IPC ClientConnection => ConnectionFromClient
This was done with CLion's automatic rename feature and with: find . -name ClientConnection.h | rename 's/ClientConnection\.h/ConnectionFromClient.h/' find . -name ClientConnection.cpp | rename 's/ClientConnection\.cpp/ConnectionFromClient.cpp/'
This commit is contained in:
parent
efac862570
commit
3a71748e5d
137 changed files with 896 additions and 896 deletions
|
@ -1,6 +1,6 @@
|
|||
set(SOURCES
|
||||
Buffer.cpp
|
||||
ClientConnection.cpp
|
||||
ConnectionFromClient.cpp
|
||||
Loader.cpp
|
||||
WavLoader.cpp
|
||||
FlacLoader.cpp
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
#include <LibAudio/Buffer.h>
|
||||
#include <LibAudio/ClientConnection.h>
|
||||
#include <LibAudio/ConnectionFromClient.h>
|
||||
#include <time.h>
|
||||
|
||||
namespace Audio {
|
||||
|
@ -14,12 +14,12 @@ namespace Audio {
|
|||
// Real-time audio may be improved with a lower value.
|
||||
static timespec g_enqueue_wait_time { 0, 10'000'000 };
|
||||
|
||||
ClientConnection::ClientConnection(NonnullOwnPtr<Core::Stream::LocalSocket> socket)
|
||||
ConnectionFromClient::ConnectionFromClient(NonnullOwnPtr<Core::Stream::LocalSocket> socket)
|
||||
: IPC::ServerConnection<AudioClientEndpoint, AudioServerEndpoint>(*this, move(socket))
|
||||
{
|
||||
}
|
||||
|
||||
void ClientConnection::enqueue(Buffer const& buffer)
|
||||
void ConnectionFromClient::enqueue(Buffer const& buffer)
|
||||
{
|
||||
for (;;) {
|
||||
auto success = enqueue_buffer(buffer.anonymous_buffer(), buffer.id(), buffer.sample_count());
|
||||
|
@ -29,35 +29,35 @@ void ClientConnection::enqueue(Buffer const& buffer)
|
|||
}
|
||||
}
|
||||
|
||||
void ClientConnection::async_enqueue(Buffer const& buffer)
|
||||
void ConnectionFromClient::async_enqueue(Buffer const& buffer)
|
||||
{
|
||||
async_enqueue_buffer(buffer.anonymous_buffer(), buffer.id(), buffer.sample_count());
|
||||
}
|
||||
|
||||
bool ClientConnection::try_enqueue(Buffer const& buffer)
|
||||
bool ConnectionFromClient::try_enqueue(Buffer const& buffer)
|
||||
{
|
||||
return enqueue_buffer(buffer.anonymous_buffer(), buffer.id(), buffer.sample_count());
|
||||
}
|
||||
|
||||
void ClientConnection::finished_playing_buffer(i32 buffer_id)
|
||||
void ConnectionFromClient::finished_playing_buffer(i32 buffer_id)
|
||||
{
|
||||
if (on_finish_playing_buffer)
|
||||
on_finish_playing_buffer(buffer_id);
|
||||
}
|
||||
|
||||
void ClientConnection::main_mix_muted_state_changed(bool muted)
|
||||
void ConnectionFromClient::main_mix_muted_state_changed(bool muted)
|
||||
{
|
||||
if (on_main_mix_muted_state_change)
|
||||
on_main_mix_muted_state_change(muted);
|
||||
}
|
||||
|
||||
void ClientConnection::main_mix_volume_changed(double volume)
|
||||
void ConnectionFromClient::main_mix_volume_changed(double volume)
|
||||
{
|
||||
if (on_main_mix_volume_change)
|
||||
on_main_mix_volume_change(volume);
|
||||
}
|
||||
|
||||
void ClientConnection::client_volume_changed(double volume)
|
||||
void ConnectionFromClient::client_volume_changed(double volume)
|
||||
{
|
||||
if (on_client_volume_change)
|
||||
on_client_volume_change(volume);
|
|
@ -14,10 +14,10 @@ namespace Audio {
|
|||
|
||||
class Buffer;
|
||||
|
||||
class ClientConnection final
|
||||
class ConnectionFromClient final
|
||||
: public IPC::ServerConnection<AudioClientEndpoint, AudioServerEndpoint>
|
||||
, public AudioClientEndpoint {
|
||||
IPC_CLIENT_CONNECTION(ClientConnection, "/tmp/portal/audio")
|
||||
IPC_CLIENT_CONNECTION(ConnectionFromClient, "/tmp/portal/audio")
|
||||
public:
|
||||
void enqueue(Buffer const&);
|
||||
bool try_enqueue(Buffer const&);
|
||||
|
@ -29,7 +29,7 @@ public:
|
|||
Function<void(double volume)> on_client_volume_change;
|
||||
|
||||
private:
|
||||
ClientConnection(NonnullOwnPtr<Core::Stream::LocalSocket>);
|
||||
ConnectionFromClient(NonnullOwnPtr<Core::Stream::LocalSocket>);
|
||||
|
||||
virtual void finished_playing_buffer(i32) override;
|
||||
virtual void main_mix_muted_state_changed(bool) override;
|
|
@ -17,14 +17,14 @@ NonnullRefPtr<T> new_client_connection(Args&&... args)
|
|||
}
|
||||
|
||||
template<typename ClientEndpoint, typename ServerEndpoint>
|
||||
class ClientConnection : public Connection<ServerEndpoint, ClientEndpoint>
|
||||
class ConnectionFromClient : public Connection<ServerEndpoint, ClientEndpoint>
|
||||
, public ServerEndpoint::Stub
|
||||
, public ClientEndpoint::template Proxy<ServerEndpoint> {
|
||||
public:
|
||||
using ServerStub = typename ServerEndpoint::Stub;
|
||||
using IPCProxy = typename ClientEndpoint::template Proxy<ServerEndpoint>;
|
||||
|
||||
ClientConnection(ServerStub& stub, NonnullOwnPtr<Core::Stream::LocalSocket> socket, int client_id)
|
||||
ConnectionFromClient(ServerStub& stub, NonnullOwnPtr<Core::Stream::LocalSocket> socket, int client_id)
|
||||
: IPC::Connection<ServerEndpoint, ClientEndpoint>(stub, move(socket))
|
||||
, ClientEndpoint::template Proxy<ServerEndpoint>(*this, {})
|
||||
, m_client_id(client_id)
|
||||
|
@ -36,7 +36,7 @@ public:
|
|||
};
|
||||
}
|
||||
|
||||
virtual ~ClientConnection() override
|
||||
virtual ~ConnectionFromClient() override
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -69,5 +69,5 @@ private:
|
|||
}
|
||||
|
||||
template<typename ClientEndpoint, typename ServerEndpoint>
|
||||
struct AK::Formatter<IPC::ClientConnection<ClientEndpoint, ServerEndpoint>> : Formatter<Core::Object> {
|
||||
struct AK::Formatter<IPC::ConnectionFromClient<ClientEndpoint, ServerEndpoint>> : Formatter<Core::Object> {
|
||||
};
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
#include <AK/Error.h>
|
||||
#include <LibCore/LocalServer.h>
|
||||
#include <LibIPC/ClientConnection.h>
|
||||
#include <LibIPC/ConnectionFromClient.h>
|
||||
|
||||
namespace IPC {
|
||||
|
||||
template<typename ClientConnectionType>
|
||||
template<typename ConnectionFromClientType>
|
||||
class MultiServer {
|
||||
public:
|
||||
static ErrorOr<NonnullOwnPtr<MultiServer>> try_create(Optional<String> socket_path = {})
|
||||
|
@ -28,7 +28,7 @@ private:
|
|||
{
|
||||
m_server->on_accept = [&](auto client_socket) {
|
||||
auto client_id = ++m_next_client_id;
|
||||
(void)IPC::new_client_connection<ClientConnectionType>(move(client_socket), client_id);
|
||||
(void)IPC::new_client_connection<ConnectionFromClientType>(move(client_socket), client_id);
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -8,15 +8,15 @@
|
|||
|
||||
#include <LibCore/System.h>
|
||||
#include <LibCore/SystemServerTakeover.h>
|
||||
#include <LibIPC/ClientConnection.h>
|
||||
#include <LibIPC/ConnectionFromClient.h>
|
||||
|
||||
namespace IPC {
|
||||
|
||||
template<typename ClientConnectionType>
|
||||
ErrorOr<NonnullRefPtr<ClientConnectionType>> take_over_accepted_client_from_system_server()
|
||||
template<typename ConnectionFromClientType>
|
||||
ErrorOr<NonnullRefPtr<ConnectionFromClientType>> take_over_accepted_client_from_system_server()
|
||||
{
|
||||
auto socket = TRY(Core::take_over_socket_from_system_server());
|
||||
return IPC::new_client_connection<ClientConnectionType>(move(socket));
|
||||
return IPC::new_client_connection<ConnectionFromClientType>(move(socket));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue