Changeset 3375:9187507cb0dd in roaraudio


Ignore:
Timestamp:
02/10/10 16:21:28 (10 years ago)
Author:
phi
Branch:
default
Message:

added support for x11-server in options string

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r3343 r3375  
    11v. 0.3beta5 - ? 
    22        * added tool roardtmf 
     3        * Support to store server address in X11's root window propertys 
    34 
    45v. 0.3beta4 - Sat Feb 06 2010 26:02 CET 
  • include/libroar/config.h

    r3218 r3375  
    9393 struct roar_audio_info info; 
    9494 char * authfile; 
     95 struct { 
     96  char * display; 
     97 } x11; 
    9598}; 
    9699 
  • include/libroar/roarx11.h

    r3372 r3375  
    4949int    roar_x11_disconnect(struct roar_x11_connection * con); 
    5050 
     51#define roar_x11_get_display(con) ((con) == NULL ? NULL : (con)->display) 
     52 
    5153int    roar_x11_set_prop(struct roar_x11_connection * con, const char * key, const char * val); 
    5254int    roar_x11_delete_prop(struct roar_x11_connection * con, const char * key); 
  • libroar/config.c

    r3219 r3375  
    5353  if ( home != NULL ) { 
    5454   snprintf(authfile, 1023, "%s/.roarauth", home); 
    55    authfile[1023]  = 0; 
    56    config.authfile = authfile; 
     55   authfile[1023]     = 0; 
     56   config.authfile    = authfile; 
    5757  } 
    5858 
     
    245245   strncpy(config->authfile, v, 1023); 
    246246   config->authfile[1023] = 0; 
     247  } else if ( !strcmp(k, "x11-display") ) { 
     248   config->x11.display = v; 
    247249  } else { 
    248250   ROAR_WARN("roar_libroar_config_parse(*): Unknown option: %s", k); 
  • libroar/roarx11.c

    r3372 r3375  
    3737struct roar_x11_connection * roar_x11_connect(char * display) { 
    3838#ifdef ROAR_HAVE_LIBX11 
     39 struct roar_libroar_config * config = roar_libroar_get_config(); 
    3940 struct roar_x11_connection * con; 
     41 
     42 if ( display == NULL ) 
     43  display = config->x11.display; 
    4044 
    4145 if ( (con = roar_mm_malloc(sizeof(struct roar_x11_connection))) == NULL ) 
Note: See TracChangeset for help on using the changeset viewer.