Changeset 1530:570f7a39d6d0 in roaraudio

Timestamp:

04/12/09 00:39:36 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added warning if device uses diffrent sample rate, added support for ROAR_VIO_CTL_GET_SSTREAMID

File:

• roard/driver_oss.c (modified) (4 diffs)

roard/driver_oss.c

@@ -35 +35 @@
  int need_config;
  struct roar_stream_server * stream;
+ int ssid;
 };
 
@@ -221 +222 @@
  }
 
- if ( tmp < info->rate * 0.98 || tmp > info->rate * 1.02 ) {
-  ROAR_ERR("driver_oss_open(*): sample rate out of acceptable accuracy");
-  return -1;
+ if ( tmp != info->rate ) {
+  ROAR_WARN("driver_oss_config_device(*): Device does not support requested sample rate: req=%iHz, sug=%iHz",
+                    info->rate, tmp);
+
+  if ( tmp < info->rate * 0.98 || tmp > info->rate * 1.02 ) {
+   ROAR_ERR("driver_oss_open(*): sample rate out of acceptable accuracy");
+   return -1;
+  }
  }
 
@@ -279 +285 @@
  memcpy(&(self->info), info, sizeof(struct roar_audio_info));
 
- self->fh = fh;
+ self->ssid = -1;
+ self->fh   = fh;
 
  if ( device != NULL )
@@ -384 +391 @@
     *(uint_least32_t *)data = self->blocksize;
    break;
+  case ROAR_VIO_CTL_GET_SSTREAMID:
+    self->ssid = *(int *)data;
+   break;
   case ROAR_VIO_CTL_SET_SSTREAM:
     self->stream = data;