From ab318aeea84f51fa0adcfb09a8a43abc67dae1cd Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 1 Feb 2016 21:32:01 +0100
Subject: audio/video: merge decoder return values

Will be helpful for the coming filter support. I planned on merging
audio/video decoding, but this will have to wait a bit longer, so only
remove the duplicate status codes.
---
 player/audio.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'player/audio.c')

diff --git a/player/audio.c b/player/audio.c
index b6a3134230..b2581aa2fc 100644
--- a/player/audio.c
+++ b/player/audio.c
@@ -577,16 +577,16 @@ static int decode_new_frame(struct ao_chain *ao_c)
     if (ao_c->input_frame)
         return AD_OK;
 
-    int res = AUDIO_SKIP;
-    while (res == AUDIO_SKIP) {
+    int res = DATA_AGAIN;
+    while (res == DATA_AGAIN) {
         audio_work(ao_c->audio_src);
         res = audio_get_frame(ao_c->audio_src, &ao_c->input_frame);
     }
 
     switch (res) {
-    case AUDIO_OK:      return AD_OK;
-    case AUDIO_WAIT:    return AD_WAIT;
-    case AUDIO_EOF:     return AD_EOF;
+    case DATA_OK:       return AD_OK;
+    case DATA_WAIT:     return AD_WAIT;
+    case DATA_EOF:      return AD_EOF;
     default:            abort();
     }
 }
-- 
cgit v1.2.3