Changeset 4380:9e0d335e4c4e in roaraudio

Timestamp:

09/14/10 22:26:32 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

some cleanup

Files:

• libroaross/libroaross.c (modified) (1 diff)
• roard/hwmixer.c (modified) (1 diff)
• roard/hwmixer_oss.c (modified) (1 diff)

libroaross/libroaross.c

@@ -276 +276 @@
 #ifdef ROAR_DEFAULT_OSS_DEV
  {ROAR_DEFAULT_OSS_DEV, HT_WAVEFORM,  0, NULL, NULL},
+#endif
+#ifdef ROAR_DEFAULT_OSS_MIX_DEV
+ {ROAR_DEFAULT_OSS_MIX_DEV, HT_MIXER, 0, NULL, NULL},
 #endif
  {NULL, HT_NONE, 0, NULL, NULL},

roard/hwmixer.c

@@ -44 +44 @@
 struct hwmixer g_hwmixers[] = {
  {"oss",  "OSS Mixer", "/dev/mixer*", FLAG_FHSEC, hwmixer_oss_open, hwmixer_oss_close, hwmixer_oss_set_vol, hwmixer_oss_get_vol},
- {"file", "Write to plain file", "/some/file", FLAG_FHSEC, NULL, NULL, NULL, NULL},
  {"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,  __true, __true, __true, __true},
+ {"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},
  {NULL,   NULL, NULL, FLAG_NONE, NULL, NULL, NULL, NULL}
 };

roard/hwmixer_oss.c

@@ -51 +51 @@
 
  if ( fh == -1 ) {
+#ifdef ROAR_DEFAULT_OSS_MIX_DEV
   if ( dev == NULL ) {
-   dev = "/dev/mixer";
-  }
+   dev = ROAR_DEFAULT_OSS_MIX_DEV;
+  }
+#endif
 
   if ( dev == NULL ) {