Changeset 4815:df2ef6edb97f in roaraudio for roard/driver_oss.c

Timestamp:

03/27/11 20:04:27 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support to roard for record streams.

File:

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

roard/driver_oss.c

@@ -37 +37 @@
 
  vio->write    = driver_oss_write;
+ vio->read     = driver_oss_read;
  vio->nonblock = driver_oss_nonblock;
  vio->sync     = driver_oss_sync;
@@ -48 +49 @@
 
 int driver_oss_open_device(struct driver_oss * self) {
+ int    flags  = 0;
+ int    rw     = 0;
  int    fh     = self->fh;
  char * device = self->device;
@@ -64 +67 @@
  }
 
- if ( (fh = open(device, O_WRONLY, 0644)) == -1 ) {
+ if ( self->ssid != -1 ) {
+  rw = streams_get_flag(self->ssid, ROAR_FLAG_RECSOURCE);
+ }
+
+ if ( rw ) {
+  flags |= O_RDWR;
+ } else {
+  flags |= O_WRONLY;
+ }
+
+ if ( (fh = open(device, flags, 0644)) == -1 ) {
   ROAR_ERR("driver_oss_open_device(*): Can not open OSS device: %s: %s", device, strerror(errno));
   return -1;
@@ -324 +337 @@
  }
 
+ ROAR_DBG("driver_oss_config_device(*): self->ssid=%i, fh=%i", self->ssid, fh);
+ streams_set_fh(self->ssid, -2);
  self->need_config = 0;
 
+ ROAR_DBG("driver_oss_config_device(*) = 0");
  return 0;
 }
@@ -343 +359 @@
  self->ssid = -1;
  self->fh   = fh;
+
+ if ( sstream != NULL )
+  self->ssid = ROAR_STREAM(sstream)->id;
 
  if ( fh != -1 ) {
@@ -528 +547 @@
 }
 
+ssize_t driver_oss_read     (struct roar_vio_calls * vio, void *buf, size_t count) {
+ if ( _get(vio,fh) == -1 )
+  return -1;
+
+ if ( _get(vio,need_config) ) {
+  if ( driver_oss_config_device(vio->inst) == -1 ) {
+   return -1;
+  }
+ }
+
+ return read(_get(vio,fh), buf, count);
+}
+
 #endif
 //ll