Changeset 3374:18a9494d6784 in roaraudio for roard/roard.c

Timestamp:

02/10/10 16:21:02 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support --{x11-,}display

File:

• roard/roard.c (modified) (4 diffs)

roard/roard.c

@@ -35 +35 @@
 
 #if defined(ROAR_HAVE_SETGID) || defined(ROAR_HAVE_SETUID)
- int    setids    = 0;
+int    setids    = 0;
+#endif
+
+#ifdef ROAR_HAVE_LIBX11
+char * x11display = NULL;
 #endif
 
@@ -137 +141 @@
         " --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
@@ -778 +790 @@
  int ret = 0;
 
- if ( (x11con = roar_x11_connect(NULL)) == NULL )
+ if ( (x11con = roar_x11_connect(x11display)) == NULL )
   return -1;
 
@@ -1353 +1365 @@
 #endif
 
+  } else if ( strcmp(k, "--x11-display") == 0 || strcmp(k, "--display") == 0 ) {
+#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 ) {
    // This is only usefull in INET not UNIX mode.