alsa: Do not fail if sw params could not be installed.

[paraslash.git] / error.h

diff --git a/error.h b/error.h
index 28c7e86730f5b47450f083ab607472c61686b5e5..78d29792141224f9c4b11e58a0827d5a37694f03 100644 (file)
--- a/error.h
+++ b/error.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -29,6 +29,7 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define DCCP_SEND_ERRORS
 #define HTTP_SEND_ERRORS
 #define GGO_ERRORS
+#define COLOR_ERRORS
 
 
 extern const char **para_errlist[];
@@ -208,11 +209,10 @@ extern const char **para_errlist[];
 
 
 #define UDP_RECV_ERRORS \
-       PARA_ERROR(UDP_NO_MAGIC, "not enough magic"), \
        PARA_ERROR(UDP_SYNTAX, "udp_recv syntax error"), \
-       PARA_ERROR(UDP_SHORT_PACKET, "udp data packet too short"), \
-       PARA_ERROR(INVALID_HEADER, "invalid header packet"), \
-       PARA_ERROR(OVERRUN, "output buffer overrun"), \
+       PARA_ERROR(UDP_BAD_HEADER, "invalid udp audio header"), \
+       PARA_ERROR(UDP_OVERRUN, "output buffer overrun"), \
+       PARA_ERROR(UDP_BAD_STREAM_TYPE, "invalid stream type"), \
 
 
 #define HTTP_RECV_ERRORS \
@@ -359,8 +359,6 @@ extern const char **para_errlist[];
 
 #define FD_ERRORS \
        PARA_ERROR(FGETS, "fgets error"), \
-       PARA_ERROR(EMPTY, "file empty"), \
-       PARA_ERROR(MMAP, "mmap error"), \
 
 
 #define WRITE_ERRORS \
@@ -377,7 +375,6 @@ extern const char **para_errlist[];
        PARA_ERROR(SAMPLE_FORMAT, "sample format not available"), \
        PARA_ERROR(CHANNEL_COUNT, "channels count not available"), \
        PARA_ERROR(HW_PARAMS, "unable to install hw params"), \
-       PARA_ERROR(SW_PARAMS, "unable to install sw params"), \
        PARA_ERROR(BAD_PERIOD, "can not use period equal to buffer size"), \
        PARA_ERROR(ALSA_WRITE, "alsa write error"), \
        PARA_ERROR(PCM_OPEN, "unable to open pcm"), \