From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sat, 8 Sep 2018 12:43:58 +0000 (+0200)
Subject: ao: Get rid of E_AO_BAD_SAMPLE_FORMAT.
X-Git-Tag: v0.6.3~66
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=6e2812e8cb09f4e5d9d12b9d768d134b36c3dd17;hp=bab99bab677988723afe14a7d680e6d5cc7ddda4

ao: Get rid of E_AO_BAD_SAMPLE_FORMAT.

This error code is pointless as the generic E_BAD_SAMPLE_FORMAT is
just fine here.
---

diff --git a/ao_write.c b/ao_write.c
index 92f62f8f..447dea84 100644
--- a/ao_write.c
+++ b/ao_write.c
@@ -87,7 +87,7 @@ static int aow_set_sample_format(unsigned sample_rate, unsigned channels,
 		case SF_U8:
 		case SF_U16_LE:
 		case SF_U16_BE:
-			return -E_AO_BAD_SAMPLE_FORMAT;
+			return -E_BAD_SAMPLE_FORMAT;
 		case SF_S8:
 			/* no need to set byte_format */
 			result->bits = 8;
diff --git a/error.h b/error.h
index 02f42246..c06d316d 100644
--- a/error.h
+++ b/error.h
@@ -24,7 +24,6 @@
 	PARA_ERROR(AO_APPEND_OPTION, "ao append option: memory allocation failure"), \
 	PARA_ERROR(AO_BAD_DRIVER, "ao: invalid driver"), \
 	PARA_ERROR(AO_BAD_OPTION, "ao option is not of type key:value"), \
-	PARA_ERROR(AO_BAD_SAMPLE_FORMAT, "ao: unsigned sample formats not supported"), \
 	PARA_ERROR(AO_DEFAULT_DRIVER, "ao: no usable output device"), \
 	PARA_ERROR(AO_EOF, "ao: end of file"), \
 	PARA_ERROR(AO_FILE_NOT_SUPP, "ao: file io drivers not supported"), \