Changeset 5895:2bcffab4cd73 in roaraudio for roard


Ignore:
Timestamp:
04/14/13 13:38:03 (7 years ago)
Author:
phi
Branch:
default
Message:

Moved away from roar_libroar_get_path_static()

File:
1 edited

Legend:

Unmodified
Added
Removed
  • roard/driver_dmx.c

    r5832 r5895  
    3333 int err; 
    3434 const char * dev = device; 
     35 char * dev_default_dmx4linux = NULL; 
    3536 
    3637 if ( roar_vio_dstr_init_defaults(&def, ROAR_VIO_DEF_TYPE_NONE, O_WRONLY, 0644) == -1 ) 
     
    4647   dev = roar_env_get("DMX"); 
    4748 
    48   if ( dev == NULL ) 
    49    dev = roar_libroar_get_path_static("dev-default-dmx4linux"); 
     49  if ( dev == NULL ) { 
     50   dev_default_dmx4linux = roar_libroar_get_path("dev-default-dmx4linux", 0, NULL, NULL); 
     51   dev = dev_default_dmx4linux; 
     52  } 
    5053 
    5154  if ( roar_vio_open_dstr(vio, dev, &def, 1) == -1 ) { 
    5255   err = roar_error; 
    5356   roar_mm_free(vio); 
     57   if ( dev_default_dmx4linux != NULL ) 
     58    roar_mm_free(dev_default_dmx4linux); 
    5459   roar_error = err; 
    5560   return -1; 
    5661  } 
     62  if ( dev_default_dmx4linux != NULL ) 
     63   roar_mm_free(dev_default_dmx4linux); 
    5764 } else { 
    5865  if ( roar_vio_open_fh(vio, fh) == -1 ) { 
Note: See TracChangeset for help on using the changeset viewer.