Changeset 930:62b20281af8d in roaraudio

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

Location:

roard

Files:

• driver.c (modified) (1 diff)
• driver_esd.c (modified) (1 diff)
• driver_oss.c (modified) (2 diffs)
• include/driver.h (modified) (1 diff)
• include/driver_esd.h (modified) (1 diff)
• include/driver_oss.h (modified) (1 diff)
• include/streams.h (modified) (1 diff)
• streams.c (modified) (2 diffs)

roard/driver.c

@@ -70 +70 @@
     memset(*inst, 0, sizeof(struct roar_vio_calls));
 
-    if ( (i = g_driver[i].vio_init(*inst, device, info)) == -1 ) {
+    if ( (i = g_driver[i].vio_init(*inst, device, info, -1)) == -1 ) {
      free(*inst);
      return -1;

roard/driver_esd.c

@@ -60 +60 @@
 }
 
-int driver_esd_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info) {
+int driver_esd_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh) {
+
+ if ( fh != -1 )
+  return -1;
+
  inst->read  = driver_esd_read;
  inst->write = driver_esd_write;

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;
+  }
  }
 

roard/include/driver.h

@@ -81 +81 @@
  int (*read )(DRIVER_USERDATA_T   inst, char * buf, int len);
  int (*flush)(DRIVER_USERDATA_T   inst);
- int (*vio_init)(struct roar_vio_calls * calls, char * device, struct roar_audio_info * info);
+ int (*vio_init)(struct roar_vio_calls * calls, char * device, struct roar_audio_info * info, int fh);
 };
 

roard/include/driver_esd.h

@@ -27 +27 @@
 
 int driver_esd_open_sysio(DRIVER_USERDATA_T * inst,   char * device, struct roar_audio_info * info);
-int driver_esd_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info);
+int driver_esd_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh);
 int driver_esd_close(DRIVER_USERDATA_T   inst);
 int driver_esd_pause(DRIVER_USERDATA_T   inst, int newstate);

roard/include/driver_oss.h

@@ -26 +26 @@
 #define _DRIVER_OSS_H_
 
-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 driver_oss_close(DRIVER_USERDATA_T   inst);
 

roard/include/streams.h

@@ -55 +55 @@
  struct roar_vio_calls vio;
  int primary;
+ int driver_id;
 } * g_streams[ROAR_STREAMS_MAX];
 

roard/streams.c

@@ -95 +95 @@
 
    roar_vio_init_calls(&(s->vio));
+   s->driver_id = -1;
 
    g_streams[i] = s;
@@ -689 +690 @@
   return 0;
 
+ if ( s->dir == ROAR_DIR_OUTPUT && g_standby )
+  return 0;
+
  ROAR_DBG("streams_send_mon(id=%i): fh = %i", id, fh);