Changeset 3375:9187507cb0dd in roaraudio for libroar

Timestamp:

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

Author:

phi

Branch:

default

Phase:

public

Message:

added support for x11-server in options string

Location:

libroar

Files:

• config.c (modified) (2 diffs)
• roarx11.c (modified) (1 diff)

libroar/config.c

@@ -53 +53 @@
   if ( home != NULL ) {
    snprintf(authfile, 1023, "%s/.roarauth", home);
-   authfile[1023]  = 0;
-   config.authfile = authfile;
+   authfile[1023]     = 0;
+   config.authfile    = authfile;
   }
 
@@ -245 +245 @@
    strncpy(config->authfile, v, 1023);
    config->authfile[1023] = 0;
+  } else if ( !strcmp(k, "x11-display") ) {
+   config->x11.display = v;
   } else {
    ROAR_WARN("roar_libroar_config_parse(*): Unknown option: %s", k);

libroar/roarx11.c

@@ -37 +37 @@
 struct roar_x11_connection * roar_x11_connect(char * display) {
 #ifdef ROAR_HAVE_LIBX11
+ struct roar_libroar_config * config = roar_libroar_get_config();
  struct roar_x11_connection * con;
+
+ if ( display == NULL )
+  display = config->x11.display;
 
  if ( (con = roar_mm_malloc(sizeof(struct roar_x11_connection))) == NULL )