Changeset 3375:9187507cb0dd in roaraudio

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

Files:

• ChangeLog (modified) (1 diff)
• include/libroar/config.h (modified) (1 diff)
• include/libroar/roarx11.h (modified) (1 diff)
• libroar/config.c (modified) (2 diffs)
• libroar/roarx11.c (modified) (1 diff)

ChangeLog

@@ -1 +1 @@
 v. 0.3beta5 - ?
         * added tool roardtmf
+        * Support to store server address in X11's root window propertys
 
 v. 0.3beta4 - Sat Feb 06 2010 26:02 CET

include/libroar/config.h

@@ -93 +93 @@
  struct roar_audio_info info;
  char * authfile;
+ struct {
+  char * display;
+ } x11;
 };
 

include/libroar/roarx11.h

@@ -49 +49 @@
 int    roar_x11_disconnect(struct roar_x11_connection * con);
 
+#define roar_x11_get_display(con) ((con) == NULL ? NULL : (con)->display)
+
 int    roar_x11_set_prop(struct roar_x11_connection * con, const char * key, const char * val);
 int    roar_x11_delete_prop(struct roar_x11_connection * con, const char * key);

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 )