X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=122617a9f4209b38d1448dd73e51841aedeb72ac;hp=c28a25a39bf7da44bfb20d330765912d8912ba6b;hb=741c19c2a25c5d9e165cb99f7ff512209b7bade6;hpb=abfb661f35e99e99c09a94d84839356d905af080

diff --git a/error.h b/error.h
index c28a25a3..122617a9 100644
--- a/error.h
+++ b/error.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2014 Andre Noll <maan@tuebingen.mpg.de>
+ * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -98,6 +98,8 @@ extern const char **para_errlist[];
 	PARA_ERROR(FLAC_SKIP_META, "could not skip metadata"), \
 	PARA_ERROR(FLAC_DECODE_POS, "could not get decode position"), \
 	PARA_ERROR(FLAC_STREAMINFO, "could not read stream info meta block"), \
+	PARA_ERROR(FLAC_REPLACE_COMMENT, "could not replace vorbis comment"), \
+	PARA_ERROR(FLAC_WRITE_CHAIN, "failed to write metadata chain"), \
 
 
 #define AFH_RECV_ERRORS \
@@ -105,9 +107,11 @@ extern const char **para_errlist[];
 
 
 #define OGG_AFH_COMMON_ERRORS \
-	PARA_ERROR(STREAM_PACKETOUT, "ogg stream packet-out error (first packet)"), \
+	PARA_ERROR(STREAM_PACKETOUT, "ogg stream packet-out error"), \
+	PARA_ERROR(STREAM_PACKETIN, "ogg stream packet-in error"), \
 	PARA_ERROR(SYNC_PAGEOUT, "ogg sync page-out error (no ogg file?)"), \
-	PARA_ERROR(STREAM_PAGEIN, "ogg stream page-in error (first page)"), \
+	PARA_ERROR(STREAM_PAGEIN, "ogg stream page-in error"), \
+	PARA_ERROR(STREAM_PAGEOUT, "ogg stream page-out error"), \
 	PARA_ERROR(OGG_SYNC, "internal ogg storage overflow"), \
 	PARA_ERROR(OGG_EMPTY, "no ogg pages found"), \
 
@@ -161,7 +165,6 @@ extern const char **para_errlist[];
 
 
 #define PREBUFFER_FILTER_ERRORS \
-	PARA_ERROR(PREBUFFER_SYNTAX, "syntax error in prebuffer filter config"), \
 	PARA_ERROR(PREBUFFER_SUCCESS, "prebuffering complete"), \
 
 
@@ -210,7 +213,6 @@ extern const char **para_errlist[];
 
 
 #define AMP_FILTER_ERRORS \
-	PARA_ERROR(AMP_SYNTAX, "syntax error in amp filter config"), \
 	PARA_ERROR(AMP_ZERO_AMP, "no amplification necessary"), \
 	PARA_ERROR(AMP_EOF, "amp: end of file"), \
 
@@ -259,7 +261,6 @@ extern const char **para_errlist[];
 
 #define BLOB_ERRORS \
 	PARA_ERROR(BLOB_SYNTAX, "blob syntax error"), \
-	PARA_ERROR(INPUT_TOO_LARGE, "input too large for stdin command"), \
 
 
 #define PLAYLIST_ERRORS \
@@ -301,7 +302,6 @@ extern const char **para_errlist[];
 	PARA_ERROR(CLIENT_SYNTAX, "syntax error"), \
 	PARA_ERROR(NO_CONFIG, "config file not found"), \
 	PARA_ERROR(BAD_CONFIG, "syntax error in config file"), \
-	PARA_ERROR(CLIENT_AUTH, "authentication failed"), \
 	PARA_ERROR(SERVER_EOF, "connection closed by para_server"), \
 	PARA_ERROR(SERVER_CMD_SUCCESS, "command terminated successfully"), \
 	PARA_ERROR(SERVER_CMD_FAILURE, "command failed"), \
@@ -408,13 +408,17 @@ extern const char **para_errlist[];
 	PARA_ERROR(MP3_INFO, "could not read mp3 info"), \
 	PARA_ERROR(HEADER_FREQ, "invalid header frequency"), \
 	PARA_ERROR(HEADER_BITRATE, "invalid header bitrate"), \
-
+	PARA_ERROR(ID3_DETACH, "could not detach id3 frame"), \
+	PARA_ERROR(ID3_ATTACH, "could not atttach id3 frame"), \
+	PARA_ERROR(ID3_SETENCODING, "could not set id3 text encoding field"), \
+	PARA_ERROR(ID3_SETSTRING, "could not set id3 string field"), \
 
 #define AAC_AFH_ERRORS \
 	PARA_ERROR(STSZ, "did not find stcz atom"), \
 	PARA_ERROR(MP4ASC, "audio spec config error"), \
 	PARA_ERROR(AAC_AFH_INIT, "failed to init aac decoder"), \
-
+	PARA_ERROR(MP4V2, "mp4v2 library error"), \
+	PARA_ERROR(NO_AUDIO_TRACK, "file contains no valid audio track"), \
 
 #define AAC_COMMON_ERRORS \
 	PARA_ERROR(ESDS, "did not find esds atom"), \
@@ -423,6 +427,7 @@ extern const char **para_errlist[];
 
 #define OGG_AFH_ERRORS \
 	PARA_ERROR(VORBIS, "vorbis synthesis header-in error (not vorbis?)"), \
+	PARA_ERROR(VORBIS_COMMENTHEADER, "could not create vorbis comment header"), \
 	PARA_ERROR(OGG_PACKET_IN, "ogg_stream_packetin() failed"), \
 	PARA_ERROR(OGG_STREAM_FLUSH, "ogg_stream_flush() failed"), \
 
@@ -500,7 +505,6 @@ extern const char **para_errlist[];
 	PARA_ERROR(AACDEC_INIT, "failed to init aac decoder"), \
 	PARA_ERROR(AAC_DECODE, "aac decode error"), \
 
-
 #define CHUNK_QUEUE_ERRORS \
 	PARA_ERROR(QUEUE, "packet queue overrun"), \
 
@@ -583,7 +587,7 @@ extern const char **para_errlist[];
  * \return True if \a num is paraslash's representation of the system
  * error identified by \a _errno.
  */
-_static_inline_ int is_errno(int num, int _errno)
+_static_inline_ bool is_errno(int num, int _errno)
 {
 	assert(num > 0 && _errno > 0);
 	return ERRNO_TO_PARA_ERROR(_errno) == num;
@@ -628,9 +632,9 @@ _static_inline_ int osl(int ret)
 
 /**
  * Define the error list for one subsystem.
- #
- * The first entry (index 0) is always the name of the subsystem
- * Used by macros in config.h (generated by configure).
+ *
+ * The first entry (index 0) is always the name of the subsystem. Used by
+ * macros in config.h (generated by configure).
  */
 #define DEFINE_ERRLIST(ss) const char * ss ## _ERRLIST[] = {#ss, ss ## _ERRORS}