From 377a2b9e077d19501b89f4347afa78baa6c32f5f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 9 Jan 2013 08:08:36 +0100 Subject: ClientList: add header ClientList.hxx --- Makefile.am | 2 +- src/ClientExpire.cxx | 1 + src/ClientGlobal.cxx | 1 + src/ClientIdle.cxx | 1 + src/ClientInternal.hxx | 18 ------------------ src/ClientList.cxx | 1 + src/ClientList.hxx | 45 +++++++++++++++++++++++++++++++++++++++++++++ src/ClientNew.cxx | 1 + src/MessageCommands.cxx | 1 + 9 files changed, 52 insertions(+), 19 deletions(-) create mode 100644 src/ClientList.hxx diff --git a/Makefile.am b/Makefile.am index 5393f5273..e46b65884 100644 --- a/Makefile.am +++ b/Makefile.am @@ -232,7 +232,7 @@ src_mpd_SOURCES = \ src/ClientExpire.cxx \ src/ClientGlobal.cxx \ src/ClientIdle.cxx src/ClientIdle.hxx \ - src/ClientList.cxx \ + src/ClientList.cxx src/ClientList.hxx \ src/ClientNew.cxx \ src/ClientProcess.cxx \ src/ClientRead.cxx \ diff --git a/src/ClientExpire.cxx b/src/ClientExpire.cxx index e24770ea1..36d54cda3 100644 --- a/src/ClientExpire.cxx +++ b/src/ClientExpire.cxx @@ -19,6 +19,7 @@ #include "config.h" #include "ClientInternal.hxx" +#include "ClientList.hxx" static guint expire_source_id; diff --git a/src/ClientGlobal.cxx b/src/ClientGlobal.cxx index e6d438b8d..c3940f0a8 100644 --- a/src/ClientGlobal.cxx +++ b/src/ClientGlobal.cxx @@ -19,6 +19,7 @@ #include "config.h" #include "ClientInternal.hxx" +#include "ClientList.hxx" #include "conf.h" #include diff --git a/src/ClientIdle.cxx b/src/ClientIdle.cxx index c2fa5dde5..a787cc401 100644 --- a/src/ClientIdle.cxx +++ b/src/ClientIdle.cxx @@ -20,6 +20,7 @@ #include "config.h" #include "ClientIdle.hxx" #include "ClientInternal.hxx" +#include "ClientList.hxx" extern "C" { #include "idle.h" diff --git a/src/ClientInternal.hxx b/src/ClientInternal.hxx index 9d508fa11..7e88a6d08 100644 --- a/src/ClientInternal.hxx +++ b/src/ClientInternal.hxx @@ -118,24 +118,6 @@ extern int client_timeout; extern size_t client_max_command_list_size; extern size_t client_max_output_buffer_size; -bool -client_list_is_empty(void); - -bool -client_list_is_full(void); - -Client * -client_list_get_first(void); - -void -client_list_add(Client *client); - -void -client_list_foreach(GFunc func, gpointer user_data); - -void -client_list_remove(Client *client); - void client_close(Client *client); diff --git a/src/ClientList.cxx b/src/ClientList.cxx index e0fa533d9..ffefc7c05 100644 --- a/src/ClientList.cxx +++ b/src/ClientList.cxx @@ -18,6 +18,7 @@ */ #include "config.h" +#include "ClientList.hxx" #include "ClientInternal.hxx" #include diff --git a/src/ClientList.hxx b/src/ClientList.hxx new file mode 100644 index 000000000..93e0f5408 --- /dev/null +++ b/src/ClientList.hxx @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2003-2013 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPD_CLIENT_LIST_HXX +#define MPD_CLIENT_LIST_HXX + +#include + +class Client; + +bool +client_list_is_empty(void); + +bool +client_list_is_full(void); + +Client * +client_list_get_first(void); + +void +client_list_add(Client *client); + +void +client_list_foreach(GFunc func, gpointer user_data); + +void +client_list_remove(Client *client); + +#endif diff --git a/src/ClientNew.cxx b/src/ClientNew.cxx index 489af8c31..a95c77fde 100644 --- a/src/ClientNew.cxx +++ b/src/ClientNew.cxx @@ -19,6 +19,7 @@ #include "config.h" #include "ClientInternal.hxx" +#include "ClientList.hxx" #include "Partition.hxx" #include "fd_util.h" extern "C" { diff --git a/src/MessageCommands.cxx b/src/MessageCommands.cxx index c5f4d79b0..3a7c38755 100644 --- a/src/MessageCommands.cxx +++ b/src/MessageCommands.cxx @@ -21,6 +21,7 @@ #include "MessageCommands.hxx" #include "ClientSubscribe.hxx" #include "ClientInternal.hxx" +#include "ClientList.hxx" #include "protocol/Result.hxx" #include "protocol/ArgParser.hxx" -- cgit v1.2.3