diff options
| author | Max Kellermann <max@duempel.org> | 2013-10-20 13:10:54 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-10-20 13:10:54 +0200 |
| commit | cf4d80fc655a399615529bdd27e0be284754c5ab (patch) | |
| tree | 531f5c7af53ce4abdfd9013cbbc9e8056c934e5a /src/command | |
| parent | 8118bc93a85a903ddf95825c1ce7ecbbfff4780b (diff) | |
| download | mpd-cf4d80fc655a399615529bdd27e0be284754c5ab.tar.gz mpd-cf4d80fc655a399615529bdd27e0be284754c5ab.tar.xz mpd-cf4d80fc655a399615529bdd27e0be284754c5ab.zip | |
command: convert command_return to to a strictly-typed enum
Diffstat (limited to '')
| -rw-r--r-- | src/CommandResult.hxx (renamed from src/command.h) | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/src/command.h b/src/CommandResult.hxx index 9ea5bb52f..4132dacb7 100644 --- a/src/command.h +++ b/src/CommandResult.hxx @@ -17,37 +17,45 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef MPD_COMMAND_H -#define MPD_COMMAND_H +#ifndef MPD_COMMAND_RESULT_HXX +#define MPD_COMMAND_RESULT_HXX -enum command_return { +#ifdef WIN32 +#include <windows.h> +/* damn you, windows.h! */ +#ifdef ERROR +#undef ERROR +#endif +#endif + +enum class CommandResult { /** * The command has succeeded, but the "OK" response was not * yet sent to the client. */ - COMMAND_RETURN_OK, + OK, /** * The connection is now in "idle" mode, and no response shall * be generated. */ - COMMAND_RETURN_IDLE, + IDLE, /** * There was an error. The "ACK" response was sent to the * client. */ - COMMAND_RETURN_ERROR, + ERROR, /** * The connection to this client shall be closed. */ - COMMAND_RETURN_CLOSE, + CLOSE, /** * The MPD process shall be shut down. */ - COMMAND_RETURN_KILL, + KILL, }; #endif |