Changeset 5108:44e0633255a1 in roaraudio

Timestamp:

07/25/11 18:15:12 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

"The aRtsc driver is obsolete/broken, use another!"

File:

• roard/driver_artsc.c (modified) (7 diffs)

roard/driver_artsc.c

@@ -55 +55 @@
  (void)sstream;
 
+ ROAR_WARN("The aRtsc driver is obsolete/broken, use another!");
+ ROAR_DBG("driver_artsc_open_vio(*) = ?");
+
  if ( fh != -1 || device != NULL )
   return -1;
@@ -62 +65 @@
  }
 
+ ROAR_DBG("driver_artsc_open_vio(*) = ?");
+
  self = roar_mm_malloc(sizeof(struct roar_artsc));
 
@@ -68 +73 @@
 
  memset(self, 0, sizeof(struct roar_artsc));
+
+ ROAR_DBG("driver_artsc_open_vio(*) = ?");
 
  if ( driver_artsc_init_shutdown(INIT) == -1 ) {
@@ -74 +81 @@
  }
 
- info->codec = ROAR_CODEC_DEFAULT;
+ ROAR_DBG("driver_artsc_open_vio(*) = ?");
+
+ if ( info->codec != ROAR_CODEC_DEFAULT ) {
+  if ( autoconfig ) {
+   info->codec = ROAR_CODEC_DEFAULT;
+  } else {
+   return -1;
+  }
+ }
+
+ if ( info->bits != 16 ) {
+  if ( autoconfig ) {
+   info->bits = 16;
+  }
+ }
 
  self->info   = info;
  self->stream = arts_play_stream(info->rate, info->bits, info->channels, "roard");
+
+ ROAR_DBG("driver_artsc_open_vio(*) = ?");
 
  if ( self->stream == NULL && autoconfig ) {
@@ -84 +107 @@
  }
 
+ ROAR_DBG("driver_artsc_open_vio(*) = ?");
+
  if ( self->stream == NULL ) {
   roar_mm_free(self);
   driver_artsc_init_shutdown(SHUTDOWN);
-  return -1;
- }
+  ROAR_DBG("driver_artsc_open_vio(*) = -1");
+  return -1;
+ }
+
+ ROAR_DBG("driver_artsc_open_vio(*) = ?");
 
  memset(inst, 0, sizeof(struct roar_vio_calls));
@@ -98 +126 @@
  inst->nonblock = driver_artsc_nonblock;
 
+ ROAR_DBG("driver_artsc_open_vio(*) = 0");
  return 0;
 }
@@ -103 +132 @@
 ssize_t driver_artsc_write   (struct roar_vio_calls * vio, void *buf, size_t count) {
  struct roar_artsc * self = vio->inst;
- int ret = arts_write(self->stream, buf, count);
-
- if ( ret >= 0 )
+ int ret;
+
+ ROAR_DBG("driver_artsc_write(*) = ?");
+
+ ret = arts_write(self->stream, buf, count);
+
+ if ( ret >= 0 ) {
+  ROAR_DBG("driver_artsc_write(*) = %i", ret);
   return ret;
-
+ }
+
+ ROAR_DBG("driver_artsc_write(*) = -1");
  return -1;
 }