From: Andre Noll <maan@systemlinux.org>
Date: Thu, 31 Mar 2011 09:27:49 +0000 (+0200)
Subject: KILL E_AO_WRITE.
X-Git-Tag: v0.4.7~11^2
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=99bb7973ee352af158ac90416017e154b6d341bd;p=paraslash.git

KILL E_AO_WRITE.

We have E_WRITE_COMMON_EOF, and use of this code is preferred because
para_write treats it as a non-fatal error and exits successfully if
the writer task removed its btr node due to E_WRITER_COMMON_EOF while
it exits non-zero in case of other errors.
---

diff --git a/ao_write.c b/ao_write.c
index 307588f9..bb60e191 100644
--- a/ao_write.c
+++ b/ao_write.c
@@ -210,7 +210,7 @@ __noreturn static void *aow_play(void *priv)
 				if (frames > 0)
 					break;
 				/* eof and less than a single frame available */
-				ret = -E_AO_EOF;
+				ret = -E_WRITE_COMMON_EOF;
 				goto unlock;
 			}
 			//PARA_CRIT_LOG("waiting for data\n");
diff --git a/error.h b/error.h
index 26e6fe00..b8b0074c 100644
--- a/error.h
+++ b/error.h
@@ -112,7 +112,6 @@ extern const char **para_errlist[];
 	PARA_ERROR(AO_APPEND_OPTION, "ao append option: memory allocation failure"), \
 	PARA_ERROR(AO_OPEN_LIVE, "ao: could not open audio device"), \
 	PARA_ERROR(AO_FILE_NOT_SUPP, "ao: file io drivers not supported"), \
-	PARA_ERROR(AO_EOF, "ao: end of file"), \
 	PARA_ERROR(AO_PLAY, "ao_play() failed"), \
 	PARA_ERROR(AO_BAD_SAMPLE_FORMAT, "ao: unsigned sample formats not supported"), \
 	PARA_ERROR(AO_PTHREAD, "pthread error"), \