aboutsummaryrefslogtreecommitdiffstats
path: root/src/client/Client.hxx
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/client/Client.hxx17
1 files changed, 6 insertions, 11 deletions
diff --git a/src/client/Client.hxx b/src/client/Client.hxx
index c0a940ded..38127b124 100644
--- a/src/client/Client.hxx
+++ b/src/client/Client.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright (C) 2003-2015 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
@@ -36,7 +36,7 @@
#include <stddef.h>
#include <stdarg.h>
-struct sockaddr;
+class SocketAddress;
class EventLoop;
class Path;
struct Partition;
@@ -51,12 +51,6 @@ public:
struct playlist &playlist;
struct PlayerControl &player_control;
- struct Disposer {
- void operator()(Client *client) const {
- delete client;
- }
- };
-
unsigned permission;
/** the uid of the client process, or -1 if unknown */
@@ -112,7 +106,7 @@ public:
void Close();
void SetExpired();
- using FullyBufferedSocket::Write;
+ bool Write(const void *data, size_t length);
/**
* returns the uid of the client process, or a negative value
@@ -200,11 +194,12 @@ private:
virtual void OnTimeout() override;
};
-void client_manager_init(void);
+void
+client_manager_init();
void
client_new(EventLoop &loop, Partition &partition,
- int fd, const sockaddr *sa, size_t sa_length, int uid);
+ int fd, SocketAddress address, int uid);
/**
* Write a C string to the client.