Changeset 924:7f4183d013fa in roaraudio

Timestamp:

12/07/08 12:35:54 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fixed handling of case the system has OSS support but we found no OSS device, needed for FreeBSD jails

Files:

• configure (modified) (2 diffs)
• roard/driver.c (modified) (1 diff)
• roard/driver_oss.c (modified) (1 diff)

configure

@@ -503 +503 @@
 then
  echo "$CDROM"
+ echo '#define ROAR_DEFAULT_CDROM "'"$CDROM"'"' >&3
 else
  CDROM=$(ls /dev/cdrom /dev/rcd0c 2> /dev/null | head -n 1);
@@ -518 +519 @@
 then
  echo "$OSS_DEV"
+ echo '#define ROAR_DEFAULT_OSS_DEV "'"$OSS_DEV"'"' >&3
 else
  OSS_DEV=$(ls /dev/dsp /dev/audio 2> /dev/null | head -n 1);

roard/driver.c

@@ -33 +33 @@
  { "raw",  "RAW PCM driver", "/some/file", driver_raw_open, driver_raw_close, driver_roar_pause, driver_raw_write, driver_raw_read, driver_raw_flush, NULL},
 #if defined(ROAR_HAVE_OSS_BSD) || defined(ROAR_HAVE_OSS)
+#ifndef ROAR_DEFAULT_OSS_DEV
+#define ROAR_DEFAULT_OSS_DEV "no default device"
+#endif
  { "oss", "Open Sound System", ROAR_DEFAULT_OSS_DEV, NULL, driver_oss_close, NULL, NULL, NULL, NULL, driver_oss_open},
 #endif

roard/driver_oss.c

@@ -32 +32 @@
  int fh;
 
+#ifdef ROAR_DEFAULT_OSS_DEV
  if ( device == NULL )
   device = ROAR_DEFAULT_OSS_DEV;
+#endif
+
+ if ( device == NULL ) {
+  ROAR_ERR("driver_oss_open(*): no default device found, you need to specify one manuelly");
+  return -1;
+ }
 
  roar_vio_init_calls(inst);