Changeset 5895:2bcffab4cd73 in roaraudio for roard
- Timestamp:
- 04/14/13 13:38:03 (11 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/driver_dmx.c
r5832 r5895 33 33 int err; 34 34 const char * dev = device; 35 char * dev_default_dmx4linux = NULL; 35 36 36 37 if ( roar_vio_dstr_init_defaults(&def, ROAR_VIO_DEF_TYPE_NONE, O_WRONLY, 0644) == -1 ) … … 46 47 dev = roar_env_get("DMX"); 47 48 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 } 50 53 51 54 if ( roar_vio_open_dstr(vio, dev, &def, 1) == -1 ) { 52 55 err = roar_error; 53 56 roar_mm_free(vio); 57 if ( dev_default_dmx4linux != NULL ) 58 roar_mm_free(dev_default_dmx4linux); 54 59 roar_error = err; 55 60 return -1; 56 61 } 62 if ( dev_default_dmx4linux != NULL ) 63 roar_mm_free(dev_default_dmx4linux); 57 64 } else { 58 65 if ( roar_vio_open_fh(vio, fh) == -1 ) {
Note: See TracChangeset
for help on using the changeset viewer.