Changeset 4373:9ccbfd7d8a44 in roaraudio

Timestamp:

09/14/10 21:11:24 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

wrote very basic OSS driver

Location:

roard

Files:

• Makefile (modified) (1 diff)
• hwmixer.c (modified) (1 diff)
• hwmixer_oss.c (added)
• include/hwmixer.h (modified) (1 diff)

roard/Makefile

@@ -7 +7 @@
 CF_CONTAINER=codecfilter_wave.o codecfilter_raum.o codecfilter_au.o
 EMUL=emul_esd.o emul_simple.o emul_rsound.o emul_rplay.o
-HWMIXER=hwmixer_dstr.o
+HWMIXER=hwmixer_dstr.o hwmixer_oss.o
 
 CF=${CF_CONTAINER} ${CF_CODEC}

roard/hwmixer.c

@@ -43 +43 @@
 
 struct hwmixer g_hwmixers[] = {
- {"oss",  "OSS Mixer", "/dev/mixer*", FLAG_FHSEC, NULL, NULL, NULL, NULL},
+ {"oss",  "OSS Mixer", "/dev/mixer*", FLAG_FHSEC, hwmixer_oss_open, hwmixer_oss_close, hwmixer_oss_set_vol, NULL},
  {"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},

roard/include/hwmixer.h

@@ -56 +56 @@
 int hwmixer_dstr_set_vol(struct hwmixer_stream * stream, int channels, int mode, struct roar_mixer_settings * settings);
 
+// OSS
+int hwmixer_oss_open(struct hwmixer_stream * stream, char * drv, char * dev, int fh, char * basename, struct roar_keyval * subnames, size_t subnamelen);
+int hwmixer_oss_close(struct hwmixer_stream * stream);
+int hwmixer_oss_set_vol(struct hwmixer_stream * stream, int channels, int mode, struct roar_mixer_settings * settings);
 
 #endif