Merge /fml/ag-raetsch/home/maan/scm/paraslash/ into my-osx

diff --combined error.h
index 89dbb0f69f1ffa984f740fa8b7a0e3b5d24d035b,706dea9e526f468a187be4a75f2bba50226db23e..3b31d82e529e7fb84955d4d2f2498a72812e709e
--- 1/error.h
--- 2/error.h
+++ b/error.h
@@@ -73,7 -73,6 +73,7 @@@ enum para_subsystem 
        SS_WRITE_COMMON,
        SS_ALSA_WRITER,
        SS_FILE_WRITER,
 +      SS_OSX_WRITER,
        NUM_SS
  };
  
@@@ -94,15 -93,6 +94,15 @@@
  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"), \
@@@ -358,6 -348,7 +358,7 @@@
        PARA_ERROR(BAD_USER, "you don't exist. Go away."), \
        PARA_ERROR(LOCK, "lock error"), \
        PARA_ERROR(SENDER_CMD, "command not supported by this sender"), \
+       PARA_ERROR(SERVER_CRASH, "para_server crashed -- can not live without it"), \
  
  
  #define PLAYLIST_SELECTOR_ERRORS \
@@@ -564,7 -555,6 +565,7 @@@ 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(CLIENT_COMMON);