aboutsummaryrefslogtreecommitdiff
path: root/src/player_control.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2012-08-08 22:25:02 +0200
committerMax Kellermann <max@duempel.org>2012-08-08 22:29:09 +0200
commit0b9e91229791e143d5da79f14cf7012ead9c3bc7 (patch)
treec19c320ce05b2396baaa8235d419a1f1d3cbcc71 /src/player_control.c
parentd35d2b269f77a0c4ec5fac9ac2df6d107b5b2d6d (diff)
player_control: rename attribute "error" to "error_type"
Diffstat (limited to 'src/player_control.c')
-rw-r--r--src/player_control.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/player_control.c b/src/player_control.c
index f2e31fb3..32ceedbe 100644
--- a/src/player_control.c
+++ b/src/player_control.c
@@ -47,7 +47,7 @@ pc_new(unsigned buffer_chunks, unsigned int buffered_before_play)
pc->cond = g_cond_new();
pc->command = PLAYER_COMMAND_NONE;
- pc->error = PLAYER_ERROR_NONE;
+ pc->error_type = PLAYER_ERROR_NONE;
pc->state = PLAYER_STATE_STOP;
pc->cross_fade_seconds = 0;
pc->mixramp_db = 0;
@@ -80,7 +80,7 @@ void
pc_song_deleted(struct player_control *pc, const struct song *song)
{
if (pc->errored_song == song) {
- pc->error = PLAYER_ERROR_NONE;
+ pc->error_type = PLAYER_ERROR_NONE;
pc->errored_song = NULL;
}
}
@@ -232,7 +232,7 @@ void
pc_clear_error(struct player_control *pc)
{
player_lock(pc);
- pc->error = PLAYER_ERROR_NONE;
+ pc->error_type = PLAYER_ERROR_NONE;
pc->errored_song = NULL;
player_unlock(pc);
}
@@ -249,7 +249,7 @@ pc_get_error_message(struct player_control *pc)
char *error;
char *uri;
- switch (pc->error) {
+ switch (pc->error_type) {
case PLAYER_ERROR_NONE:
return NULL;