Changeset 930:62b20281af8d in roaraudio for roard/driver_oss.c

Timestamp:

12/07/08 17:24:18 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added a addition argument fh to vio driver open rutine, added var to save driver id in server stream struct

File:

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

roard/driver_oss.c

@@ -28 +28 @@
 #define er() close(fh); return -1
 
-int driver_oss_open(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info) {
+int driver_oss_open(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh) {
  int tmp;
- int fh;
 
 #ifdef ROAR_DEFAULT_OSS_DEV
@@ -44 +43 @@
  roar_vio_init_calls(inst);
 
- if ( (fh = open(device, O_WRONLY, 0644)) == -1 ) {
-  ROAR_ERR("driver_oss_open(*): Can not open OSS device: %s: %s", device, strerror(errno));
-  return -1;
+ if (  fh == -1 ) {
+  if ( (fh = open(device, O_WRONLY, 0644)) == -1 ) {
+   ROAR_ERR("driver_oss_open(*): Can not open OSS device: %s: %s", device, strerror(errno));
+   return -1;
+  }
  }