Index: roard/roard.c
===================================================================
--- roard/roard.c	(revision 6052)
+++ roard/roard.c	(revision 0)
@@ -1,331 +1,35 @@
 //roard.c:
-
-/*
- *      Copyright (C) Philipp 'ph3-der-loewe' Schafft - 2008-2015
- *
- *  This file is part of roard a part of RoarAudio,
- *  a cross-platform sound system for both, home and professional use.
- *  See README for details.
- *
- *  This file is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 3
- *  as published by the Free Software Foundation.
- *
- *  RoarAudio is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this software; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301, USA.
- *
- */
-
-/* ckport options:
- * Stuff checked by configure:
- * ckport: ignore-symbol: getuid of target win32
- * ckport: ignore-symbol: setuid of target win32
- * ckport: ignore-symbol: getgid of target win32
- * ckport: ignore-symbol: setgid of target win32
- * ckport: ignore-symbol: setsid of target win32
- * ckport: ignore-symbol: kill of target win32
- * ckport: ignore-symbol: chroot of target win32
- * ckport: ignore-symbol: fork of target win32
- * ckport: ignore-symbol: getservbyname of target win32
- * ckport: ignore-symbol: nice of target win32
- *
- */
 
 #include "roard.h"
 
-enum metaaction {
- MA_ACTION,
- MA_LIST_PROTO,
- MA_LIST_PLUGIN
-};
-
-enum action {
- START,
- STOP,
- RESTART,
- RESTART_RETRY,
- SHUTDOWN
-};
-
-enum af_mode {
- AF_MODE_NONE,
- AF_MODE_LOAD,
- AF_MODE_GEN
-};
-
-// some stuff we only define extern globally.
-int g_verbose = ROAR_DBG_INFO_NONE;
-
-int alive;
-#ifdef ROAR_SUPPORT_LISTEN
-int g_no_listen;
-#endif
-
-uint32_t g_pos; // current position in output stream
-
-int g_standby;
-int g_autostandby;
-
-struct roard_listen g_listen[ROAR_MAX_LISTEN_SOCKETS];
-
-int g_self_client;
-
-int g_terminate;
-
-struct roar_audio_info * g_sa, * g_max_sa;
-
-struct roard_config * g_config;
-
-struct counters g_counters;
-// end of extern block.
-
-#ifdef ROAR_SUPPORT_LISTEN
-static const char * server[ROAR_MAX_LISTEN_SOCKETS];
-#endif
-
-#if defined(ROAR_HAVE_IO_POSIX) && defined(ROAR_HAVE_FS_POSIX)
-#define SUPPORT_PIDFILE
-static char * pidfile = NULL;
-#endif
-
-#if defined(ROAR_HAVE_SETGID) || defined(ROAR_HAVE_SETUID)
-static int    setids    = 0;
-#endif
-
-#ifdef ROAR_HAVE_LIBX11
-static char * x11display = NULL;
-#endif
-
-#ifdef ROAR_HAVE_MAIN_ARGS
 void usage (void) {
  printf("Usage: roard [OPTIONS]...\n\n");
 
- printf("Misc Options:\n\n");
- printf(
-#if defined(ROAR_HAVE_FORK) || defined(ROAR_TARGET_WIN32)
-        " --daemon              - Bring the server into background after init\n"
-#endif
-        " --verbose             - Be more verbose, can be used multiple times\n"
-        " --terminate           - Terminate after last client quited\n"
-        " --start               - No op parameter (starting roard is default operation)\n"
-        " --restart             - Trys to stop an old instance and start a new with new settings\n"
-        " --stop                - Stops a running roard (provide --pidfile!)\n"
-        " --shutdown            - Terminates a running roard (provide --pidfile!)\n"
-        " --realtime            - Trys to get realtime priority,\n"
-        "                         give multible times for being more realtime\n"
-        " --memlock LEVEL       - Set default memory locking level to LEVEL\n"
-        " --watchdog            - Enable watchdog\n"
-        " --watchdog-time TIME  - Set watchdog time to TIME (in ms)\n"
-#ifdef ROAR_HAVE_CHROOT
-        " --chroot DIR          - chroots to the given dir\n"
-#endif
-#ifdef ROAR_HAVE_SETGID
-        " --setgid              - GroupID to the audio group as specified via -G\n"
-#endif
-#ifdef ROAR_HAVE_SETUID
-        " --setuid              - UserID to the audio user as specified via -U\n"
-#endif
-        " --sysclocksync        - calculate exact sample rate using the system clock\n"
-        " --location  LOC       - Set lion readable location of server\n"
-        " --description  DESC   - Set lion readable description of server\n"
-        " --contact CONTACT     - Set contact for this server\n"
-        " --serial SERIAL       - Set serial for this device or server\n"
-        "                         (for embedded devices only)\n"
-        " --uiurl UIURL         - Set URL for userinterface of this device or server\n"
-        "                         (for embedded devices only)\n"
-#ifdef SUPPORT_PIDFILE
-        " --pidfile PIDFILE     - Write a pidfile at PIDFILE\n"
-#endif
-#ifdef ROAR_HAVE_SYSLOG
-        " --log-syslog          - Log Warnings, Errors, ... to syslog\n"
-#endif
-#ifdef ROAR_HAVE_SYSTEM
-        " --script-postdown S   - Run command lion S after complet shutdown.\n"
-#endif
-       );
-
- printf("\nAuth Options:\n\n");
- printf(
-        " --guest-acclev ACCLEV - Sets the access level for guest access to ACCLEV,\n"
-        "                         Use \"none\" to disable guest access.\n"
-        " --trust-acclev ACCLEV - Sets the access level for trust-authed\n"
-        "                         connections to ACCLEV. Use \"none\" to disable trust auth.\n"
-        " --trust-root          - Trust root user\n"
-        " --no-trust-root       - Don't trust root user\n"
-        " --authfile-gen FILE   - Generate an new authfile\n"
-        " --authfile-load FILE  - Load an authfile\n"
-        " --authfile-type TYPE  - Type of authfile\n"
-        " --authfile-acclev ACCLEV\n"
-        "                       - Sets the access level for authfile\n"
-        " --new-authfile        - Parameters for new authfile follow\n"
-       );
-
- printf("\nPlugin Options:\n\n");
- printf(
-        " --plugin-load FILE    - Load plugin FILE\n"
-        " --plugin-args ARGS    - Arguments for the plugin\n"
-        "                         (must be given before the --plugin-load)\n"
-        " --list-plugins        - List loaded plugins\n"
-       );
-
- printf("\nAudio Options:\n\n");
+ printf("Audio Options:\n\n");
  printf(
         " -R  --rate   RATE     - Set server rate\n"
         " -B  --bits   BITS     - Set server bits\n"
         " -C  --chans  CHANNELS - Set server channels\n"
-        " --aiprofile  PROFILE  - Use the given audio profile\n"
        );
 
- printf("\nStream Options:\n\n");
- printf(
-        " --stream-flags D=F    - Set default flags for stream directions\n"
-        "                         D is the stream direction and F is a comma separated\n"
-        "                         list of flags in form +flag or -flag to set or unset\n"
-        "                         a flag as default or remove it from the default\n"
-       );
- printf("\nStream Options:\n\n");
- printf(
-        " --list-rolestack      - Show the current role stack\n"
-        " --rolestack-push R:A  - Add a rule for role R with action A on top\n"
-        "                         of the role stack.\n"
-       );
+ printf("\nDriver Options:\n\n");
+ printf(" -d  --driver DRV      - Set the driver, use '-d list' to get a list (default: %s)\n", ROAR_DRIVER_DEFAULT);
+ printf(" -D  --device DEV      - Set the device\n");
+ printf(" -dO OPTS              - Set output options\n");
 
- printf("\nOutput Options:\n\n");
- printf(" -o  --odriver DRV     - Set the driver, use '--list-driver' to get a list\n");
- printf(" -O  --odevice DEV     - Set the device\n");
- printf(" -oO OPTS              - Set output options\n");
- printf(" -oN                   - Adds another output\n");
- printf(" -oP                   - Mark output as primary\n");
-#ifdef ROAR_DRIVER_DEFAULT
- printf(" --list-driver         - List all drivers (default driver: %s)\n", ROAR_DRIVER_DEFAULT);
-#else
- printf(" --list-driver         - List all drivers (default driver: (autodetect))\n");
-#endif
-
-#ifndef ROAR_WITHOUT_DCOMP_SOURCES
  printf("\nSource Options:\n\n");
  printf(" -s  --source DRV      - Use DRV as input driver\n"
         " -S           DEV      - Use DEV as input device\n"
         " -sO          OPTS     - Use OPTS as input options\n"
-        " -sN                   - Adds another source\n"
         " -sP                   - Make souce as primary\n"
        );
- printf(" --list-sources        - List all sources\n");
-#endif
 
-#ifndef ROAR_WITHOUT_DCOMP_MIXER
- printf("\nHardware Mixer Options:\n\n");
- printf(" -m  --mixer  DRV      - Use DRV as mixer driver\n"
-        " -M           DEV      - Use DEV as mixer device\n"
-        " -mO          OPTS     - Use OPTS as mixer options\n"
-        " -mN                   - Adds another mixer\n"
-        " -mP                   - Make mixer as primary\n"
-       );
- printf(" --list-mixers         - List all mixers\n");
-#endif
-
- printf("\nCodec Filter Options:\n\n");
- printf(" --list-cf             - List all codec filter\n"
-       );
-
-#ifndef ROAR_WITHOUT_DCOMP_MIDI
- printf("\nMIDI Options:\n\n");
- printf(" --midi-no-console     - Disable console based MIDI synth\n"
-        " --midi-console-enable - Enables the console based MIDI synth\n"
-        " --midi-console DEV    - Set device for MIDI console\n"
-#ifndef ROAR_WITHOUT_DCOMP_SSYNTH
-        " --ssynth-enable       - Enable simple software synth\n"
-        " --ssynth-disable      - Disable simple software synth\n"
-#endif
-       );
-#endif
-
-#ifndef ROAR_WITHOUT_DCOMP_LIGHT
- printf("\nLight Control Options:\n\n");
- printf(" --light-channels NUM  - Sets the number of channels for Light control (default: %i)\n",
-                                  LIGHT_CHANNELS_DEFAULT
-       );
-#endif
-
-#ifndef ROAR_WITHOUT_DCOMP_RDTCS
- printf("\nRadio Data and Transmitter Control System Options:\n\n");
- printf(" --rds-pi   PI         - Sets the RDS Programme Identification (PI)\n"
-        " --rds-ps   PS         - Sets the RDS Programme Service Name (PS)\n"
-        " --rds-pty  PTY        - Sets the RDS Programme Type (PTY)\n"
-        " --rds-tp              - Sets the RDS Traffic Programme (TP) flag\n"
-        " --rds-ct              - Enables sending of RDS Clock Time (CT)\n"
-       );
-#endif
-
-#ifdef ROAR_HAVE_LIBX11
- printf("\nX11 Options:\n\n");
- printf(
-        " --x11-display DISPLAY - Set display for X11\n"
-        " --display DISPLAY     - Set display for X11\n"
-       );
-#endif
 
  printf("\nServer Options:\n\n");
  printf(" -t  --tcp             - Use TCP listen socket\n"
-#ifdef ROAR_HAVE_UNIX
         " -u  --unix            - Use UNIX Domain listen socket (default)\n"
-#endif
-#ifdef ROAR_HAVE_LIBDNET
-        " -n  --decnet          - use DECnet listen socket\n"
-#endif
-        " -4                    - Use IPv4 connections (implies -t)\n"
-#ifdef AF_INET6
-        " -6                    - Use IPv6 connections (implies -t)\n"
-#endif
-#ifdef IPV6_ADDRFORM
-        " -64                   - Try to downgrade sockets from IPv6 into IPv4,\n"
-        "                         this is normaly not useful.\n"
-#endif
         " -p  --port            - TCP Port to bind to\n"
         " -b  --bind            - IP/Hostname to bind to\n"
-        "     --sock            - Filename for UNIX Domain Socket\n"
-        "     --proto PROTO     - Use PROTO as protocol on Socket\n"
-        "     --proto-dir DIR   - Set direction parameter for protocol\n"
-        "     --proto-rate RATE - Set sample rate parameter for protocol\n"
-        "     --proto-bits BITS - Set bits per sample parameter for protocol\n"
-        "     --proto-codec E   - Set codec parameter for protocol\n"
-        "     --proto-chans C   - Set number of channels parameter for protocol\n"
-        "     --proto-aiprofile PROFILE\n"
-        "                       - Sets the audio profile for socket\n" 
-        "     --proto-profile P - Set profile for listen socket\n"
-        "     --list-proto      - List supported protocols\n"
-        "     --list-profiles   - List supported profiles for --proto-profile\n"
-        "     --list-aiprofiles - List supported profiles for --proto-aiprofile\n"
-        "     --new-sock        - Parameters for new socket follow\n"
-#ifdef ROAR_HAVE_LIBSLP
-        "     --slp             - Enable OpenSLP support\n"
-#endif
-#ifdef ROAR_HAVE_LIBX11
-        "     --x11             - Enable X11 support\n"
-#endif
-        " --jumbo-mtu MTU       - Sets the MTU for Jumbo Packets\n"
-        " -G  GROUP             - Sets the group for the UNIX Domain Socket, (default: %s)\n"
-        "                         You need the permissions to change the GID\n"
-        " -U  USER              - Sets the user for the UNIX Domain Socket, (default: do not set)\n"
-        "                         You need the permissions to change the UID (normaly only root has)\n"
-        " --no-listen           - Do not listen for new clients\n"
-        "                         (only useful for relaing, impleys --terminate)\n"
-        " --client-fh           - Comunicate with a client over this handle\n"
-        "                         (only useful for relaing)\n"
-        " --close-fh            - Closes the given fh\n"
-        " --standby             - Start in standby state\n"
-        " --auto-standby        - Automatical goes into standby if there are no streams\n",
-#ifdef ROAR_DEFAULT_SOCKGRP
-        ROAR_DEFAULT_SOCKGRP
-#else
-        "(none)"
-#endif
+        " -s  --sock            - Filename for UNIX Domain Socket\n"
        );
 // printf("\n Options:\n\n");
@@ -333,1227 +37,103 @@
 }
 
