Changeset 4390:7df0ee32543e in roaraudio

Timestamp:

09/15/10 01:51:26 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

ckeck for OSS, do not assume it's presense

Location:

roard

Files:

• hwmixer.c (modified) (1 diff)
• hwmixer_oss.c (modified) (2 diffs)

roard/hwmixer.c

@@ -43 +43 @@
 
 struct hwmixer g_hwmixers[] = {
+#if defined(ROAR_HAVE_OSS_BSD) || defined(ROAR_HAVE_OSS)
  {"oss",  "OSS Mixer", "/dev/mixer*", FLAG_FHSEC, hwmixer_oss_open, hwmixer_oss_close, hwmixer_oss_set_vol, hwmixer_oss_get_vol},
+#endif
  {"dstr", "Write to DSTR",       "/some/file", FLAG_NONE,  hwmixer_dstr_open, hwmixer_dstr_close, hwmixer_dstr_set_vol, NULL},
  {"null", "Null Mixer",          NULL, FLAG_NONE,  (int (*)(struct hwmixer_stream * stream, char * drv, char * dev, int fh, char * basename, struct roar_keyval * subnames, size_t subnamelen))__true, (int (*)(struct hwmixer_stream * stream))__true, (int (*)(struct hwmixer_stream * stream, int channels, int mode, struct roar_mixer_settings * settings))__true, (int (*)(struct hwmixer_stream * stream, int channels, int mode, struct roar_mixer_settings * settings))__true},

roard/hwmixer_oss.c

@@ -25 +25 @@
 
 #include "roard.h"
+
+#if defined(ROAR_HAVE_OSS_BSD) || defined(ROAR_HAVE_OSS)
 
 #define OSS_VOLUME_SCALE 100
@@ -275 +277 @@
 }
 
+#endif
+
 //ll