Changeset 5708:8d1c97c7cd44 in roaraudio

Timestamp:

10/24/12 14:34:42 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Fixed roard's 'dmx' driver.

Files:

• ChangeLog (modified) (1 diff)
• roard/driver_dmx.c (modified) (4 diffs)

ChangeLog

@@ -2 +2 @@
         * Changed plugin ABI version number for roard.
         * Removed check for libuuid as it is no longer used.
+        * Fixed roard's 'dmx' driver.
 
 v. 1.0beta7 - Tue Oct 23 2012 23:28 CEST

roard/driver_dmx.c

@@ -30 +30 @@
 int driver_dmx_open_vio  (struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream) {
  struct roar_vio_defaults def;
+ struct roar_vio_calls * vio;
+ int err;
 
  if ( roar_vio_dstr_init_defaults(&def, ROAR_VIO_DEF_TYPE_NONE, O_WRONLY, 0644) == -1 )
   return -1;
+
+ vio = roar_mm_malloc(sizeof(struct roar_vio_calls));
+ if ( vio == NULL )
+  return -1;
+ roar_vio_clear_calls(vio);
 
  if ( fh == -1 ) {
@@ -41 +48 @@
    device = "/dev/dmx";
 
-  if ( roar_vio_open_dstr(inst, device, &def, 1) == -1 )
+  if ( roar_vio_open_dstr(vio, device, &def, 1) == -1 ) {
+   err = roar_error;
+   roar_mm_free(vio);
+   roar_error = err;
    return -1;
+  }
  } else {
-  if ( roar_vio_open_fh(inst, fh) == -1 )
+  if ( roar_vio_open_fh(vio, fh) == -1 ) {
+   err = roar_error;
+   roar_mm_free(vio);
+   roar_error = err;
    return -1;
+  }
  }
 
+ vio->flags |= ROAR_VIO_FLAGS_FREESELF;
+
+ roar_vio_open_pass(inst, vio);
  inst->write = driver_dmx_write;
  inst->ctl   = driver_dmx_ctl;
@@ -66 +84 @@
   return -1;
 
- if ( roar_vio_lseek(vio, 0, SEEK_SET) == (roar_off_t)-1 )
+ if ( roar_vio_lseek(vio->inst, 0, SEEK_SET) == (roar_off_t)-1 )
   return -1;
 
- return roar_vio_write(vio, buf, count);
+ return roar_vio_write(vio->inst, buf, count);
 }
 
@@ -83 +101 @@
    break;
   default:
+   roar_err_set(ROAR_ERROR_BADRQC);
    return -1;
  }