From fdf0d46e3d0e14fe0ad0ff112b738f4b5cdf04a4 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Mon, 3 Nov 2008 21:49:40 +0100
Subject: player: converted PLAYER_ERROR_* to enum

---
 src/player_control.c |  5 ++++-
 src/player_control.h | 18 ++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/player_control.c b/src/player_control.c
index b35a8c5d..f65ba7c0 100644
--- a/src/player_control.c
+++ b/src/player_control.c
@@ -135,7 +135,7 @@ void clearPlayerError(void)
 	pc.error = 0;
 }
 
-int getPlayerError(void)
+enum player_error getPlayerError(void)
 {
 	return pc.error;
 }
@@ -149,6 +149,9 @@ char *getPlayerErrorStr(void)
 	*error = '\0'; /* likely */
 
 	switch (pc.error) {
+	case PLAYER_ERROR_NOERROR:
+		break;
+
 	case PLAYER_ERROR_FILENOTFOUND:
 		snprintf(error, errorlen,
 			 "file \"%s\" does not exist or is inaccessible",
diff --git a/src/player_control.h b/src/player_control.h
index b16946ce..2ae1fb61 100644
--- a/src/player_control.h
+++ b/src/player_control.h
@@ -50,12 +50,14 @@ enum player_command {
 	PLAYER_COMMAND_CANCEL,
 };
 
-#define PLAYER_ERROR_NOERROR		0
-#define PLAYER_ERROR_FILE		1
-#define PLAYER_ERROR_AUDIO		2
-#define PLAYER_ERROR_SYSTEM		3
-#define PLAYER_ERROR_UNKTYPE		4
-#define PLAYER_ERROR_FILENOTFOUND	5
+enum player_error {
+	PLAYER_ERROR_NOERROR = 0,
+	PLAYER_ERROR_FILE,
+	PLAYER_ERROR_AUDIO,
+	PLAYER_ERROR_SYSTEM,
+	PLAYER_ERROR_UNKTYPE,
+	PLAYER_ERROR_FILENOTFOUND,
+};
 
 struct player_control {
 	unsigned int buffered_before_play;
@@ -63,7 +65,7 @@ struct player_control {
 	struct notify notify;
 	volatile enum player_command command;
 	volatile enum player_state state;
-	volatile int8_t error;
+	volatile enum player_error error;
 	uint16_t bit_rate;
 	struct audio_format audio_format;
 	float total_time;
@@ -108,7 +110,7 @@ void clearPlayerError(void);
 
 char *getPlayerErrorStr(void);
 
-int getPlayerError(void);
+enum player_error getPlayerError(void);
 
 void playerWait(void);
 
-- 
cgit v1.2.3