From 7f0ce4e94e0b2366b1422a6864393eb37a64d546 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 10 Aug 2013 19:32:41 +0200 Subject: ack.h: move to protocol/ --- Makefile.am | 2 +- src/ClientFile.cxx | 2 +- src/ack.h | 53 ------------------------------------------------- src/protocol/Ack.hxx | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ src/protocol/Result.hxx | 2 +- 5 files changed, 56 insertions(+), 56 deletions(-) delete mode 100644 src/ack.h create mode 100644 src/protocol/Ack.hxx diff --git a/Makefile.am b/Makefile.am index a0aa115d5..a3e1b34f7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,7 +52,6 @@ src_mpd_LDADD = \ mpd_headers = \ src/check.h \ - src/ack.h \ src/command.h \ src/conf.h \ src/gerror.h \ @@ -94,6 +93,7 @@ src_mpd_SOURCES = \ src/CheckAudioFormat.cxx src/CheckAudioFormat.hxx \ src/AudioFormat.cxx src/AudioFormat.hxx \ src/AudioParser.cxx src/AudioParser.hxx \ + src/protocol/Ack.hxx \ src/protocol/ArgParser.cxx src/protocol/ArgParser.hxx \ src/protocol/Result.cxx src/protocol/Result.hxx \ src/CommandError.cxx src/CommandError.hxx \ diff --git a/src/ClientFile.cxx b/src/ClientFile.cxx index 07fa767b0..69bc465b4 100644 --- a/src/ClientFile.cxx +++ b/src/ClientFile.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "ClientFile.hxx" #include "Client.hxx" -#include "ack.h" +#include "protocol/Ack.hxx" #include "io_error.h" #include "fs/Path.hxx" #include "fs/FileSystem.hxx" diff --git a/src/ack.h b/src/ack.h deleted file mode 100644 index b76fae17d..000000000 --- a/src/ack.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2003-2011 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_ACK_H -#define MPD_ACK_H - -#include "gcc.h" - -#include - -enum ack { - ACK_ERROR_NOT_LIST = 1, - ACK_ERROR_ARG = 2, - ACK_ERROR_PASSWORD = 3, - ACK_ERROR_PERMISSION = 4, - ACK_ERROR_UNKNOWN = 5, - - ACK_ERROR_NO_EXIST = 50, - ACK_ERROR_PLAYLIST_MAX = 51, - ACK_ERROR_SYSTEM = 52, - ACK_ERROR_PLAYLIST_LOAD = 53, - ACK_ERROR_UPDATE_ALREADY = 54, - ACK_ERROR_PLAYER_SYNC = 55, - ACK_ERROR_EXIST = 56, -}; - -/** - * Quark for GError.domain; the code is an enum #ack. - */ -gcc_const -static inline GQuark -ack_quark(void) -{ - return g_quark_from_static_string("ack"); -} - -#endif diff --git a/src/protocol/Ack.hxx b/src/protocol/Ack.hxx new file mode 100644 index 000000000..b76fae17d --- /dev/null +++ b/src/protocol/Ack.hxx @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2003-2011 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_ACK_H +#define MPD_ACK_H + +#include "gcc.h" + +#include + +enum ack { + ACK_ERROR_NOT_LIST = 1, + ACK_ERROR_ARG = 2, + ACK_ERROR_PASSWORD = 3, + ACK_ERROR_PERMISSION = 4, + ACK_ERROR_UNKNOWN = 5, + + ACK_ERROR_NO_EXIST = 50, + ACK_ERROR_PLAYLIST_MAX = 51, + ACK_ERROR_SYSTEM = 52, + ACK_ERROR_PLAYLIST_LOAD = 53, + ACK_ERROR_UPDATE_ALREADY = 54, + ACK_ERROR_PLAYER_SYNC = 55, + ACK_ERROR_EXIST = 56, +}; + +/** + * Quark for GError.domain; the code is an enum #ack. + */ +gcc_const +static inline GQuark +ack_quark(void) +{ + return g_quark_from_static_string("ack"); +} + +#endif diff --git a/src/protocol/Result.hxx b/src/protocol/Result.hxx index 99d9a2fa0..6766da3d5 100644 --- a/src/protocol/Result.hxx +++ b/src/protocol/Result.hxx @@ -22,7 +22,7 @@ #include "check.h" #include "gcc.h" -#include "ack.h" +#include "Ack.hxx" class Client; -- cgit v1.2.3