Changeset 3838:533d385df0da in roaraudio

Timestamp:

05/16/10 22:05:44 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

made OSS driver fh save

Location:

roard

Files:

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

roard/driver.c

@@ -50 +50 @@
 #define ROAR_DEFAULT_OSS_DEV "no default device"
 #endif
- { "oss", "Open Sound System", ROAR_DEFAULT_OSS_DEV, DRV_FLAG_NONE, ROAR_SUBSYS_WAVEFORM,
+ { "oss", "Open Sound System", ROAR_DEFAULT_OSS_DEV, DRV_FLAG_FHSEC, ROAR_SUBSYS_WAVEFORM,
    NULL, NULL, driver_oss_open},
 #endif

roard/driver_oss.c

@@ -344 +344 @@
  self->fh   = fh;
 
+ if ( fh != -1 ) {
+  self->fh_savemode = 1;
+ } else {
+  self->fh_savemode = 0;
+ }
+
  if ( device != NULL )
   self->device = strdup(device);
@@ -367 +373 @@
 
 int     driver_oss_reopen_device(struct driver_oss * self) {
+
+ // we need to reject in fh save mode.
+ if ( self->fh_savemode )
+  return -1;
+
 #ifdef SNDCTL_DSP_SYNC
  ioctl(self->fh, SNDCTL_DSP_SYNC, NULL);

roard/include/driver_oss.h

@@ -33 +33 @@
  int blocksize;
  struct roar_audio_info info;
- int need_reopen;
  int need_config;
  struct roar_stream_server * stream;
  int ssid;
+ int fh_savemode;
 };