ClientInternal: move class Client to Client.hxx
Publish the Client API, preparing to move more code into the Client class.
This commit is contained in:
Max Kellermann
parent
ff626ac763
commit
32645b80c4
@ -20,15 +20,103 @@
|
||||
#ifndef MPD_CLIENT_H
|
||||
#define MPD_CLIENT_H
|
||||
|
||||
#include "check.h"
|
||||
#include "ClientMessage.hxx"
|
||||
#include "CommandListBuilder.hxx"
|
||||
#include "event/FullyBufferedSocket.hxx"
|
||||
#include "event/TimeoutMonitor.hxx"
|
||||
#include "Compiler.h"
|
||||
|
||||
#include <set>
|
||||
#include <string>
|
||||
#include <list>
|
||||
|
||||
#include <stddef.h>
|
||||
#include <stdarg.h>
|
||||
|
||||
struct sockaddr;
|
||||
class EventLoop;
|
||||
struct Partition;
|
||||
class Client;
|
||||
|
||||
class Client final : private FullyBufferedSocket, TimeoutMonitor {
|
||||
public:
|
||||
Partition &partition;
|
||||
struct playlist &playlist;
|
||||
struct player_control &player_control;
|
||||
|
||||
unsigned permission;
|
||||
|
||||
/** the uid of the client process, or -1 if unknown */
|
||||
int uid;
|
||||
|
||||
CommandListBuilder cmd_list;
|
||||
|
||||
unsigned int num; /* client number */
|
||||
|
||||
/** is this client waiting for an "idle" response? */
|
||||
bool idle_waiting;
|
||||
|
||||
/** idle flags pending on this client, to be sent as soon as
|
||||
the client enters "idle" */
|
||||
unsigned idle_flags;
|
||||
|
||||
/** idle flags that the client wants to receive */
|
||||
unsigned idle_subscriptions;
|
||||
|
||||
/**
|
||||
* A list of channel names this client is subscribed to.
|
||||
*/
|
||||
std::set<std::string> subscriptions;
|
||||
|
||||
/**
|
||||
* The number of subscriptions in #subscriptions. Used to
|
||||
* limit the number of subscriptions.
|
||||
*/
|
||||
unsigned num_subscriptions;
|
||||
|
||||
/**
|
||||
* A list of messages this client has received.
|
||||
*/
|
||||
std::list<ClientMessage> messages;
|
||||
|
||||
Client(EventLoop &loop, Partition &partition,
|
||||
int fd, int uid, int num);
|
||||
|
||||
bool IsConnected() const {
|
||||
return FullyBufferedSocket::IsDefined();
|
||||
}
|
||||
|
||||
gcc_pure
|
||||
bool IsSubscribed(const char *channel_name) const {
|
||||
return subscriptions.find(channel_name) != subscriptions.end();
|
||||
}
|
||||
|
||||
gcc_pure
|
||||
bool IsExpired() const {
|
||||
return !FullyBufferedSocket::IsDefined();
|
||||
}
|
||||
|
||||
void Close();
|
||||
void SetExpired();
|
||||
|
||||
using FullyBufferedSocket::Write;
|
||||
|
||||
/**
|
||||
* Send "idle" response to this client.
|
||||
*/
|
||||
void IdleNotify();
|
||||
void IdleAdd(unsigned flags);
|
||||
bool IdleWait(unsigned flags);
|
||||
|
||||
private:
|
||||
/* virtual methods from class BufferedSocket */
|
||||
virtual InputResult OnSocketInput(void *data, size_t length) override;
|
||||
virtual void OnSocketError(Error &&error) override;
|
||||
virtual void OnSocketClosed() override;
|
||||
|
||||
/* virtual methods from class TimeoutMonitor */
|
||||
virtual void OnTimeout() override;
|
||||
};
|
||||
|
||||
void client_manager_init(void);
|
||||
|
||||
|
||||
@ -22,103 +22,13 @@
|
||||
|
||||
#include "check.h"
|
||||
#include "Client.hxx"
|
||||
#include "ClientMessage.hxx"
|
||||
#include "CommandListBuilder.hxx"
|
||||
#include "event/FullyBufferedSocket.hxx"
|
||||
#include "event/TimeoutMonitor.hxx"
|
||||
#include "command.h"
|
||||
|
||||
#include <set>
|
||||
#include <string>
|
||||
#include <list>
|
||||
|
||||
enum {
|
||||
CLIENT_MAX_SUBSCRIPTIONS = 16,
|
||||
CLIENT_MAX_MESSAGES = 64,
|
||||
};
|
||||
|
||||
struct Partition;
|
||||
|
||||
class Client final : private FullyBufferedSocket, TimeoutMonitor {
|
||||
public:
|
||||
Partition &partition;
|
||||
struct playlist &playlist;
|
||||
struct player_control &player_control;
|
||||
|
||||
unsigned permission;
|
||||
|
||||
/** the uid of the client process, or -1 if unknown */
|
||||
int uid;
|
||||
|
||||
CommandListBuilder cmd_list;
|
||||
|
||||
unsigned int num; /* client number */
|
||||
|
||||
/** is this client waiting for an "idle" response? */
|
||||
bool idle_waiting;
|
||||
|
||||
/** idle flags pending on this client, to be sent as soon as
|
||||
the client enters "idle" */
|
||||
unsigned idle_flags;
|
||||
|
||||
/** idle flags that the client wants to receive */
|
||||
unsigned idle_subscriptions;
|
||||
|
||||
/**
|
||||
* A list of channel names this client is subscribed to.
|
||||
*/
|
||||
std::set<std::string> subscriptions;
|
||||
|
||||
/**
|
||||
* The number of subscriptions in #subscriptions. Used to
|
||||
* limit the number of subscriptions.
|
||||
*/
|
||||
unsigned num_subscriptions;
|
||||
|
||||
/**
|
||||
* A list of messages this client has received.
|
||||
*/
|
||||
std::list<ClientMessage> messages;
|
||||
|
||||
Client(EventLoop &loop, Partition &partition,
|
||||
int fd, int uid, int num);
|
||||
|
||||
bool IsConnected() const {
|
||||
return FullyBufferedSocket::IsDefined();
|
||||
}
|
||||
|
||||
gcc_pure
|
||||
bool IsSubscribed(const char *channel_name) const {
|
||||
return subscriptions.find(channel_name) != subscriptions.end();
|
||||
}
|
||||
|
||||
gcc_pure
|
||||
bool IsExpired() const {
|
||||
return !FullyBufferedSocket::IsDefined();
|
||||
}
|
||||
|
||||
void Close();
|
||||
void SetExpired();
|
||||
|
||||
using FullyBufferedSocket::Write;
|
||||
|
||||
/**
|
||||
* Send "idle" response to this client.
|
||||
*/
|
||||
void IdleNotify();
|
||||
void IdleAdd(unsigned flags);
|
||||
bool IdleWait(unsigned flags);
|
||||
|
||||
private:
|
||||
/* virtual methods from class BufferedSocket */
|
||||
virtual InputResult OnSocketInput(void *data, size_t length) override;
|
||||
virtual void OnSocketError(Error &&error) override;
|
||||
virtual void OnSocketClosed() override;
|
||||
|
||||
/* virtual methods from class TimeoutMonitor */
|
||||
virtual void OnTimeout() override;
|
||||
};
|
||||
|
||||
extern const class Domain client_domain;
|
||||
|
||||
extern int client_timeout;
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
#include "DatabasePrint.hxx"
|
||||
#include "DatabaseSelection.hxx"
|
||||
#include "CommandError.hxx"
|
||||
#include "ClientInternal.hxx"
|
||||
#include "Client.hxx"
|
||||
#include "tag/Tag.hxx"
|
||||
#include "util/UriUtil.hxx"
|
||||
#include "util/Error.hxx"
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
#include "config.h"
|
||||
#include "MessageCommands.hxx"
|
||||
#include "ClientSubscribe.hxx"
|
||||
#include "ClientInternal.hxx"
|
||||
#include "Client.hxx"
|
||||
#include "ClientList.hxx"
|
||||
#include "Instance.hxx"
|
||||
#include "Main.hxx"
|
||||
|
||||
@ -40,7 +40,7 @@
|
||||
#include "Permission.hxx"
|
||||
#include "PlaylistFile.hxx"
|
||||
#include "ClientFile.hxx"
|
||||
#include "ClientInternal.hxx"
|
||||
#include "Client.hxx"
|
||||
#include "Idle.hxx"
|
||||
|
||||
#ifdef ENABLE_SQLITE
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
#include "Playlist.hxx"
|
||||
#include "PlaylistPrint.hxx"
|
||||
#include "UpdateGlue.hxx"
|
||||
#include "ClientInternal.hxx"
|
||||
#include "Client.hxx"
|
||||
#include "Volume.hxx"
|
||||
#include "OutputAll.hxx"
|
||||
#include "Partition.hxx"
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
#include "PlaylistVector.hxx"
|
||||
#include "PlaylistQueue.hxx"
|
||||
#include "TimePrint.hxx"
|
||||
#include "ClientInternal.hxx"
|
||||
#include "Client.hxx"
|
||||
#include "protocol/ArgParser.hxx"
|
||||
#include "protocol/Result.hxx"
|
||||
#include "ls.hxx"
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
#include "Playlist.hxx"
|
||||
#include "PlaylistPrint.hxx"
|
||||
#include "ClientFile.hxx"
|
||||
#include "ClientInternal.hxx"
|
||||
#include "Client.hxx"
|
||||
#include "Partition.hxx"
|
||||
#include "protocol/ArgParser.hxx"
|
||||
#include "protocol/Result.hxx"
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
#include "config.h"
|
||||
#include "Stats.hxx"
|
||||
#include "PlayerControl.hxx"
|
||||
#include "ClientInternal.hxx"
|
||||
#include "Client.hxx"
|
||||
#include "DatabaseSelection.hxx"
|
||||
#include "DatabaseGlue.hxx"
|
||||
#include "DatabasePlugin.hxx"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user