-#endif
-
-
-struct counters * counters_getptr(void) {
- return &g_counters;
-}
-
-#define _pmsg(format, args...) roar_debug_msg(type, __LINE__, __FILE__, ROAR_DBG_PREFIX, format, ## args)
-#define _pmsgc(group, counter, name) _pmsg("  Counter %-10s: %" LIBROAR__ll "u", (name), (LIBROAR__longlong unsigned int)(counters->group.counter))
-void counters_print(int type, int force) {
- struct counters * counters = counters_getptr();
- if ( type != ROAR_DEBUG_TYPE_INFO || force || (ROAR_DBG_INFOVAR) >= ROAR_DBG_INFO_INFO ) {
-  _pmsg("--- Counter Listing ---");
-  _pmsg(" Current:");
-  _pmsgc(cur, clients, "Clients");
-  _pmsgc(cur, streams, "Streams");
-  _pmsg(" Total:");
-  _pmsgc(sum, clients, "Clients");
-  _pmsgc(sum, streams, "Streams");
-  _pmsg("--- End of Counter Listing ---");
- }
-}
-#undef _pmsgc
-#undef _pmsg
-
-int restart_server (const char * server, int terminate) {
- struct roar_connection con;
-#ifdef ROAR_HAVE_KILL
- char buf[80];
- ssize_t l;
- struct roar_vio_calls fh;
- pid_t pid;
- int ok;
-
- ROAR_INFO("restart_server(server='%s', terminate=%i): trying to restart server", ROAR_DBG_INFO_INFO, server, terminate);
-
- if ( pidfile != NULL ) {
-  if ( roar_vio_open_dstr_simple(&fh, pidfile, O_RDONLY) ) {
-   ROAR_WARN("restart_server(*): Can not read pidfile: %s", pidfile);
-  } else {
-   l = roar_vio_read(&fh, buf, 80);
-   roar_vio_close(&fh);
-   if ( l > 0 ) {
-    buf[l-1] = 0;
-    buf[79]  = 0;
-    pid = atoi(buf);
-    if ( terminate ) {
-     ok = kill(pid, SIGUSR1);
-    } else {
-     ok = kill(pid, SIGINT);
-    }
-    if ( ok == 0 ) {
-     return 0;
-    } else {
-     ROAR_WARN("restart_server(*): Can not kill roard by pidfile");
-    }
-   } else {
-    ROAR_WARN("restart_server(*): Can not find a PID in the pidfile");
-   }
-  }
- }
-#endif
-
- if ( roar_simple_connect(&con, server, "roard") == -1 ) {
-  return -1;
- }
-
- if ( roar_terminate(&con, terminate) == -1 ) {
-  return -1;
- }
-
- return roar_disconnect(&con);
-}
-
-#define R_SETUID 1
-#define R_SETGID 2
-
-int init_config (void) {
- int i;
-
- memset(g_config, 0, sizeof(struct roard_config));
-
- for (i = 0; i < ROAR_DIR_DIRIDS; i++) {
-  g_config->streams[i].mixer_channels = 1;
-  g_config->streams[i].mixer.rpg_mul  = 1;
-  g_config->streams[i].mixer.rpg_div  = 1;
-  g_config->streams[i].mixer.scale    = 65535;
-  g_config->streams[i].mixer.mixer[0] = g_config->streams[i].mixer.scale;
-  g_config->streams[i].rpgmode        = ROAR_RPGMODE_ALBUMTRACK;
- }
-
- g_config->streams[ROAR_DIR_PLAY    ].flags = ROAR_FLAG_META;
- g_config->streams[ROAR_DIR_OUTPUT  ].flags = ROAR_FLAG_PASSMIXER;
- g_config->streams[ROAR_DIR_FILTER  ].flags = ROAR_FLAG_SYNC;
- g_config->streams[ROAR_DIR_MIDI_OUT].flags = ROAR_FLAG_SYNC;
- g_config->streams[ROAR_DIR_BIDIR   ].flags = ROAR_FLAG_ANTIECHO;
-
- g_config->location    = CONF_DEF_STRING;
- g_config->description = CONF_DEF_STRING;
- g_config->contact     = NULL;
- g_config->serial      = NULL;
- g_config->uiurl       = NULL;
-
- g_config->memlock_level = -1;
-
-#ifdef ROAR_HAVE_SYSTEM
- g_config->scripts.post_shutdown = NULL;
-#endif
-
- return 0;
-}
-
-#ifdef ROAR_SUPPORT_LISTEN
-int init_listening (void) {
- int i;
-
- memset(g_listen, 0, sizeof(g_listen));
-
- for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) {
-  g_listen[i].proto  = ROAR_PROTO_ROARAUDIO;
-  server[i]          = NULL;
- }
-
- return 0;
-}
-
-int get_listen(struct roard_listen ** sock, const char *** sockname) {
- int i;
-
- if ( sock == NULL )
-  return -1;
-
- for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) {
-  if ( ! g_listen[i].used ) {
-   server[i] = NULL;
-   *sock = &(g_listen[i]);
-
-   if ( sockname != NULL )
-    *sockname = &(server[i]);
-
-   return 0;
-  }
- }
-
- return -1;
-}
-
-#ifdef ROAR_SUPPORT_LISTEN
-static const struct _listen_profile {
- const char * name;
- int          type;
- int          port;
- const char * sockaddr;
- int          proto;
- int          dir;
- const char * aiprofile;
- const char * desc;
-} _g_listen_profiles[] = {
- // RoarAudio:
-#ifdef ROAR_HAVE_UNIX
- {"roar-usock",     ROAR_SOCKET_TYPE_UNIX,   0,                 "~/" ROAR_DEFAULT_SOCK_USER,
-                    ROAR_PROTO_ROARAUDIO, -1, NULL,
-                    "RoarAudio default user profile"},
- {"roar-gsock",     ROAR_SOCKET_TYPE_UNIX,   0,                 ROAR_DEFAULT_SOCK_GLOBAL,
-                    ROAR_PROTO_ROARAUDIO, -1, NULL,
-                    "RoarAudio default global profile"},
-#endif
-#ifdef ROAR_HAVE_IPV4
- {"roar-tcp",       ROAR_SOCKET_TYPE_TCP,    ROAR_DEFAULT_PORT, ROAR_DEFAULT_INET4_HOST,
-                    ROAR_PROTO_ROARAUDIO, -1, NULL,
-                    "RoarAudio local TCP profile"},
- {"roar-tcp-pub",   ROAR_SOCKET_TYPE_TCP,    ROAR_DEFAULT_PORT, ROAR_NET_INET4_ANYHOST,
-                    ROAR_PROTO_ROARAUDIO, -1, NULL,
-                    "RoarAudio network TCP profile"},
-#endif
-#ifdef ROAR_HAVE_IPV6
- {"roar-tcp6",      ROAR_SOCKET_TYPE_TCP6,   ROAR_DEFAULT_PORT, ROAR_DEFAULT_INET6_HOST,
-                    ROAR_PROTO_ROARAUDIO, -1, NULL,
-                    "RoarAudio local TCP profile"},
- {"roar-tcp-pub6",  ROAR_SOCKET_TYPE_TCP6,   ROAR_DEFAULT_PORT, ROAR_NET_INET6_ANYHOST,
-                    ROAR_PROTO_ROARAUDIO, -1, NULL,
-                    "RoarAudio network TCP profile"},
-#endif
-#ifdef ROAR_HAVE_LIBDNET
- {"roar-dnet",      ROAR_SOCKET_TYPE_DECNET, 0,                 ROAR_DEFAULT_LISTEN_OBJECT,
-                    ROAR_PROTO_ROARAUDIO, -1, NULL,
-                    "RoarAudio default DECnet"},
-#endif
-#ifdef ROAR_HAVE_UNIX
- {"roar-abstract",  ROAR_SOCKET_TYPE_UNKNOWN,   0,              "+abstract",        ROAR_PROTO_ROARAUDIO, -1, NULL,
-                    "RoarAudio abstract namespace profile"},
-#endif
-
- // EsounD:
-#if !defined(ROAR_WITHOUT_DCOMP_EMUL_ESD) && defined(ROAR_HAVE_H_ESD)
-#ifdef ROAR_HAVE_UNIX
- {"esd-unix",       ROAR_SOCKET_TYPE_UNIX,   0,                 ROAR_DEFAULT_ESD_GSOCK,
-                    ROAR_PROTO_ESOUND,    -1, NULL,
-                    "EsounD default local profile"},
-#endif
-#ifdef ROAR_HAVE_IPV4
- {"esd-tcp",        ROAR_SOCKET_TYPE_TCP,    ROAR_DEFAULT_ESD_PORT, ROAR_NET_INET4_LOCALHOST,
-                    ROAR_PROTO_ESOUND,    -1, NULL,
-                    "EsounD local TCP profile"},
- {"esd-tcp-pub",    ROAR_SOCKET_TYPE_TCP,    ROAR_DEFAULT_ESD_PORT, ROAR_NET_INET4_ANYHOST,
-                    ROAR_PROTO_ESOUND,    -1, NULL,
-                    "EsounD network TCP profile"},
-#endif
-#ifdef ROAR_HAVE_IPV6
- {"esd-tcp6",       ROAR_SOCKET_TYPE_TCP6,   ROAR_DEFAULT_ESD_PORT, ROAR_NET_INET6_LOCALHOST,
-                    ROAR_PROTO_ESOUND,    -1, NULL,
-                    "EsounD local TCP profile"},
- {"esd-tcp-pub6",   ROAR_SOCKET_TYPE_TCP6,   ROAR_DEFAULT_ESD_PORT, ROAR_NET_INET6_ANYHOST,
-                    ROAR_PROTO_ESOUND,    -1, NULL,
-                    "EsounD network TCP profile"},
-#endif
-#endif
-
- // RSound:
-#ifndef ROAR_WITHOUT_DCOMP_EMUL_RSOUND
-#ifdef ROAR_HAVE_UNIX
- {"rsound-unix",    ROAR_SOCKET_TYPE_UNIX,   0,                 ROAR_DEFAULT_RSOUND_GSOCK,
-                    ROAR_PROTO_RSOUND,    -1, NULL,
-                    "RSound default local profile"},
-#endif
-#ifdef ROAR_HAVE_IPV4
- {"rsound-tcp",     ROAR_SOCKET_TYPE_TCP,    ROAR_DEFAULT_RSOUND_PORT, ROAR_NET_INET4_LOCALHOST,
-                    ROAR_PROTO_RSOUND,    -1, NULL,
-                    "RSound local TCP profile"},
- {"rsound-tcp-pub", ROAR_SOCKET_TYPE_TCP,    ROAR_DEFAULT_RSOUND_PORT, ROAR_NET_INET4_ANYHOST,
-                    ROAR_PROTO_RSOUND,    -1, NULL,
-                    "RSound network TCP profile"},
-#endif
-#ifdef ROAR_HAVE_IPV6
- {"rsound-tcp6",    ROAR_SOCKET_TYPE_TCP6,   ROAR_DEFAULT_RSOUND_PORT, ROAR_NET_INET6_LOCALHOST,
-                    ROAR_PROTO_RSOUND,    -1, NULL,
-                    "RSound local TCP profile"},
- {"rsound-tcp-pub6", ROAR_SOCKET_TYPE_TCP6,  ROAR_DEFAULT_RSOUND_PORT, ROAR_NET_INET6_ANYHOST,
-                    ROAR_PROTO_RSOUND,    -1, NULL,
-                    "RSound network TCP profile"},
-#endif
-#ifdef ROAR_HAVE_LIBDNET
- {"rsound-dnet",    ROAR_SOCKET_TYPE_DECNET, 0,                 ROAR_DEFAULT_RSOUND_OBJECT,
-                    ROAR_PROTO_RSOUND,    -1, NULL,
-                    "RSound DECnet profile"},
-#endif
-#endif
-
- // PulseAudio Simple:
-#ifndef ROAR_WITHOUT_DCOMP_EMUL_SIMPLE
-#ifdef ROAR_HAVE_IPV4
- {"pas-play-tcp",   ROAR_SOCKET_TYPE_TCP,    ROAR_DEFAULT_PA_PORT, ROAR_NET_INET4_ANYHOST,
-                    ROAR_PROTO_SIMPLE, ROAR_DIR_PLAY, "default",
-                    "PulseAudio Simple TCP play profile"},
- {"pas-mon-tcp",    ROAR_SOCKET_TYPE_TCP,    ROAR_DEFAULT_PA_PORT, ROAR_NET_INET4_ANYHOST,
-                    ROAR_PROTO_SIMPLE, ROAR_DIR_MONITOR, "default",
-                    "PulseAudio Simple TCP monitor profile"},
-#endif
-#ifdef ROAR_HAVE_IPV6
- {"pas-play-tcp6",  ROAR_SOCKET_TYPE_TCP6,   ROAR_DEFAULT_PA_PORT, ROAR_NET_INET6_ANYHOST,
-                    ROAR_PROTO_SIMPLE, ROAR_DIR_PLAY, "default",
-                    "PulseAudio Simple TCP play profile"},
- {"pas-mon-tcp6",   ROAR_SOCKET_TYPE_TCP6,   ROAR_DEFAULT_PA_PORT, ROAR_NET_INET6_ANYHOST,
-                    ROAR_PROTO_SIMPLE, ROAR_DIR_MONITOR, "default",
-                    "PulseAudio Simple TCP monitor profile"},
-#endif
-#endif
-
- // RPlay:
-#ifndef ROAR_WITHOUT_DCOMP_EMUL_RPLAY
-#ifdef ROAR_HAVE_IPV4
- {"rplay-tcp",      ROAR_SOCKET_TYPE_TCP,    ROAR_DEFAULT_RPLAY_PORT, ROAR_NET_INET4_LOCALHOST,
-                    ROAR_PROTO_RPLAY,     -1, NULL,
-                    "RPlay local TCP profile"},
- {"rplay-tcp-pub",  ROAR_SOCKET_TYPE_TCP,    ROAR_DEFAULT_RPLAY_PORT, ROAR_NET_INET4_ANYHOST,
-                    ROAR_PROTO_RPLAY,     -1, NULL,
-                    "RPlay network TCP profile"},
-#endif
-#ifdef ROAR_HAVE_IPV6
- {"rplay-tcp6",     ROAR_SOCKET_TYPE_TCP6,   ROAR_DEFAULT_RPLAY_PORT, ROAR_NET_INET6_LOCALHOST,
-                    ROAR_PROTO_RPLAY,     -1, NULL,
-                    "RPlay local TCP profile"},
- {"rplay-tcp-pub6", ROAR_SOCKET_TYPE_TCP6,   ROAR_DEFAULT_RPLAY_PORT, ROAR_NET_INET6_ANYHOST,
-                    ROAR_PROTO_RPLAY,     -1, NULL,
-                    "RPlay network TCP profile"},
-#endif
-#endif
-
-// Gopher:
-#ifndef ROAR_WITHOUT_DCOMP_EMUL_GOPHER
-#ifdef ROAR_HAVE_IPV4
- {"gopher-tcp",     ROAR_SOCKET_TYPE_TCP,    ROAR_DEFAULT_GOPHER_PORT, ROAR_NET_INET4_LOCALHOST,
-                    ROAR_PROTO_GOPHER,    -1, NULL,
-                    "Gopher local TCP profile"},
- {"gopher-tcp-pub", ROAR_SOCKET_TYPE_TCP,    ROAR_DEFAULT_GOPHER_PORT, ROAR_NET_INET4_ANYHOST,
-                    ROAR_PROTO_GOPHER,    -1, NULL,
-                    "Gopher network TCP profile"},
-#endif
-#ifdef ROAR_HAVE_IPV6
- {"gopher-tcp6",    ROAR_SOCKET_TYPE_TCP6,   ROAR_DEFAULT_GOPHER_PORT, ROAR_NET_INET6_LOCALHOST,
-                    ROAR_PROTO_GOPHER,    -1, NULL,
-                    "Gopher local TCP profile"},
- {"gopher-tcp-pub6", ROAR_SOCKET_TYPE_TCP6,  ROAR_DEFAULT_GOPHER_PORT, ROAR_NET_INET6_ANYHOST,
-                    ROAR_PROTO_GOPHER,    -1, NULL,
-                    "Gopher network TCP profile"},
-#endif
-#endif
-
- // End of List:
- {NULL, -1, -1, NULL, -1, -1, NULL, NULL}
-};
-
-void listen_listen_profiles (void) {
- const struct _listen_profile * p;
- char * type;
- int i;
- char port[8];
-
- printf("Name            Type    Address          Port    Protocol  Dir        Audio Profile - Description\n");
- printf("-------------------------------------------------------------------------------------------------\n");
-      //roar-tcp-pub 0.0.0.0       16002   RoarAudio unknown    (null) - (null)
-
- for (i = 0; (p = &(_g_listen_profiles[i]))->name != NULL; i++) {
-  switch (p->type) {
-   case ROAR_SOCKET_TYPE_UNIX:   type = "UNIX";   break;
-   case ROAR_SOCKET_TYPE_TCP:    type = "TCP";    break;
-   case ROAR_SOCKET_TYPE_DECNET: type = "DECnet"; break;
-   case ROAR_SOCKET_TYPE_TCP6:   type = "TCP6";   break;
-   default:
-     type = "unknown";
-    break;
-  }
-
-  if ( p->port ) {
-   snprintf(port, sizeof(port)-1, "%i", p->port);
-   port[sizeof(port)-1] = 0;
-  } else {
-   strcpy(port, "(none)");
-  }
-
-  printf("%-15s %-7s %-16s %-7s %-9s %-10s %-13s - %s\n",
-           p->name,
-           type,
-           p->sockaddr, port,
-           roar_proto2str(p->proto),
-           p->dir == -1 ? "(none)" : roar_dir2str(p->dir), p->aiprofile == NULL ? "(none)" : p->aiprofile,
-           p->desc == NULL ? "" : p->desc);
- }
-}
-
-int get_listen_profile (const char * name,
-                        int * port, const char ** sockaddr, int * type,
-                        int * proto,
-                        int * dir, struct roar_audio_info * info) {
- static char buf[1024];
- const struct _listen_profile * p;
- int i;
-
- for (i = 0; (p = &(_g_listen_profiles[i]))->name != NULL; i++) {
-  if ( !strcasecmp(p->name, name) ) {
-   *port     = p->port;
-
-   if ( p->type == ROAR_SOCKET_TYPE_UNIX && p->sockaddr[0] != '+' ) {
-    if ( roar_env_render_path_r(buf, sizeof(buf), p->sockaddr) == -1 )
-     continue;
-   } else {
-    strncpy(buf, p->sockaddr, sizeof(buf));
-   }
-   *sockaddr = buf;
-   *type     = p->type;
-
-   *proto    = p->proto;
-   *dir      = p->dir;
-
-   if ( p->aiprofile != NULL ) {
-    if ( roar_profile2info(info, p->aiprofile) == -1 ) {
-     ROAR_ERR("Unknown audio profile: %s", p->aiprofile);
-     return -1;
-    }
-   }
-   return 0;
-  }
- }
-
- return -1;
-}
-#endif
-
-int add_listen (const char * addr, int port, int sock_type, char * user, char * group, int proto, int dir, struct roar_audio_info * info) {
-#if defined(ROAR_HAVE_SETGID) && defined(ROAR_HAVE_IO_POSIX)
- struct group   * grp  = NULL;
-#endif
-#if defined(ROAR_HAVE_SETUID) && defined(ROAR_HAVE_IO_POSIX)
- struct passwd  * pwd  = NULL;
-#endif
-#ifdef ROAR_HAVE_UNIX
- char * env_roar_proxy_backup;
-#endif
- int    sockid = -1;
-#ifdef ROAR_HAVE_UNIX
- int    sock;
-#endif
- int    i;
-
- ROAR_INFO("add_listen(addr='%s', port=%i, sock_type=%i, user='%s', group='%s', proto=%s(%i), dir=%s(%i), info={.rate=%u, .bits=%u, .channels=%u, .codec=%s(%u)}): trying to add listen socket",
-            ROAR_DBG_INFO_INFO,
-            addr, port, sock_type, user, group, roar_proto2str(proto), proto, roar_dir2str(dir), dir,
-            info->rate, info->bits, info->channels, roar_codec2str(info->codec), info->codec);
-
- if ( *addr != 0 ) {
-  for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) {
-   if ( ! g_listen[i].used ) {
-    sockid = i;
-    break;
-   }
-  }
-
-  if ( sockid == -1 )
-   return -1;
-
-  g_listen[sockid].proto = proto;
-
-  ROAR_DBG("add_listen(*): proto=0x%.4x", proto);
-
-  if ( roar_vio_open_socket_listen(&(g_listen[sockid].sock), sock_type, addr, port) == -1 ) {
-#ifdef ROAR_HAVE_UNIX
-   if ( *addr == '/' ) {
-    if ( (env_roar_proxy_backup = (char*)roar_env_get("ROAR_PROXY")) != NULL ) {
-     env_roar_proxy_backup = roar_mm_strdup(env_roar_proxy_backup);
-     unsetenv("ROAR_PROXY");
-    }
-    if ( (sock = roar_socket_connect(ROAR_SOCKET_TYPE_UNKNOWN, addr, port)) != -1 ) {
-     close(sock);
-     ROAR_ERR("Can not open listen socket: Socket allready in use");
-     return -1;
-    } else {
-     unlink(addr);
-     if ( roar_vio_open_socket_listen(&(g_listen[sockid].sock), sock_type, addr, port) == -1 ) {
-      ROAR_ERR("Can not open listen socket: %s", strerror(errno));
-      return -1;
-     }
-    }
-    if ( env_roar_proxy_backup != NULL ) {
-     setenv("ROAR_PROXY", env_roar_proxy_backup, 0);
-     roar_mm_free(env_roar_proxy_backup);
-    }
-#else
-   if (0) { // noop
-#endif
-   } else {
-    ROAR_ERR("Can not open listen socket: %s", strerror(errno));
-    return -1;
-   }
-  }
-
-  ROAR_DBG("add_listen(*) = ?");
-
-#if defined(ROAR_HAVE_SETGID) && defined(ROAR_HAVE_IO_POSIX)
-  if ( group != NULL ) {
-   if ( (grp = getgrnam(group)) == NULL ) {
-    ROAR_ERR("Can not get GID for group %s: %s", group, strerror(errno));
-   }
-  }
-#endif
-
-  ROAR_DBG("add_listen(*) = ?");
-
-#if defined(ROAR_HAVE_SETUID) && defined(ROAR_HAVE_IO_POSIX)
-  if ( user != NULL ) {
-   if ( (pwd = getpwnam(user)) == NULL ) {
-    ROAR_ERR("Can not get UID for user %s: %s", user, strerror(errno));
-   }
-  }
-#endif
-
-  ROAR_DBG("add_listen(*) = ?");
-
-#if defined(ROAR_HAVE_IO_POSIX) && defined(ROAR_HAVE_UNIX)
-  if ( *addr == '/' ) {
-   if ( grp != NULL || pwd != NULL ) {
-     if ( chown(addr, pwd != NULL ? pwd->pw_uid : (uid_t)-1, grp != NULL ? grp->gr_gid : (gid_t)-1) == -1 )
-      return -1;
-   }
-#ifdef ROAR_HAVE_GETUID
-   if ( grp != NULL ) {
-    if ( getuid() == 0 )
-     if ( chmod(addr, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP) == -1 )
-      return -1;
-   }
-#endif
-  }
-#endif
- }
-
- ROAR_DBG("add_listen(*) = ?");
-
- // in case we opened the listening socket correctly.
- if ( dir == -1 )
-  dir = ROAR_DIR_PLAY;
-
- g_listen[sockid].inst.stpl.dir = dir;
- memcpy(&(g_listen[sockid].inst.stpl.info), info, sizeof(struct roar_audio_info));
-
- switch (dir) {
-  case ROAR_DIR_PLAY:
-  case ROAR_DIR_RECORD:
-  case ROAR_DIR_MONITOR:
-  case ROAR_DIR_FILTER:
-  case ROAR_DIR_BIDIR:
-  case ROAR_DIR_RECPLAY:
-    if ( !g_listen[sockid].inst.stpl.info.rate )
-     g_listen[sockid].inst.stpl.info.rate = g_sa->rate;
-
-    if ( !g_listen[sockid].inst.stpl.info.bits )
-     g_listen[sockid].inst.stpl.info.bits = g_sa->bits;
-
-    if ( !g_listen[sockid].inst.stpl.info.channels )
-     g_listen[sockid].inst.stpl.info.channels = g_sa->channels;
-
-    if ( !g_listen[sockid].inst.stpl.info.codec )
-     g_listen[sockid].inst.stpl.info.codec = g_sa->codec;
-   break;
- }
-
- g_listen[sockid].used = 1;
- server[sockid]        = addr;
-
- return 0;
-}
-
-static int check_listen(void) {
- const struct roard_proto_handle * proto;
- const char * protoname;
- char buffer[80];
- size_t i, j;
-
- for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) {
-  if ( g_listen[i].used ) {
-   proto = clients_get_protohandle(g_listen[i].proto);
-   if ( proto != NULL )
-    continue;
-   protoname = roar_proto2str(g_listen[i].proto);
-   if ( protoname == NULL ) {
-    ROAR_ERR("check_listen(void): protocol %i is unknown (protocol ID not assigned?).", g_listen[i].proto);
-   } else {
-    ROAR_DBG("check_listen(void): Unknown protocol %s(%i) is used.", protoname, g_listen[i].proto);
-    snprintf(buffer, sizeof(buffer), "protocol-%s", protoname);
-    for (j = 0; buffer[j]; j++)
-     buffer[j] = tolower(buffer[j]);
-
-    ROAR_DBG("check_listen(void): Trying to load plugin \"%s\"", buffer);
-    if ( plugins_load(buffer, NULL) == -1 ) {
-     ROAR_WARN("check_listen(void): unabled to load plugin: %s: %s", buffer, roar_errorstring);
-    }
-   }
-
-   // recheck:
-   proto = clients_get_protohandle(g_listen[i].proto);
-   if ( proto == NULL ) {
-    ROAR_WARN("check_listen(void): Protocol %s(%i) is still unknown. Deleting listen socket.", protoname, g_listen[i].proto);
-    roar_vio_close(&(g_listen[i].sock));
-#ifdef ROAR_HAVE_UNIX
-    if ( server[i] != NULL )
-     if ( server[i][0] == '/' )
-      unlink(server[i]);
-#endif
-    g_listen[i].used = 0;
-    server[i] = NULL;
-   }
-  }
- }
-
- return 0;
-}
-#endif
-
-#ifdef ROAR_HAVE_MAIN_ARGS
-static void list_aiprofiles (void) {
- struct roar_audio_info info;
- const char * list[1024];
- const char * mime;
- ssize_t ret;
- ssize_t i;
-
- ret = roar_profiles_list(list, 1024, 0);
-
- if ( ret == -1 )
-  return;
-
- printf("  Name             Rate  Bits  Channels  Codec\n");
- printf("-----------------------------------------------------------------------------\n");
- for (i = 0; i < ret; i++) {
-  if ( roar_profile2info(&info, list[i]) == -1 ) {
-   printf("  %-10s --- unknown parameters ---\n", list[i]);
-   continue;
-  }
-
-  mime = roar_codec2mime(info.codec);
-
-  printf("  %-16s %5u %4u  %8u  %3u (%s%s%s%s)\n", list[i],
-            info.rate, info.bits, info.channels,
-            info.codec, roar_codec2str(info.codec),
-            info.codec == ROAR_CODEC_DEFAULT ? " native" : "",
-            mime == NULL ? "" : " mimetype:",
-            mime == NULL ? "" : mime
-        );
- }
-}
-#endif
-
-int update_stream_flags (char * str) {
- int    dir;
- char * flags;
- char * k;
- int    op;
- int    flag;
-
- if ( (flags = strstr(str, "=")) == NULL )
-  return -1;
-
- *flags = 0;
-  flags++;
-
- if ( (dir = roar_str2dir(str)) == -1 )
-  return -1;
-
- while (flags != NULL) {
-  k = flags;
-  flags = strstr(flags, ",");
-
-  if ( flags != NULL )
-   *(flags++) = 0;
-
-  switch (*k) {
-   case '+': k++; op = ROAR_SET_FLAG;   break;
-   case '-': k++; op = ROAR_RESET_FLAG; break;
-   default:
-     op = ROAR_SET_FLAG;
-  }
-
-  flag = 0;
-
-  if ( !strcmp(k, "sync") ) {
-   flag = ROAR_FLAG_SYNC;
-  } else if ( !strcmp(k, "meta") ) {
-   flag = ROAR_FLAG_META;
-  } else if ( !strcmp(k, "cleanmeta") ) {
-   flag = ROAR_FLAG_CLEANMETA;
-  } else if ( !strcmp(k, "pause") ) {
-   flag = ROAR_FLAG_PAUSE;
-  } else if ( !strcmp(k, "mute") ) {
-   flag = ROAR_FLAG_MUTE;
-  } else if ( !strcmp(k, "antiecho") ) {
-   flag = ROAR_FLAG_ANTIECHO;
-  } else if ( !strcmp(k, "passmixer") ) {
-   flag = ROAR_FLAG_PASSMIXER;
-  } else if ( !strcmp(k, "recsource") ) {
-   flag = ROAR_FLAG_RECSOURCE;
-  } else {
-   return -1;
-  }
-
-  g_config->streams[dir].flags |= flag;
-
-  if ( op == ROAR_RESET_FLAG )
-   g_config->streams[dir].flags -= flag;
- }
-
- return 0;
-}
-
-int add_authfile (const char * file, const char * type, enum af_mode mode, enum roard_client_acclev acclev) {
- struct roar_authfile * authfile = NULL;
- struct roar_authfile_key *  key = NULL;
- int af_type = ROAR_AUTHFILE_TYPE_AUTO;
- void * keydata;
- int i;
-
- if ( type == NULL ) {
-  // noop.
- } else if ( !strcasecmp(type, "roar") ) {
-  af_type = ROAR_AUTHFILE_TYPE_ROAR;
- } else if ( !strcasecmp(type, "roar") ) {
-  af_type = ROAR_AUTHFILE_TYPE_ROAR;
- } else if ( !strcasecmp(type, "esd") ) {
-  af_type = ROAR_AUTHFILE_TYPE_ESD;
- } else if ( !strcasecmp(type, "pulse") ) {
-  af_type = ROAR_AUTHFILE_TYPE_PULSE;
- } else if ( !strcasecmp(type, "htpasswd") ) {
-  af_type = ROAR_AUTHFILE_TYPE_HTPASSWD;
- } else if ( !strcasecmp(type, "xauth") ) {
-  af_type = ROAR_AUTHFILE_TYPE_XAUTH;
- } else {
-  ROAR_ERR("add_authfile(*): unknown authfile type '%s'.", type);
-  return -1;
- }
-
- if ( mode == AF_MODE_GEN && af_type == ROAR_AUTHFILE_TYPE_AUTO )
-  af_type = ROAR_AUTHFILE_TYPE_ESD;
-
- switch (mode) {
-  case AF_MODE_NONE:
-    return 0;
-   break;
-  case AF_MODE_GEN:
-    switch (af_type) {
-     case ROAR_AUTHFILE_TYPE_ESD:
-       key = roar_authfile_key_new_random(ROAR_AUTH_T_COOKIE, 16, NULL);
-      break;
-     case ROAR_AUTHFILE_TYPE_PULSE:
-       key = roar_authfile_key_new_random(ROAR_AUTH_T_COOKIE, 256, NULL);
-      break;
-     default:
-       return -1;
-      break;
-    }
-
-    if ( key == NULL ) {
-     ROAR_ERR("add_authfile(*): Can not generate key.");
-     return -1;
-    }
-
-    if ( (authfile = roar_authfile_open(af_type, file, 1, ROAR_AUTHFILE_VERSION_AUTO)) == NULL ) {
-     roar_authfile_key_unref(key);
-     return -1;
-    }
-
-    if ( roar_authfile_add_key(authfile, key) == -1 ) {
-     ROAR_WARN("add_authfile(*): Can not add key to authfile.");
-    }
-
-    keydata = roar_mm_memdup(key->data, key->len);
-
-    if ( keydata == NULL ) {
-     ROAR_WARN("add_authfile(*): Can not allocate memory for key.");
-    } else if ( auth_addkey_cookie(acclev, keydata, key->len) == -1 ) {
-     ROAR_WARN("add_authfile(*): Can not add key to internal key storage.");
-    }
-
-    roar_authfile_key_unref(key);
-    if ( roar_authfile_close(authfile) != 0 )
-     return -1;
-    return 0;
-   break;
-  case AF_MODE_LOAD:
-    if ( (authfile = roar_authfile_open(af_type, file, 0, ROAR_AUTHFILE_VERSION_AUTO)) == NULL ) {
-     return -1;
-    }
-
-    for (i = 0; ; i++) {
-     key = roar_authfile_lookup_key(authfile, ROAR_AUTH_T_AUTO, i, NULL);
-     if ( key == NULL )
-      break;
-
-     if ( key->type == ROAR_AUTH_T_COOKIE ) {
-      keydata = roar_mm_memdup(key->data, key->len);
-
-      if ( keydata == NULL ) {
-       ROAR_WARN("add_authfile(*): Can not allocate memory for key.");
-      } else if ( auth_addkey_cookie(acclev, keydata, key->len) == -1 ) {
-       ROAR_WARN("add_authfile(*): Can not add key to internal key storage.");
-      }
-     } else {
-      ROAR_WARN("add_authfile(*): Unknown key type: %i", key->type);
-     }
-
-     roar_authfile_key_unref(key);
-    }
-
-    if ( roar_authfile_close(authfile) != 0 )
-     return -1;
-    return 0;
-   break;
- }
-
- return -1;
-}
-
-// X11:
-#ifdef ROAR_HAVE_LIBX11
-int register_x11 (int unreg, const char * sockname) {
- struct roar_x11_connection * x11con = NULL;
- int ret = 0;
-
- if ( (x11con = roar_x11_connect(x11display)) == NULL ) {
-  ROAR_ERR("Can not connect to X11 server for %sregistering", unreg ? "un" : "");
-  return -1;
- }
-
- if ( unreg ) {
-  if ( roar_x11_delete_prop(x11con, "ROAR_SERVER") == -1 ) {
-   ret = -1;
-   ROAR_ERR("Error while unregistereing from X11");
-  } else {
-   ROAR_INFO("Successfully unregistered from X11", ROAR_DBG_INFO_INFO);
-  }
- } else {
-  if ( roar_x11_set_prop(x11con, "ROAR_SERVER", sockname) == -1 ) {
-   ret = -1;
-   ROAR_ERR("Error while registereing to X11");
-  } else {
-   ROAR_INFO("Successfully registered to X11", ROAR_DBG_INFO_INFO);
-  }
- }
-
- roar_x11_disconnect(x11con);
-
- return ret;
-}
-#endif
-
-// SLP:
-void register_slp_callback(SLPHandle hslp, SLPError errcode, void * cookie) {
- (void)hslp;
- /* return the error code in the cookie */
- *(SLPError*)cookie = errcode;
-}
-
-int register_slp (int unreg, const char * sockname) {
-#ifdef ROAR_HAVE_LIBSLP
- static int regged = 0;
- static const char * sn = NULL;
- SLPError err;
- SLPError callbackerr;
- SLPHandle hslp;
- char addr[1024];
- char attr[1024] = "";
- char * location;
- char * description;
- char * standards;
-
- if ( sockname != NULL )
-  sn = sockname;
-
- snprintf(addr, sizeof(addr), ROAR_SLP_URL_TYPE_ROAR "://%s", sn);
-
- err = SLPOpen("en", SLP_FALSE, &hslp);
-
- if (err != SLP_OK) {
-  ROAR_ERR("Error opening slp handle: Error #%i", err);
-  return -1;
- }
-
- if (!unreg) {
-
-  if ( SLPEscape(g_config->location, &location, SLP_FALSE) != SLP_OK ) {
-   ROAR_ERR("Error using SLPEscape() on server location, really bad!");
-   SLPClose(hslp);
-   return -1;
-  }
-
-  if ( SLPEscape(g_config->description, &description, SLP_FALSE) != SLP_OK ) {
-   ROAR_ERR("Error using SLPEscape() on server location, really bad!");
-   SLPClose(hslp);
-   return -1;
-  }
-
-  standards = stds_string();
-
-  if ( standards == NULL ) {
-   if ( (standards = roar_mm_malloc(1)) == NULL ) {
-    SLPClose(hslp);
-    return -1;
-   }
-   standards[0] = 0;
-  }
-
-  snprintf(attr, sizeof(attr), "(wave-rate=%i),(wave-channels=%i),(wave-bits=%i),"
-#ifndef ROAR_WITHOUT_DCOMP_LIGHT
-                               "(light-channels=%i),"
-#endif
-                               "(standards=%s),"
-                               "(location=%s),(description=%s)",
-           g_sa->rate, g_sa->channels, g_sa->bits,
-#ifndef ROAR_WITHOUT_DCOMP_LIGHT
-           g_light_state.channels,
-#endif
-           standards,
-           location, description
-          );
-
-  roar_mm_free(standards);
-
-  /* Register a service with SLP */
-  err = SLPReg(hslp,
-               addr,
-               SLP_LIFETIME_MAXIMUM,
-               0,
-               attr,
-               SLP_TRUE,
-               register_slp_callback,
-               &callbackerr);
-  regged = 1;
- } else if ( unreg && regged ) {
-  err = SLPDereg(hslp, addr, register_slp_callback, &callbackerr);
-  regged = 0;
- } else {
-  SLPClose(hslp);
-  return -1;
- }
-
- /* err may contain an error code that occurred as the slp library    */
- /* _prepared_ to make the call.                                     */
- if ( err != SLP_OK ) {
-  ROAR_ERR("Error (de)registering service with slp: Error #%i", err);
-  return -1;
- }
-
- /* callbackerr may contain an error code (that was assigned through */
- /* the callback cookie) that occurred as slp packets were sent on    */
- /* the wire */
- if (callbackerr != SLP_OK) {
-  ROAR_ERR("Error (de)registering service with slp: Error #%i", callbackerr);
-  return -1;
- }
-
- SLPClose(hslp);
- return 0;
-#else
- return -1;
-#endif
-}
-
-static int auth_setup (enum roard_client_acclev none_acclev,
-                       enum roard_client_acclev trust_acclev, int trust_root, uid_t trust_uid, gid_t trust_gid) {
- union auth_typeunion * key;
- size_t i;
-
- // Info:
- // if a authlevel is <= ACCLEV_IDENTED we do not need to add this to the keyring
- // as ACCLEV_IDENTED is already gained if IDENTIFY call was done correctly.
-
- if ( !(none_acclev <= ACCLEV_IDENTED) ) {
-  if ( auth_addkey_anonymous(none_acclev) == -1 )
-   return -1;
- }
-
- if ( !(trust_acclev <= ACCLEV_IDENTED) ) {
-  if ( (key = auth_regkey_simple(ROAR_AUTH_T_TRUST, trust_acclev)) == NULL )
-   return -1;
-
-  // zerosize all counters.
-  memset(key, 0, sizeof(union auth_typeunion));
-
-  i = 0;
-
-  if ( trust_uid != (uid_t)-1 )
-   key->trust.uids[i++] = trust_uid;
-
-#ifdef ROAR_ROOT_UID
-  if ( trust_root )
-   key->trust.uids[i++] = ROAR_ROOT_UID;
-#endif
-
-  key->trust.uids_len = i;
-
-  i = 0;
-
-  if ( trust_gid != (gid_t)-1 )
-   key->trust.gids[i++] = trust_gid;
-
-  key->trust.gids_len = i;
- }
-
- return 0;
-}
-
-
-#if defined(ROAR_HAVE_MAIN_ARGS) && !defined(ROAR_WITHOUT_DCOMP_LIGHT)
-struct light_filter {
- const char * name;
- char * para;
-};
-
-static int light_filter_add(int primary, struct light_filter * filter) {
- struct roar_keyval * kv;
- ssize_t kvlen;
- int ret;
- int err;
-
- if ( filter->para == NULL ) {
-  kvlen = -1;
-  kv = NULL;
- } else {
-  kvlen = roar_keyval_split(&kv, filter->para, NULL, NULL, 1);
-  if ( kvlen == -1 ) {
-   ROAR_ERR("light_filter_add(primar=%i, filter={name='%s', para=%p}): Can not split string: %s", primary, filter->name, filter->para, roar_errorstring);
-   return -1;
-  }
- }
-
- ret = light_filter_load(primary, filter->name, 1, kv, kvlen);
- err = roar_error;
- if ( kv != NULL )
-  roar_mm_free(kv);
-
- if ( ret == -1 ) {
-  roar_err_set(err);
-  ROAR_ERR("light_filter_add(primary=%i, filter={name='%s', para=%p}): Can not load filter: %s", primary, filter->name, filter->para, roar_errorstring);
-  return -1;
- }
-
- return 0;
-}
-#endif
-
-// MAIN:
-
-#ifdef ROAR_HAVE_MAIN_ARGS
 int main (int argc, char * argv[]) {
-#else
-int main (void) {
-#endif
-#ifdef ROAR_HAVE_MAIN_ARGS
- enum metaaction metaaction = MA_ACTION;
- enum action action = START;
  int i;
  char * k;
- enum output_format print_format = FORMAT_NATIVE;
- const struct rolestack * rolestack;
- const char * plugin_args = NULL;
-#endif
-#if defined(ROAR_SUPPORT_LISTEN) && defined(ROAR_HAVE_GETUID)
- char user_sock[80]  = {0};
-#endif
- struct roar_audio_info sa, max_sa;
- struct roard_config config;
-#if defined(ROAR_HAVE_FORK) || defined(ROAR_TARGET_WIN32)
- int    daemon       = 0;
-#endif
- int_least32_t watchdog_time = 0; // -1: default, 0: disabled, > 0: user set time.
- int    realtime     = 0;
- int    sysclocksync = 0;
-// char * server = ROAR_DEFAULT_SOCK_GLOBAL;
-#ifdef ROAR_SUPPORT_LISTEN
- int    port       = ROAR_DEFAULT_PORT;
- const char * sock_addr  = NULL;
- int    sock_proto = ROAR_PROTO_ROARAUDIO;
- int    sock_dir   = -1;
- struct roar_audio_info sock_info = {0, 0, 0, 0};
-#endif
-#ifndef ROAR_WITHOUT_DCOMP_SOURCES
- char * s_drv     = NULL;
- char * s_dev     = NULL;
- char * s_con     = NULL;
- char * s_opt     = NULL;
- int    s_prim    = 0;
-#endif
- char * o_drv     = NULL;
- char * o_dev     = NULL;
- char * o_opts    = NULL;
- int    o_prim    = 0;
- int    o_count   = 0;
-#ifndef ROAR_WITHOUT_DCOMP_MIXER
- char * m_drv     = NULL;
- char * m_dev     = NULL;
- char * m_opts    = NULL;
- int    m_prim    = 0;
- int    m_count   = 0;
-#endif
- enum roard_client_acclev none_acclev  = ACCLEV_ALL;
- enum roard_client_acclev trust_acclev = ACCLEV_ALL;
- int                      trust_root   = 1;
- char * af_file                        = NULL;
- char * af_type                        = NULL;
- enum af_mode af_mode                  = AF_MODE_NONE;
- enum roard_client_acclev af_acclev    = ACCLEV_ALL;
-#ifndef ROAR_WITHOUT_DCOMP_LIGHT
- uint32_t light_channels = LIGHT_CHANNELS_DEFAULT;
-#endif
-#ifdef ROAR_DEFAULT_SOCKGRP
- char * sock_grp  = ROAR_DEFAULT_SOCKGRP;
-#else
- char * sock_grp  = NULL;
-#endif
- char * sock_user = NULL;
-#ifdef ROAR_SUPPORT_LISTEN
- int    sock_type = ROAR_SOCKET_TYPE_UNKNOWN;
-#endif
-#ifdef ROAR_HAVE_LIBSLP
- int    reg_slp   = 0;
-#endif
-#ifdef ROAR_HAVE_LIBX11
- int    reg_x11   = 0;
-#endif
-#ifdef ROAR_HAVE_CHROOT
- char * chrootdir = NULL;
-#endif
-#if defined(ROAR_HAVE_SETGID) && defined(ROAR_HAVE_IO_POSIX)
- struct group   * grp  = NULL;
-#endif
-#if defined(ROAR_HAVE_SETUID) && defined(ROAR_HAVE_IO_POSIX)
- struct passwd  * pwd  = NULL;
-#endif
-#ifdef ROAR_HAVE_GETSERVBYNAME
- struct servent * serv = NULL;
-#endif
- struct roar_client * self = NULL;
-#ifdef ROAR_HAVE_LIBDNET
- char decnethost[80];
-#endif
-#ifdef SUPPORT_PIDFILE
- struct roar_vio_calls pidfile_vio;
-#endif
-#if defined(ROAR_HAVE_MAIN_ARGS) && !defined(ROAR_WITHOUT_DCOMP_LIGHT)
- struct light_filter light_filter[32] = {{"chain", NULL}};
- int    light_filter_count = 1;
- char * light_filter_para  = NULL;
-#endif
+ struct roar_audio_info sa;
+ char * driver = NULL;
+ char * device = NULL;
+ char * opts   = NULL;
+ char * server = ROAR_DEFAULT_HOST;
+ int      port = ROAR_DEFAULT_PORT;
+ int               drvid;
+ char * s_dev  = NULL;
+ char * s_con  = NULL;
+ char * s_opt  = NULL;
+ int    s_prim = 0;
+ DRIVER_USERDATA_T drvinst;
 
- ROAR_DBG("main(*): starting roard...");
+ g_listen_socket = -1;
+ g_standby       =  0;
 
-// NOTE: those to lions can generate a memory leak. The OS will clean that up on exit.
- if ( roar_env_get("ROAR_DRIVER") != NULL )
-  o_drv = roar_mm_strdup(roar_env_get("ROAR_DRIVER"));
- if ( roar_env_get("ROAR_DEVICE") != NULL )
-  o_dev = roar_mm_strdup(roar_env_get("ROAR_DEVICE"));
+ sa.bits     = ROAR_BITS_DEFAULT;
+ sa.channels = ROAR_CHANNELS_DEFAULT;
+ sa.rate     = ROAR_RATE_DEFAULT;
+ sa.codec    = ROAR_CODEC_DEFAULT;
 
- g_standby       =  0;
- g_autostandby   =  0;
- alive           =  1;
-#ifdef ROAR_SUPPORT_LISTEN
- g_no_listen     =  0;
-#else
- g_terminate     =  1;
-#endif
+ g_sa = &sa;
 
- g_verbose       = ROAR_DBG_INFO_NONE;
-
- _LIBROAR_IGNORE_RET(roar_profile2info(&sa, "default-server"));
-
- g_sa        = &sa;
- g_max_sa    = &max_sa;
-
- memcpy(g_max_sa, g_sa, sizeof(max_sa));
-
- counters_init();
-
- g_config = &config;
-
- if ( init_config() == -1 ) {
-  ROAR_ERR("Can not init default config!");
+ if ( sources_init() == -1 ) {
+  ROAR_ERR("Can not init sources!");
   return 1;
  }
 
- // load config
- _LIBROAR_IGNORE_RET(roar_libroar_get_config());
+ for (i = 1; i < argc; i++) {
+  k = argv[i];
 
- // init notify core:
- // TODO: reconsider number of lists.
- if ( roar_notify_core_new_global(-1) == -1 ) {
-  ROAR_ERR("Can not init notify core!");
+  if ( strcmp(k, "-h") == 0 || strcmp(k, "--help") == 0 ) {
+   usage();
+   return 0;
+
+  } else if ( strcmp(k, "-R") == 0 || strcmp(k, "--rate") == 0 ) {
+   sa.rate = atoi(argv[++i]);
+  } else if ( strcmp(k, "-B") == 0 || strcmp(k, "--bits") == 0 ) {
+   sa.bits = atoi(argv[++i]);
+  } else if ( strcmp(k, "-C") == 0 || strcmp(k, "--chans") == 0 ) {
+   sa.channels = atoi(argv[++i]);
+
+  } else if ( strcmp(k, "-d") == 0 || strcmp(k, "--driver") == 0 ) {
+   driver = argv[++i];
+   if ( strcmp(driver, "list") == 0 ) {
+    print_driverlist();
+   }
+  } else if ( strcmp(k, "-D") == 0 || strcmp(k, "--device") == 0 ) {
+   device = argv[++i];
+  } else if ( strcmp(k, "-dO") == 0 ) {
+   opts = argv[++i];
+
+  } else if ( strcmp(k, "-s") == 0 || strcmp(k, "--source") == 0 ) {
+   k = argv[++i];
+   if ( sources_add(k, s_dev, s_con, s_opt, s_prim) == -1 ) {
+    ROAR_ERR("main(*): adding source '%s' via '%s' failed!", s_dev, k);
+   }
+   s_opt = s_dev = s_con = NULL;
+   s_prim = 0;
+  } else if ( strcmp(k, "-S") == 0 ) {
+   s_dev = argv[++i];
+  } else if ( strcmp(k, "-sO") == 0 ) {
+   s_opt = argv[++i];
+  } else if ( strcmp(k, "-sC") == 0 ) {
+   s_con = argv[++i];
+  } else if ( strcmp(k, "-sP") == 0 ) {
+   s_prim = 1;
+
+  } else if ( strcmp(k, "-p") == 0 || strcmp(k, "--port") == 0 ) {
+   port = atoi(argv[++i]);
+  } else if ( strcmp(k, "-b") == 0 || strcmp(k, "--bind") == 0 ) {
+   server = argv[++i];
+
+  } else {
+   usage();
+   return 1;
+  }
+
+ }
+
+ ROAR_DBG("Server config: rate=%i, bits=%i, chans=%i", sa.rate, sa.bits, sa.channels);
+
+ if ( (g_listen_socket = roar_socket_listen(ROAR_SOCKET_TYPE_UNKNOWN, server, port)) == -1 ) {
+  ROAR_ERR("Can not open listen socket!");
   return 1;
  }
 
- if ( roar_notify_core_register_proxy(NULL, roar_notify_proxy_std, NULL) == -1 ) {
-  ROAR_ERR("Can not init notify core!");
+ if ( output_buffer_init(&sa) == -1 ) {
+  ROAR_ERR("Can not init output buffer!");
   return 1;
  }
 
- rolestack_init();
-
- if ( auth_init() == -1 ) {
-  ROAR_ERR("Can not init auth subsystem!");
+ if ( driver_open(&drvinst, &drvid, driver, device, &sa) == -1 ) {
+  ROAR_ERR("Can not open output driver!");
   return 1;
  }
-
-#ifdef ROAR_SUPPORT_LISTEN
- if ( init_listening() == -1 ) {
-  ROAR_ERR("Can not init listening sockets!");
-  return 1;
- }
-#endif
-
-#ifndef ROAR_WITHOUT_DCOMP_MIDI
- if ( midi_init_config() == -1 ) {
-  ROAR_ERR("Can not init MIDI config!");
-  return 1;
- }
-#endif
-
-#ifndef ROAR_WITHOUT_DCOMP_SSYNTH
- if ( ssynth_init_config() == -1 ) {
-  ROAR_ERR("Can not init ssynth config!");
-  return 1;
- }
-#endif
-
-#ifndef ROAR_WITHOUT_DCOMP_RDTCS
- if ( rdtcs_init_config() == -1 ) {
-  ROAR_ERR("Can not init RDTCS config!");
-  return 1;
- }
-#endif
-
- if ( plugins_preinit() == -1 ) {
-  ROAR_ERR("Can not pre-init plugins!");
-  return 1;
- }
-
-#ifdef ROAR_SUPPORT_LISTEN
-#ifndef ROAR_TARGET_WIN32
- sock_addr = ROAR_DEFAULT_SOCK_GLOBAL;
-#else
- sock_addr = ROAR_DEFAULT_HOST;
-#endif
-
-#ifdef ROAR_HAVE_GETUID
- if ( getuid() != 0 && roar_env_get("HOME") != NULL ) {
-/*
-  snprintf(user_sock, 79, "%s/%s", (char*)getenv("HOME"), ROAR_DEFAULT_SOCK_USER);
-*/
-  if ( roar_env_render_path_r(user_sock, sizeof(user_sock), "~/" ROAR_DEFAULT_SOCK_USER) == -1 ) {
-   strncpy(user_sock, "/NX-SOCK", sizeof(user_sock));
-  }
-  sock_addr = user_sock;
-  ROAR_DBG("main(*): setting sock_addr='%s'", sock_addr);
- }
-#endif
-
- if ( roar_env_get("ROAR_SERVER") != NULL )
-  sock_addr = roar_env_get("ROAR_SERVER");
-#endif
 
  if ( clients_init() == -1 ) {
@@ -1563,1216 +143,34 @@
 
  if ( streams_init() == -1 ) {
-  ROAR_ERR("Can not init streams!");
+  ROAR_ERR("Can not nit streams!");
   return 1;
  }
 
- if ( (g_self_client = clients_new()) == -1 ) {
-  ROAR_ERR("Can not create self client!");
-  return 1;
- }
-
-#ifndef ROAR_WITHOUT_DCOMP_SOURCES
- if ( sources_init() == -1 ) {
-  ROAR_ERR("Can not init sources!");
-  return 1;
- }
-
- if ( (sources_set_client(g_self_client)) == -1 ) {
-  ROAR_ERR("Can not init set source client!");
-  return 1;
- }
-#endif
-
-#ifdef ROAR_HAVE_MAIN_ARGS
- for (i = 1; i < argc; i++) {
-  k = argv[i];
-
-  if ( strcmp(k, "-h") == 0 || strcmp(k, "--help") == 0 ) {
-   usage();
-   return 0;
-
-  } else if ( strcmp(k, "--start") == 0 ) {
-   // this is a no op
-   action = START;
-  } else if ( strcmp(k, "--restart") == 0 ) {
-   action = RESTART;
-#ifdef ROAR_SUPPORT_LISTEN
-   if ( restart_server(sock_addr, 1) == -1 ) {
-    ROAR_WARN("Can not terminate old server (not running at %s?), will retry later.", sock_addr);
-    action = RESTART_RETRY;
-   }
-#else
-   ROAR_ERR("--restart not supported");
-#endif
-  } else if ( strcmp(k, "--shutdown") == 0 ) {
-   action = SHUTDOWN;
-  } else if ( strcmp(k, "--stop") == 0 ) {
-   action = STOP;
+ signal(SIGINT,  on_sig_int);
+ signal(SIGPIPE, SIG_IGN);  // ignore broken pipes
 
 
-  } else if ( strcmp(k, "--demon") == 0 || strcmp(k, "--daemon") == 0 ) {
-#if defined(ROAR_HAVE_FORK) || defined(ROAR_TARGET_WIN32)
-   daemon = 1;
-#else
-   ROAR_ERR("--daemon not supported");
-#endif
-  } else if ( strcmp(k, "--verbose") == 0 ) {
-   g_verbose++;
-
-  } else if ( strcmp(k, "--print-format") == 0 ) {
-   k = argv[++i];
-   if ( !strcasecmp(k, "native") ) {
-    print_format = FORMAT_NATIVE;
-   } else if ( !strcasecmp(k, "wiki") ) {
-    print_format = FORMAT_WIKI;
-   } else if ( !strcasecmp(k, "csv") ) {
-    print_format = FORMAT_CSV;
-   } else {
-    ROAR_WARN("Unknown print format: %s", k);
-   }
-
-  } else if ( strcmp(k, "--print-format") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-
-  } else if ( strcmp(k, "--terminate") == 0 ) {
-   g_terminate = 1;
-  } else if ( strcmp(k, "--sysclocksync") == 0 ) {
-   sysclocksync = 1000;
-  } else if ( strcmp(k, "--realtime") == 0 ) {
-   realtime++;
-  } else if ( strcmp(k, "--memlock") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   g_config->memlock_level = memlock_str2level(argv[++i]);
-  } else if ( strcmp(k, "--watchdog") == 0 ) {
-   if ( watchdog_time == 0 )
-    watchdog_time = -1;
-  } else if ( strcmp(k, "--watchdog-time") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-    watchdog_time = atoi(argv[++i]);
-  } else if ( strcmp(k, "--chroot") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-#ifdef ROAR_HAVE_CHROOT
-   chrootdir = argv[++i];
-#else
-   ROAR_ERR("--chroot not supported");
-   i++;
-#endif
-  } else if ( strcmp(k, "--setgid") == 0 ) {
-#ifdef ROAR_HAVE_SETGID
-   setids |= R_SETGID;
-#else
-   ROAR_ERR("--setgid not supported");
-#endif
-  } else if ( strcmp(k, "--setuid") == 0 ) {
-#ifdef ROAR_HAVE_SETUID
-   setids |= R_SETUID;
-#else
-   ROAR_ERR("--setuid not supported");
-#endif
-  } else if ( strcmp(k, "--location") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   g_config->location = argv[++i];
-  } else if ( strcmp(k, "--description") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   g_config->description = argv[++i];
-  } else if ( strcmp(k, "--contact") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   g_config->contact = argv[++i];
-  } else if ( strcmp(k, "--serial") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   g_config->serial = argv[++i];
-  } else if ( strcmp(k, "--uiurl") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   g_config->uiurl = argv[++i];
-  } else if ( strcmp(k, "--pidfile") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-#ifdef SUPPORT_PIDFILE
-   pidfile = argv[++i];
-#else
-   ROAR_ERR("--pidfile not supported");
-   i++;
-#endif
-  } else if ( strcmp(k, "--log-syslog") == 0 ) {
-#ifdef ROAR_HAVE_SYSLOG
-   roar_debug_set_stderr_mode(ROAR_DEBUG_MODE_SYSLOG);
-#else
-   ROAR_ERR("--log-syslog not supported");
-#endif
-  } else if ( strcmp(k, "--script-postdown") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-#ifdef ROAR_HAVE_SYSTEM
-   g_config->scripts.post_shutdown = argv[++i];
-#else
-   ROAR_ERR("--script-postdown not supported");
-   i++;
-#endif
-
-
-  } else if ( strcmp(k, "--plugin-load") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   if ( plugins_load(argv[++i], plugin_args) == -1 ) {
-    ROAR_ERR("Can not load plugin");
-   }
-   plugin_args = NULL;
-  } else if ( strcmp(k, "--plugin-args") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   plugin_args = argv[++i];
-  } else if ( strcmp(k, "--list-plugins") == 0 ) {
-   metaaction = MA_LIST_PLUGIN;
-
-  } else if ( strcmp(k, "--light-filter-load") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   if ( light_filter_count == (sizeof(light_filter)/sizeof(*light_filter)) ) {
-    ROAR_ERR("Can not load any more light filters: %s", argv[++i]);
-   } else {
-    light_filter[light_filter_count].name = argv[++i];
-    light_filter[light_filter_count].para = light_filter_para;
-    light_filter_count++;
-   }
-   light_filter_para = NULL;
-  } else if ( strcmp(k, "--light-filter-load-primary") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   light_filter[0].name = argv[++i];
-   light_filter[0].para = light_filter_para;
-  } else if ( strcmp(k, "--light-filter-args") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   light_filter_para = argv[++i];
-
-  } else if ( strcmp(k, "--guest-acclev") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   none_acclev = clients_str2acclev(argv[++i]);
-   if ( none_acclev == -1 ) {
-    ROAR_ERR("Invalid access level: %s", argv[i]);
-    return 1;
-   }
-  } else if ( strcmp(k, "--trust-acclev") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   trust_acclev = clients_str2acclev(argv[++i]);
-   if ( trust_acclev == -1 ) {
-    ROAR_ERR("Invalid access level: %s", argv[i]);
-    return 1;
-   }
-  } else if ( strcmp(k, "--trust-root") == 0 ) {
-   trust_root = 1;
-  } else if ( strcmp(k, "--no-trust-root") == 0 ) {
-   trust_root = 0;
-
-  } else if ( strcmp(k, "--authfile-gen") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   af_file = argv[++i];
-   af_mode = AF_MODE_GEN;
-  } else if ( strcmp(k, "--authfile-load") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   af_file = argv[++i];
-   af_mode = AF_MODE_LOAD;
-  } else if ( strcmp(k, "--authfile-type") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   af_type = argv[++i];
-  } else if ( strcmp(k, "--authfile-acclev") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   af_acclev = clients_str2acclev(argv[++i]);
-  } else if ( strcmp(k, "--new-authfile") == 0 ) {
-   if ( af_mode != AF_MODE_NONE ) {
-    if ( add_authfile(af_file, af_type, af_mode, af_acclev) == -1 ) {
-     ROAR_ERR("main(*): adding authfile '%s' failed!", af_file);
-    }
-   }
-   af_file   = NULL;
-   af_type   = NULL;
-   af_mode   = AF_MODE_NONE;
-   af_acclev = ACCLEV_ALL;
-
-  } else if ( strcmp(k, "--list-cf") == 0 ) {
-   print_codecfilterlist();
-   return 0;
-
-  } else if ( strcmp(k, "-R") == 0 || strcmp(k, "--rate") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   sa.rate = atoi(argv[++i]);
-  } else if ( strcmp(k, "-B") == 0 || strcmp(k, "--bits") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   sa.bits = atoi(argv[++i]);
-  } else if ( strcmp(k, "-C") == 0 || strcmp(k, "--chans") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   sa.channels = atoi(argv[++i]);
-
-  } else if ( strcmp(k, "--aiprofile") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   if ( roar_profile2info(&sa, argv[++i]) == -1 ) {
-    ROAR_ERR("Unknown audio profile: %s", argv[i]);
-    return 1;
-   }
-   sa.codec    = ROAR_CODEC_DEFAULT;
-
-  } else if ( strcmp(k, "--stream-flags") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   if ( update_stream_flags(argv[++i]) == -1 ) {
-    ROAR_ERR("Can not set stream flags");
-    return 1;
-   }
-
-  } else if ( strcmp(k, "--list-rolestack") == 0 ) {
-   print_rolestack();
-   return 0;
-  } else if ( strcmp(k, "--rolestack-push") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-  if ( (rolestack = rolestack_parse(argv[++i])) == NULL ) {
-   ROAR_ERR("Can not parse rolestack request: %s", roar_error2str(roar_error));
-  } else {
-   if ( rolestack_push(rolestack) == -1 ) {
-    ROAR_ERR("Can not push request to rolestack: %s", roar_error2str(roar_error));
-   }
-  }
-
-  } else if ( strcmp(k, "--list-aiprofiles") == 0 ) {
-   list_aiprofiles();
-   return 0;
-
-  } else if ( strcmp(k, "--list-driver") == 0 ) {
-   print_driverlist(print_format);
-   return 0;
-
-  } else if ( strcmp(k, "-o") == 0 || strcmp(k, "--odriver") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   o_drv  = argv[++i];
-  } else if ( strcmp(k, "-O") == 0 || strcmp(k, "--odevice") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   o_dev  = argv[++i];
-  } else if ( strcmp(k, "-oO") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   o_opts = argv[++i];
-  } else if ( strcmp(k, "-oP") == 0 ) {
-   o_prim = 1;
-  } else if ( strcmp(k, "-oN") == 0 ) {
-   if ( action == START || action == RESTART ) {
-    if ( output_add(o_drv, o_dev, o_opts, o_prim, o_count) != -1 )
-     o_count++;
-
-    o_drv  = o_dev = o_opts = NULL;
-    o_prim = 0;
-   }
-
-  } else if ( strcmp(k, "-s") == 0 || strcmp(k, "--source") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-#ifndef ROAR_WITHOUT_DCOMP_SOURCES
-   s_drv = argv[++i];
-#else
-   ROAR_ERR("main(*): No support for sources compiled in");
-   i++;
-#endif
-  } else if ( strcmp(k, "-S") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-#ifndef ROAR_WITHOUT_DCOMP_SOURCES
-   s_dev = argv[++i];
-#else
-   ROAR_ERR("main(*): No support for sources compiled in");
-   i++;
-#endif
-  } else if ( strcmp(k, "-sO") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-#ifndef ROAR_WITHOUT_DCOMP_SOURCES
-   s_opt = argv[++i];
-#else
-   ROAR_ERR("main(*): No support for sources compiled in");
-   i++;
-#endif
-  } else if ( strcmp(k, "-sC") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-#ifndef ROAR_WITHOUT_DCOMP_SOURCES
-   s_con = argv[++i];
-#else
-   ROAR_ERR("main(*): No support for sources compiled in");
-   i++;
-#endif
-  } else if ( strcmp(k, "-sP") == 0 ) {
-#ifndef ROAR_WITHOUT_DCOMP_SOURCES
-   s_prim = 1;
-#else
-   ROAR_ERR("main(*): No support for sources compiled in");
-#endif
-  } else if ( strcmp(k, "-sN") == 0 ) {
-#ifndef ROAR_WITHOUT_DCOMP_SOURCES
-   if ( sources_add(s_drv, s_dev, s_con, s_opt, s_prim) == -1 ) {
-    ROAR_ERR("main(*): adding source '%s' via '%s' failed!", s_dev, s_drv);
-   }
-   s_opt = s_dev = s_con = NULL;
-   s_drv = NULL;
-   s_prim = 0;
-#else
-   ROAR_ERR("main(*): No support for sources compiled in");
-#endif
-  } else if ( strcmp(k, "--list-sources") == 0 ) {
-#ifndef ROAR_WITHOUT_DCOMP_SOURCES
-   print_sourcelist();
-   return 0;
-#else
-   ROAR_ERR("main(*): No support for sources compiled in");
-   return 1;
-#endif
-
-  } else if ( strcmp(k, "-m") == 0 || strcmp(k, "--mixer") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-#ifndef ROAR_WITHOUT_DCOMP_MIXER
-   m_drv  = argv[++i];
-#else
-   ROAR_ERR("main(*): No support for mixer compiled in");
-   return 1;
-#endif
-  } else if ( strcmp(k, "-M") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-#ifndef ROAR_WITHOUT_DCOMP_MIXER
-   m_dev  = argv[++i];
-#else
-   ROAR_ERR("main(*): No support for mixer compiled in");
-   return 1;
-#endif
-  } else if ( strcmp(k, "-mO") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-#ifndef ROAR_WITHOUT_DCOMP_MIXER
-   m_opts = argv[++i];
-#else
-   ROAR_ERR("main(*): No support for mixer compiled in");
-   return 1;
-#endif
-  } else if ( strcmp(k, "-mP") == 0 ) {
-#ifndef ROAR_WITHOUT_DCOMP_MIXER
-   m_prim = 1;
-#else
-   ROAR_ERR("main(*): No support for mixer compiled in");
-   return 1;
-#endif
-  } else if ( strcmp(k, "-mN") == 0 ) {
-#ifndef ROAR_WITHOUT_DCOMP_MIXER
-   if ( hwmixer_add(m_drv, m_dev, m_opts, m_prim, m_count) != -1 )
-    m_count++;
-
-   m_drv  = o_dev = o_opts = NULL;
-   m_prim = 0;
-#else
-   ROAR_ERR("main(*): No support for mixer compiled in");
-   return 1;
-#endif
-  } else if ( strcmp(k, "--list-mixers") == 0 ) {
-#ifndef ROAR_WITHOUT_DCOMP_MIXER
-   print_hwmixerlist();
-   return 0;
-#else
-   ROAR_ERR("main(*): No support for mixer compiled in");
-   return 1;
-#endif
-
-  } else if ( strcmp(k, "--light-channels") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-#ifndef ROAR_WITHOUT_DCOMP_LIGHT
-   light_channels = atoi(argv[++i]);
-#else
-   ROAR_WARN("main(*): no light subsystem compiled in");
-   i++;
-#endif
-
-  } else if ( strcmp(k, "--rds-pi") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-#ifndef ROAR_WITHOUT_DCOMP_RDTCS
-   g_rdtcs.rds.pi = atoi(argv[++i]);
-#else
-   ROAR_WARN("main(*): no RDTCS subsystem compiled in");
-   i++;
-#endif
-  } else if ( strcmp(k, "--rds-ps") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-#ifndef ROAR_WITHOUT_DCOMP_RDTCS
-   if ( rdtcs_rds_set_ps(argv[++i]) == -1 ) {
-    ROAR_ERR("Can not set RDS PS to '%s' (longer than 8 chars?)", argv[i]);
-    return 1;
-   }
-#else
-   ROAR_WARN("main(*): no RDTCS subsystem compiled in");
-   i++;
-#endif
-  } else if ( strcmp(k, "--rds-pty") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-#ifndef ROAR_WITHOUT_DCOMP_RDTCS
-   if ( rdtcs_rds_set_pty(argv[++i]) == -1 ) {
-    ROAR_ERR("Can not set RDS PTY to '%s'", argv[i]);
-    return 1;
-   }
-#else
-   ROAR_WARN("main(*): no RDTCS subsystem compiled in");
-   i++;
-#endif
-  } else if ( strcmp(k, "--rds-tp") == 0 ) {
-#ifndef ROAR_WITHOUT_DCOMP_RDTCS
-   if ( rdtcs_rds_set_flag(RDTCS_RDS_FLAG_TP, 0) == -1 ) {
-    ROAR_ERR("Can not set RDS TP flag");
-    return 1;
-   }
-#else
-   ROAR_WARN("main(*): no RDTCS subsystem compiled in");
-#endif
-  } else if ( strcmp(k, "--rds-ct") == 0 ) {
-#ifndef ROAR_WITHOUT_DCOMP_RDTCS
-   if ( rdtcs_rds_set_flag(RDTCS_RDS_FLAG_CT, 0) == -1 ) {
-    ROAR_ERR("Can not set RDS CT flag");
-    return 1;
-   }
-#else
-   ROAR_WARN("main(*): no RDTCS subsystem compiled in");
-#endif
-
-
-  } else if ( strcmp(k, "--midi-no-console") == 0 ) {
-#ifndef ROAR_WITHOUT_DCOMP_CB
-   midi_config.init_cb = 0;
-#else
-   // no warning here as this is the disable option
-#endif
-  } else if ( strcmp(k, "--midi-console-enable") == 0 ) {
-#ifndef ROAR_WITHOUT_DCOMP_CB
-   midi_config.init_cb = 1;
-#else
-   ROAR_ERR("main(*): No support for MIDI subsystem part CB compiled in");
-#endif
-  } else if ( strcmp(k, "--midi-console") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-#ifndef ROAR_WITHOUT_DCOMP_CB
-   midi_config.console_dev = argv[++i];
-   midi_config.init_cb = 1;
-#else
-   ROAR_ERR("main(*): No support for MIDI subsystem part CB compiled in");
-   i++;
-#endif
-
-  } else if ( strcmp(k, "--ssynth-enable") == 0 ) {
-#ifndef ROAR_WITHOUT_DCOMP_SSYNTH
-   ssynth_conf.enable = 1;
-#else
-   ROAR_ERR("main(*): No support for ssynth compiled in");
-#endif
-  } else if ( strcmp(k, "--ssynth-disable") == 0 ) {
-#ifndef ROAR_WITHOUT_DCOMP_SSYNTH
-   ssynth_conf.enable = 0;
-#else
-   // we can safely ignore the disable
-#endif
-
-  } else if ( strcmp(k, "--x11-display") == 0 || strcmp(k, "--display") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-#ifdef ROAR_HAVE_LIBX11
-   x11display = argv[++i];
-#else
-   ROAR_ERR("No X11 support compiled in!");
-   return 1;
-#endif
-
-
-  } else if ( strcmp(k, "-p") == 0 || strcmp(k, "--port") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   // This is only useful in INET not UNIX mode.
-#ifdef ROAR_SUPPORT_LISTEN
-   if ( *sock_addr == '/' )
-    sock_addr = ROAR_DEFAULT_HOST;
-
-   errno = 0;
-   if ( (port = atoi(argv[++i])) < 1 ) {
-#ifdef ROAR_HAVE_GETSERVBYNAME
-    if ( (serv = getservbyname(argv[i], "tcp")) == NULL ) {
-     ROAR_ERR("Unknown service: %s: %s", argv[i], strerror(errno));
-     return 1;
-    }
-    // NOTE: we need to use ROAR_NET2HOST16() here even if s_port is of type int!
-    ROAR_DBG("main(*): serv = {s_name='%s', s_aliases={...}, s_port=%i, s_proto='%s'}",
-            serv->s_name, ROAR_NET2HOST16(serv->s_port), serv->s_proto);
-    port = ROAR_NET2HOST16(serv->s_port);
-#else
-    ROAR_ERR("invalite port number: %s", argv[i]);
-    return 1;
-#endif
-   }
-#endif
-  } else if ( strcmp(k, "-b") == 0 || strcmp(k, "--bind") == 0 || strcmp(k, "--sock") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-#ifdef ROAR_SUPPORT_LISTEN
-   sock_addr = argv[++i];
-#else
-   i++;
-#endif
-
-  } else if ( strcmp(k, "--proto") == 0 ) {
-#ifdef ROAR_SUPPORT_LISTEN
-   if ( (sock_proto = roar_str2proto(argv[++i])) == -1 ) {
-    ROAR_ERR("Unknown protocol: %s", argv[i]);
-    return 1;
-   }
-#endif
-  } else if ( strcmp(k, "--proto-dir") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-#ifdef ROAR_SUPPORT_LISTEN
-   if ( (sock_dir = roar_str2dir(argv[++i])) == -1 ) {
-    ROAR_ERR("Unknown stream direction: %s", argv[i]);
-    return 1;
-   }
-#else
-   i++;
-#endif
-  } else if ( strcmp(k, "--proto-rate") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-#ifdef ROAR_SUPPORT_LISTEN
-   sock_info.rate = atoi(argv[++i]);
-#else
-   i++;
-#endif
-  } else if ( strcmp(k, "--proto-bits") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-#ifdef ROAR_SUPPORT_LISTEN
-   sock_info.bits = atoi(argv[++i]);
-#else
-   i++;
-#endif
-  } else if ( strcmp(k, "--proto-chans") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-#ifdef ROAR_SUPPORT_LISTEN
-   sock_info.channels = atoi(argv[++i]);
-#else
-   i++;
-#endif
-  } else if ( strcmp(k, "--proto-codec") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-#ifdef ROAR_SUPPORT_LISTEN
-   if ( (sock_info.codec = roar_str2codec(argv[++i])) == -1 ) {
-    ROAR_ERR("Unknown codec: %s", argv[i]);
-    return 1;
-   }
-#else
-   i++;
-#endif
-  } else if ( strcmp(k, "--proto-aiprofile") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-#ifdef ROAR_SUPPORT_LISTEN
-   if ( roar_profile2info(&sock_info, argv[++i]) == -1 ) {
-    ROAR_ERR("Unknown audio profile: %s", argv[i]);
-    return 1;
-   }
-#else
-   i++;
-#endif
-  } else if ( strcmp(k, "--list-profiles") == 0 ) {
-#ifdef ROAR_SUPPORT_LISTEN
-   listen_listen_profiles();
-   return 0;
-#endif
-  } else if ( strcmp(k, "--proto-profile") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-#ifdef ROAR_SUPPORT_LISTEN
-   if ( get_listen_profile(argv[++i], &port, &sock_addr, &sock_type, &sock_proto, &sock_dir, &sock_info) == -1 ) {
-    ROAR_ERR("Unknown listen profile: %s", argv[i]);
-    return 1;
-   }
-#else
-   i++;
-#endif
-
-
-  } else if ( strcmp(k, "--list-proto") == 0 ) {
-   metaaction = MA_LIST_PROTO;
-
-  } else if ( strcmp(k, "-t") == 0 || strcmp(k, "--tcp") == 0 ) {
-#ifdef ROAR_SUPPORT_LISTEN
-   if ( sock_type != ROAR_SOCKET_TYPE_TCP && sock_type != ROAR_SOCKET_TYPE_TCP6 )
-    sock_type = ROAR_SOCKET_TYPE_TCP;
-
-   if ( *sock_addr == '/' )
-    sock_addr = ROAR_DEFAULT_HOST;
-#endif
-
-  } else if ( strcmp(k, "-4") == 0 ) {
-#ifdef ROAR_SUPPORT_LISTEN
-   sock_type = ROAR_SOCKET_TYPE_TCP;
-   if ( *sock_addr == '/' )
-    sock_addr = ROAR_DEFAULT_HOST;
-#endif
-  } else if ( strcmp(k, "-6") == 0 ) {
-#ifdef ROAR_SUPPORT_LISTEN
-#ifdef AF_INET6
-   sock_type = ROAR_SOCKET_TYPE_TCP6;
-   if ( *sock_addr == '/' )
-    sock_addr = ROAR_DEFAULT_HOST;
-#else
-    ROAR_ERR("No IPv6 support compiled in!");
-    return 1;
-#endif
-#endif
-
-  } else if ( strcmp(k, "-u") == 0 || strcmp(k, "--unix") == 0 ) {
-#ifdef ROAR_SUPPORT_LISTEN
-   // ignore this case as it is the default behavor.
-   sock_type = ROAR_SOCKET_TYPE_UNIX;
-#endif
-
-  } else if ( strcmp(k, "-n") == 0 || strcmp(k, "--decnet") == 0 ) {
-#ifdef ROAR_SUPPORT_LISTEN
-#ifdef ROAR_HAVE_LIBDNET
-    port   = ROAR_DEFAULT_NUM;
-    strcpy(decnethost, ROAR_DEFAULT_LISTEN_OBJECT);
-    sock_addr = decnethost;
-    sock_type = ROAR_SOCKET_TYPE_DECNET;
-#else
-    ROAR_ERR("No DECnet support compiled in!");
-    return 1;
-#endif
-#endif
-  } else if ( strcmp(k, "--new-sock") == 0 ) {
-#ifdef ROAR_SUPPORT_LISTEN
-   if ( action == START || action == RESTART ) {
-    if ( add_listen(sock_addr, port, sock_type, sock_user, sock_grp, sock_proto, sock_dir, &sock_info) != 0 ) {
-     ROAR_ERR("Can not open listen socket!");
-     return 1;
-    }
-   }
-#endif
-
-  } else if ( strcmp(k, "--slp") == 0 ) {
-#ifdef ROAR_HAVE_LIBSLP
-   reg_slp = 1;
-#else
-   ROAR_ERR("No OpenSLP support compiled in!");
-   return 1;
-#endif
-
-  } else if ( strcmp(k, "--x11") == 0 ) {
-#ifdef ROAR_HAVE_LIBX11
-   reg_x11 = 1;
-#else
-   ROAR_ERR("No X11 support compiled in!");
-   return 1;
-#endif
-
-
-  } else if ( strcmp(k, "--jumbo-mtu") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   g_config->jumbo_mtu = atoi(argv[++i]);
-
-  } else if ( strcmp(k, "-G") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   sock_grp  = argv[++i];
-  } else if ( strcmp(k, "-U") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   sock_user = argv[++i];
-
-  } else if ( strcmp(k, "--no-listen") == 0 ) {
-#ifdef ROAR_SUPPORT_LISTEN
-   sock_addr   = "";
-   g_terminate = 1;
-   g_no_listen = 1;
-#endif
-  } else if ( strcmp(k, "--client-fh") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-   if ( clients_new_from_fh(atoi(argv[++i]), ROAR_PROTO_ROARAUDIO, ROAR_BYTEORDER_NETWORK, 1) == -1 ) {
-    ROAR_ERR("main(*): Can not set client's fh");
-    return 1;
-   }
-  } else if ( strcmp(k, "--close-fh") == 0 ) {
-   ROAR_CKHAVEARGS(1);
-#ifdef ROAR_HAVE_IO_POSIX
-   close(atoi(argv[++i]));
-#else
-   i++;
-   ROAR_WARN("can not close file handle %s (closing not supported)", argv[i]);
-#endif
-
-  } else if ( strcmp(k, "--standby") == 0 ) {
-   g_standby = 1;
-  } else if ( strcmp(k, "--auto-standby") == 0 ) {
-   g_autostandby = 1;
-  } else {
-   ROAR_ERR("Unknown option: %s", k);
-   usage();
-   return 1;
-  }
-
- }
-#endif
-
-#ifdef ROAR_HAVE_MAIN_ARGS
- if ( metaaction != MA_ACTION )
-  action = START;
-
- switch (action) {
-  case START:
-    // NO-OP.
-   break;
-  case RESTART:
-    // NO-OP, done before.
-   break;
-  case STOP:
-#ifdef ROAR_SUPPORT_LISTEN
-    if ( restart_server(sock_addr, 0) == -1 ) {
-     ROAR_WARN("Can not stop old server (not running at %s?)", sock_addr);
-     return 1;
-    }
-    return 0;
-#else
-    ROAR_ERR("--stop not supported");
-    return 1;
-#endif
-   break;
-  case SHUTDOWN:
-#ifdef ROAR_SUPPORT_LISTEN
-    if ( restart_server(sock_addr, 1) == -1 ) {
-     ROAR_WARN("Can not terminate old server (not running at %s?)", sock_addr);
-     return 1;
-    }
-    return 0;
-#else
-    ROAR_ERR("--shutdown not supported");
-    return 1;
-#endif
-   break;
-  case RESTART_RETRY:
-#ifdef ROAR_SUPPORT_LISTEN
-    if ( restart_server(sock_addr, 1) == -1 ) {
-     ROAR_WARN("Can not terminate old server (again) (not running at %s?), tring to continue anyway", sock_addr);
-     action = RESTART;
-    }
-#endif
-   break;
- }
-#endif
-
- // if g_verbose is high we load external debugging modules.
- if ( g_verbose >= 4 ) {
-  if ( plugins_load("debug-notify", NULL) == -1 ) {
-   ROAR_WARN("main(*): Can not load debugger plugin: %s", roar_error2str(roar_error));
-  }
- }
-
- if ( af_mode != AF_MODE_NONE ) {
-  if ( add_authfile(af_file, af_type, af_mode, af_acclev) == -1 ) {
-   ROAR_ERR("main(*): adding authfile '%s' failed!", af_file);
-  }
- }
-
-#ifndef ROAR_WITHOUT_DCOMP_MIXER
- if ( m_drv != NULL ) {
-  if ( hwmixer_add(m_drv, m_dev, m_opts, m_prim, m_count) == -1 ) {
-   ROAR_ERR("main(*): adding mixer '%s' via '%s' failed!", m_dev, m_drv);
-  }
- }
-#endif
-
-#ifndef ROAR_WITHOUT_DCOMP_SOURCES
- if ( s_drv != NULL || s_dev != NULL ) {
-  if ( sources_add(s_drv, s_dev, s_con, s_opt, s_prim) == -1 ) {
-   ROAR_ERR("main(*): adding source '%s' via '%s' failed!", s_dev, s_drv);
-  }
- }
-#endif
-
- if ( output_add_default(o_drv, o_dev, o_opts, o_prim, o_count) == -1 ) {
-  ROAR_ERR("Can not initialize default driver");
-  return 1;
- }
-
- ROAR_INFO("Server config: rate=%i, bits=%i, chans=%i", ROAR_DBG_INFO_NOTICE, sa.rate, sa.bits, sa.channels);
-
- if ( waveform_init() == -1 ) {
-  ROAR_ERR("Can not initialize Waveform subsystem");
-  return 1;
- }
-
-#ifndef ROAR_WITHOUT_DCOMP_MIDI
- if ( midi_init() == -1 ) {
-  ROAR_ERR("Can not initialize MIDI subsystem");
- }
-#endif
-
-#ifndef ROAR_WITHOUT_DCOMP_SSYNTH
- if ( ssynth_init() == -1 ) {
-  ROAR_ERR("Can not initialize ssynth subsystem");
- }
-#endif
-
-#ifndef ROAR_WITHOUT_DCOMP_LIGHT
- if ( light_init(light_channels) == -1 ) {
-  ROAR_ERR("Can not initialize light control subsystem");
- }
- light_filter_add(1, &(light_filter[0]));
- for (i = 1; i < light_filter_count; i++)
-  light_filter_add(0, &(light_filter[i]));
-#endif
-
-#ifndef ROAR_WITHOUT_DCOMP_RDTCS
- if ( rdtcs_init() == -1 ) {
-  ROAR_ERR("Can not initialize RDTCS subsystem");
- }
-#endif
-
- if ( plugins_init() == -1 ) {
-  ROAR_ERR("Can not initialize plugins");
- }
-
-#ifdef ROAR_SUPPORT_LISTEN
- if ( !g_no_listen ) {
-  if ( add_listen(sock_addr, port, sock_type, sock_user, sock_grp, sock_proto, sock_dir, &sock_info) != 0 ) {
-   ROAR_ERR("Can not open listen socket!");
-   return 1;
-  }
- }
-#endif
-
- if ( output_buffer_init(&sa) == -1 ) {
-  ROAR_ERR("Can not init output buffer!");
-  return 1;
- }
-
- if ( samples_init() == -1 ) {
-  ROAR_ERR("Can not init samples!");
-  return 1;
- }
-
- if ( check_listen() == -1 ) {
-  ROAR_ERR("Can not check listen sockets. BAD.");
-  return 1;
- }
-
-#ifdef ROAR_HAVE_MAIN_ARGS
- // check meta action now as everything is set up.
- switch (metaaction) {
-  case MA_ACTION: /* noop */; break;
-  case MA_LIST_PROTO:
-    print_protolist(print_format);
-    return 0;
-   break;
-  case MA_LIST_PLUGIN:
-    print_pluginlist(print_format);
-    return 0;
-   break;
- }
-#endif
-
- // we should handle this on microcontrollers, too.
-#if !defined(ROAR_TARGET_MICROCONTROLLER) && !defined(ROAR_TARGET_WIN32)
- signal(SIGINT,  on_sig_int);
- signal(SIGTERM, on_sig_term);
- signal(SIGCHLD, on_sig_chld);
- signal(SIGUSR1, on_sig_usr1);
- signal(SIGPIPE, SIG_IGN);  // ignore broken pipes
-#endif
-
- if ( g_config->memlock_level == -1 ) {
-  g_config->memlock_level = MEMLOCK_DEFAULT;
-  // do not print warning in case of failure and useage of default level.
-  memlock_set_level(g_config->memlock_level);
- } else {
-  if ( memlock_set_level(g_config->memlock_level) == -1 ) {
-   ROAR_WARN("Can not set memory locking level to target level.");
-  }
- }
-
- if ( realtime ) {
-#ifdef DEBUG
-  ROAR_WARN("compiled with -DDEBUG but realtime is enabled: for real realtime support compile without -DDEBUG");
-#endif
-
-#ifdef ROAR_HAVE_NICE
-  // this stupid error check is because type of returned data of nice() changed
-  // too often. On some systems it may return 0/-1, on some new nice value or
-  // mixed forms of both.
-  errno = 0;
-  (void)nice(-5*realtime); // -5 for each --realtime
-  if ( errno ) {
-   ROAR_WARN("Can not decrease nice value by %i: %s", 5*realtime, strerror(errno));
-  }
-#else
-  ROAR_WARN("Can not decrease nice value by %i: %s", 5*realtime, strerror(errno));
-#endif
-/*
-#ifdef __linux__
-  if ( ioprio_set(IOPRIO_WHO_PROCESS, getpid(), IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 0)) == -1 )
-   ROAR_WARN("Can not set io priority: %s", strerror(errno));
-#endif
-*/
- }
-
-#if defined(ROAR_HAVE_SETGID) && defined(ROAR_HAVE_IO_POSIX)
- if ( setids & R_SETGID ) {
-  if ( sock_grp == NULL ) {
-   ROAR_ERR("Can not set GID if no groupname is supplied");
-   return 1;
-  }
-  if ( (grp = getgrnam(sock_grp)) == NULL ) {
-   ROAR_ERR("Can not get GID for group %s: %s", sock_grp, strerror(errno));
-   return 1;
-  }
-  if ( setgroups(0, (const gid_t *) NULL) == -1 ) {
-   ROAR_ERR("Can not clear supplementary group IDs: %s", strerror(errno));
-  }
-  if ( grp == NULL || setgid(grp->gr_gid) == -1 ) {
-   ROAR_ERR("Can not set GroupID: %s", strerror(errno));
-  }
- }
-#endif
-
-
- clients_set_pid(g_self_client, getpid());
-#ifdef ROAR_HAVE_GETUID
- clients_set_uid(g_self_client, getuid());
-#endif
-#ifdef ROAR_HAVE_GETGID
- clients_set_gid(g_self_client, getgid());
-#endif
- clients_get(g_self_client, &self);
-
- if ( self == NULL ) {
-  ROAR_ERR("Can not get self client!");
-  return 1;
- }
-
- strcpy(self->name, "RoarAudio daemon internal");
-
- if ( roar_nnode_free(&(self->nnode)) == -1 )
-  return 1;
-
- // not fully correct but ok as workaorund
- // so tools assume that roard runs on the same machine as
- // they in case they use AF_UNIX:
- if ( roar_nnode_new(&(self->nnode), ROAR_SOCKET_TYPE_UNIX) == -1 )
-  return 1;
-
-#if defined(ROAR_HAVE_FORK) || defined(ROAR_TARGET_WIN32)
- if ( daemon ) {
-#ifdef ROAR_HAVE_SYSLOG
-  roar_debug_set_stderr_mode(ROAR_DEBUG_MODE_SYSLOG);
-#else
-  roar_debug_set_stderr_fh(-1);
-#endif
-
-#ifdef ROAR_TARGET_WIN32
-  FreeConsole();
-#else
-
-  close(ROAR_STDIN );
-  close(ROAR_STDOUT);
-  close(ROAR_STDERR);
-
-  if ( roar_fork(NULL) )
-   ROAR_U_EXIT(0);
-
-#ifdef ROAR_HAVE_SETSID
-  setsid();
-#endif
-  clients_set_pid(g_self_client, getpid()); // reset pid as it changed
-#endif
- }
-#endif
-
- if ( watchdog_time ) {
-  if ( watchdog_time == -1 )
-   watchdog_time = 5000;
-  roar_watchdog_start(ROAR_WATCHDOG_CONF_DEFAULTS, watchdog_time, NULL);
- }
-
-#if defined(ROAR_HAVE_SETUID) && defined(ROAR_HAVE_IO_POSIX)
- // early test for UID as we need this for the pidfile and the setuid()
- if ( sock_user != NULL ) {
-  if ( (pwd = getpwnam(sock_user)) == NULL ) {
-   ROAR_ERR("Can not get UID for user %s: %s", sock_user, strerror(errno));
-   return 1;
-  }
- }
-#endif
-
- ROAR_INFO("Process ID: %i", ROAR_DBG_INFO_INFO, (int)getpid());
-
-#ifdef SUPPORT_PIDFILE
- if ( pidfile != NULL ) {
-  if ( roar_vio_open_dstr_simple(&pidfile_vio, pidfile, O_WRONLY|O_CREAT) == -1 ) {
-   ROAR_ERR("Can not write pidfile: %s", pidfile);
-  } else {
-   roar_vio_printf(&pidfile_vio, "%i\n", getpid());
-   roar_vio_close(&pidfile_vio);
-  }
-#if defined(ROAR_HAVE_SETGID) && defined(ROAR_HAVE_SETUID) && defined(ROAR_HAVE_IO_POSIX)
-  if ( pwd != NULL || grp != NULL ) {
-   if ( chown(pidfile, pwd != NULL ? pwd->pw_uid : (uid_t)-1, grp != NULL ? grp->gr_gid : (gid_t)-1) == -1 ) {
-    ROAR_WARN("Can not change ownership of pidfile: %s: %s", pidfile, strerror(errno));
-   }
-  }
-  if ( chmod(pidfile, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH) == -1 ) {
-   ROAR_WARN("Can not change permissions of pidfile: %s: %s", pidfile, strerror(errno));
-  }
-#endif
- }
-#endif
-
-#ifdef ROAR_HAVE_CHROOT
- if (chrootdir) {
-  if ( chroot(chrootdir) == -1 ) {
-   ROAR_ERR("Can not chroot to %s: %s", chrootdir, strerror(errno));
-   return 2;
-  }
-  if ( chdir("/") == -1 ) {
-   ROAR_ERR("Can not chdir to /: %s", strerror(errno));
-   return 2;
-  }
- }
-#endif
-
-#if defined(ROAR_HAVE_SETUID) && defined(ROAR_HAVE_IO_POSIX)
- if ( setids & R_SETUID ) {
-  if ( sock_user == NULL ) {
-   ROAR_ERR("Can not set UID if no username is supplied");
-   return 1;
-  }
-  if ( pwd == NULL || setuid(pwd->pw_uid) == -1 ) {
-   ROAR_ERR("Can not set UserID: %s", strerror(errno));
-   return 3;
-  }
-#ifdef ROAR_HAVE_GETUID
-  clients_set_uid(g_self_client, getuid());
-#endif
- }
-#endif
-
- // setup auth:
-#if defined(ROAR_HAVE_GETUID) && defined(ROAR_HAVE_GETGID)
- if ( auth_setup(none_acclev, trust_acclev, trust_root, getuid(), getgid()) == -1 ) {
-#else
- if ( auth_setup(none_acclev, trust_acclev, trust_root, -1, -1) == -1 ) {
-#endif
-  ROAR_ERR("Can not set up auth. Bad.");
-  alive = 0;
- }
-
- // Register with OpenSLP:
-#ifdef ROAR_HAVE_LIBSLP
- if ( reg_slp ) {
-  register_slp(0, sock_addr);
- }
-#endif
-
-#ifdef ROAR_HAVE_LIBX11
- if ( reg_x11 ) {
-  register_x11(0, sock_addr);
- }
-#endif
-
- // update sync counter.
- streams_change_sync_num(-1, 0);
-
- ROAR_INFO("Startup complet", ROAR_DBG_INFO_INFO);
-
  // start main loop...
- ROAR_INFO("Entering main loop", ROAR_DBG_INFO_INFO);
- main_loop(&sa, sysclocksync);
- ROAR_INFO("Left main loop", ROAR_DBG_INFO_INFO);
+ main_loop(drvid, drvinst, &sa);
 
  // clean up.
  clean_quit_prep();
+ driver_close(drvinst, drvid);
  output_buffer_free();
 
- roar_notify_core_free(NULL);
-
- ROAR_INFO("Shuting down complete", ROAR_DBG_INFO_INFO);
-
-#ifdef ROAR_HAVE_SYSTEM
- if ( g_config->scripts.post_shutdown != NULL )
-  system(g_config->scripts.post_shutdown);
-#endif
-
- ROAR_INFO("Exiting, no error", ROAR_DBG_INFO_INFO);
  return 0;
 }
 
-void cleanup_listen_socket (int terminate) {
- int i;
-
- ROAR_DBG("cleanup_listen_socket(terminate=%i) = (void)?", terminate);
-
- ROAR_INFO("Cleaning up listen sockets", ROAR_DBG_INFO_INFO);
-
- // Deregister from SLP:
-#ifdef ROAR_HAVE_LIBSLP
- register_slp(1, NULL);
-#endif
-
-#ifdef ROAR_HAVE_LIBX11
- register_x11(1, NULL);
-#endif
-
-#ifdef ROAR_SUPPORT_LISTEN
- for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) {
-  if ( g_listen[i].used  ) {
-   roar_vio_close(&(g_listen[i].sock));
-
-   g_listen[i].used = 0;
-
-#ifdef ROAR_HAVE_UNIX
-   if ( server[i] != NULL )
-    if ( *(server[i]) == '/' )
-     unlink(server[i]);
-#endif
-  }
- }
-
-#endif
-
- if ( terminate )
-  g_terminate = 1;
-}
-
 void clean_quit_prep (void) {
- cleanup_listen_socket(0);
-
- plugins_free();
-
-#ifndef ROAR_WITHOUT_DCOMP_SOURCES
+ close(g_listen_socket);
  sources_free();
-#endif
  streams_free();
  clients_free();
-#ifndef ROAR_WITHOUT_DCOMP_SSYNTH
- ssynth_free();
-#endif
-#ifndef ROAR_WITHOUT_DCOMP_CB
- midi_cb_stop(); // stop console beep
-#endif
-#ifndef ROAR_WITHOUT_DCOMP_MIDI
- midi_free();
-#endif
-#ifndef ROAR_WITHOUT_DCOMP_LIGHT
- light_free();
-#endif
-#ifndef ROAR_WITHOUT_DCOMP_RDTCS
- rdtcs_free();
-#endif
-
- waveform_free();
-
-#ifdef SUPPORT_PIDFILE
- if ( pidfile != NULL )
-  unlink(pidfile);
-#endif
-
- auth_free();
 }
 
 void clean_quit (void) {
- ROAR_INFO("Shuting down", ROAR_DBG_INFO_INFO);
-
- counters_print(ROAR_DEBUG_TYPE_INFO, 0);
-
  clean_quit_prep();
+// driver_close(drvinst, drvid);
 // output_buffer_free();
-
- roar_notify_core_free(NULL);
-
- ROAR_INFO("Shuting down complete", ROAR_DBG_INFO_INFO);
-
-#ifdef ROAR_HAVE_SYSTEM
- if ( g_config->scripts.post_shutdown != NULL )
-  system(g_config->scripts.post_shutdown);
-#endif
-
- ROAR_INFO("Exiting, no error", ROAR_DBG_INFO_INFO);
  exit(0);
 }
