From: maan <maan@Gumbo.local>
Date: Sun, 11 Jun 2006 20:57:48 +0000 (+0200)
Subject: Merge branch 'master' into my-osx
X-Git-Tag: v0.2.14~63
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=e7a40750746aa95f665629e0453e962d55897e36

Merge branch 'master' into my-osx

Fix Conflicts:

	error.h
---

e7a40750746aa95f665629e0453e962d55897e36
diff --cc error.h
index 477baadf,7d10ff23..a64348e3
--- a/error.h
+++ b/error.h
@@@ -91,15 -91,15 +92,24 @@@ enum para_subsystem 
  extern const char **para_errlist[];
  /** \endcond */
  
 +#define OSX_WRITER_ERRORS \
 +	PARA_ERROR(STREAM_FORMAT, "could not set stream format"), \
 +	PARA_ERROR(ADD_CALLBACK, "can not add callback"), \
 +	PARA_ERROR(READ_STDIN, "failed to read from stdin"), \
 +	PARA_ERROR(OPEN_COMP, "OpenAComponent() error"), \
 +	PARA_ERROR(UNIT_INIT, "AudioUnitInitialize() error"), \
 +	PARA_ERROR(DEFAULT_COMP, "can not find default audio output component"), \
 +
 +
+ #define AUDIOC_ERRORS \
+ 	PARA_ERROR(AUDIOC_SYNTAX, "audioc syntax error"), \
+ 	PARA_ERROR(AUDIOC_READ, "audioc read error"), \
+ 	PARA_ERROR(AUDIOC_WRITE, "audioc write error"), \
+ 	PARA_ERROR(INIT_SOCK_ADDR, "can not init socket"), \
+ 	PARA_ERROR(AUDIOC_CONNECT, "audioc connect error"), \
+ 	PARA_ERROR(AUDIOC_OVERRUN, "audioc buffer overrun"), \
+ 
+ 
  #define CLIENT_ERRORS \
  	PARA_ERROR(CLIENT_SYNTAX, "syntax error"), \
  	PARA_ERROR(INVALID_CHALLENGE, "did not receive valid challenge"), \
@@@ -546,9 -546,9 +556,10 @@@ SS_ENUM(WRITE)
  SS_ENUM(WRITE_COMMON);
  SS_ENUM(ALSA_WRITER);
  SS_ENUM(FILE_WRITER);
 +SS_ENUM(OSX_WRITER);
  SS_ENUM(RINGBUFFER);
  SS_ENUM(CLIENT);
+ SS_ENUM(AUDIOC);
  /** \endcond */
  #undef PARA_ERROR
  /* rest of the world only sees the error text */