Added the mute capability to most control lines.
diff --git a/multimedia/mixer.c b/multimedia/mixer.c
index f41dedd..efeea66 100644
--- a/multimedia/mixer.c
+++ b/multimedia/mixer.c
@@ -22,6 +22,7 @@
DEFAULT_DEBUG_CHANNEL(mmaux)
#ifdef HAVE_OSS
+
#define MIXER_DEV "/dev/mixer"
#define WINE_MIXER_MANUF_ID 0xAA
@@ -40,6 +41,14 @@
WINE_CHN_MASK(SOUND_MIXER_MIC) | \
WINE_CHN_MASK(SOUND_MIXER_CD))
+/* FIXME: the two following string arrays should be moved to a resource file in a string table */
+/* if it's done, better use a struct to hold labels, name, and muted channel volume cache */
+static char* MIX_Labels[SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_LABELS;
+static char* MIX_Names [SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_NAMES;
+static int MIX_Volume[SOUND_MIXER_NRDEVICES];
+static int MIX_DevMask = 0;
+static int MIX_StereoMask = 0;
+
/**************************************************************************
* MIX_GetVal [internal]
*/
@@ -64,18 +73,18 @@
/**************************************************************************
* MIX_SetVal [internal]
*/
-static BOOL MIX_SetVal(int chn, int* val)
+static BOOL MIX_SetVal(int chn, int val)
{
int mixer;
BOOL ret = FALSE;
- TRACE("Writing %x on %d\n", *val, chn);
+ TRACE("Writing %x on %d\n", val, chn);
if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) {
/* FIXME: ENXIO => no mixer installed */
WARN("mixer device not available !\n");
} else {
- if (ioctl(mixer, MIXER_WRITE(chn), val) >= 0) {
+ if (ioctl(mixer, MIXER_WRITE(chn), &val) >= 0) {
ret = TRUE;
}
close(mixer);
@@ -88,50 +97,34 @@
*/
static DWORD MIX_GetDevCaps(WORD wDevID, LPMIXERCAPSA lpCaps, DWORD dwSize)
{
- int mixer, mask;
-
TRACE("(%04X, %p, %lu);\n", wDevID, lpCaps, dwSize);
if (wDevID != 0) return MMSYSERR_BADDEVICEID;
if (lpCaps == NULL) return MMSYSERR_INVALPARAM;
-
- if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) {
- /* FIXME: ENXIO => no mixer installed */
- WARN("mixer device not available !\n");
- return MMSYSERR_NOTENABLED;
- }
+ if (!MIX_DevMask) return MMSYSERR_NOTENABLED;
+
lpCaps->wMid = WINE_MIXER_MANUF_ID;
lpCaps->wPid = WINE_MIXER_PRODUCT_ID;
lpCaps->vDriverVersion = WINE_MIXER_VERSION;
strcpy(lpCaps->szPname, WINE_MIXER_NAME);
- if (ioctl(mixer, SOUND_MIXER_READ_DEVMASK, &mask) == -1) {
- close(mixer);
- perror("ioctl mixer SOUND_MIXER_DEVMASK");
- return MMSYSERR_NOTENABLED;
- }
-
- /* FIXME: can the Linux Mixer differ between multiple mixer targets ? */
+
lpCaps->cDestinations = 1;
lpCaps->fdwSupport = 0; /* No bits defined yet */
- close(mixer);
return MMSYSERR_NOERROR;
}
-static char *sdlabels[SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_LABELS;
-static char *sdnames[SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_NAMES;
-
/**************************************************************************
* MIX_GetLineInfoFromIndex [internal]
*/
static void MIX_GetLineInfoFromIndex(LPMIXERLINEA lpMl, int devmask, DWORD idx)
{
- strcpy(lpMl->szShortName, sdlabels[idx]);
- strcpy(lpMl->szName, sdnames[idx]);
+ strcpy(lpMl->szShortName, MIX_Labels[idx]);
+ strcpy(lpMl->szName, MIX_Names[idx]);
lpMl->dwLineID = idx;
lpMl->dwDestination = 0; /* index for speakers */
lpMl->cConnections = 1;
- lpMl->cControls = 1;
+ lpMl->cControls = 2;
switch (idx) {
case SOUND_MIXER_SYNTH:
lpMl->dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_SYNTHESIZER;
@@ -164,53 +157,21 @@
*/
static DWORD MIX_GetLineInfo(WORD wDevID, LPMIXERLINEA lpMl, DWORD fdwInfo)
{
- int mixer, i, j;
- int devmask, stereomask;
+ int i, j;
BOOL isDst = FALSE;
DWORD ret = MMSYSERR_NOERROR;
TRACE("(%04X, %p, %lu);\n", wDevID, lpMl, fdwInfo);
if (lpMl == NULL || lpMl->cbStruct != sizeof(*lpMl))
return MMSYSERR_INVALPARAM;
- if ((mixer = open(MIXER_DEV, O_RDWR)) < 0)
- return MMSYSERR_NOTENABLED;
- if (ioctl(mixer, SOUND_MIXER_READ_DEVMASK, &devmask) == -1) {
- close(mixer);
- perror("ioctl mixer SOUND_MIXER_DEVMASK");
- return MMSYSERR_NOTENABLED;
- }
- devmask &= WINE_MIXER_MASK;
- if (ioctl(mixer, SOUND_MIXER_READ_STEREODEVS, &stereomask) == -1) {
- close(mixer);
- perror("ioctl mixer SOUND_MIXER_STEREODEVS");
- return MMSYSERR_NOTENABLED;
- }
- stereomask &= WINE_MIXER_MASK;
-
-#if 0
- int recsrc, recmask;
-
- if (ioctl(mixer, SOUND_MIXER_READ_RECSRC, &recsrc) == -1) {
- close(mixer);
- perror("ioctl mixer SOUND_MIXER_RECSRC");
- return MMSYSERR_NOTENABLED;
- }
-
- if (ioctl(mixer, SOUND_MIXER_READ_RECMASK, &recmask) == -1) {
- close(mixer);
- perror("ioctl mixer SOUND_MIXER_RECMASK");
- return MMSYSERR_NOTENABLED;
- }
-#endif
-
/* FIXME: set all the variables correctly... the lines below
* are very wrong...
*/
lpMl->fdwLine = MIXERLINE_LINEF_ACTIVE;
lpMl->cChannels = 1;
lpMl->dwUser = 0;
- lpMl->cControls = 1;
+ lpMl->cControls = 2;
switch (fdwInfo & MIXER_GETLINEINFOF_QUERYMASK) {
case MIXER_GETLINEINFOF_DESTINATION:
@@ -221,37 +182,37 @@
lpMl->dwComponentType = MIXERLINE_COMPONENTTYPE_DST_SPEAKERS;
lpMl->dwSource = 0xFFFFFFFF;
lpMl->dwLineID = SOUND_MIXER_VOLUME;
- strncpy(lpMl->szShortName, sdlabels[SOUND_MIXER_VOLUME], MIXER_SHORT_NAME_CHARS);
- strncpy(lpMl->szName, sdnames[SOUND_MIXER_VOLUME], MIXER_LONG_NAME_CHARS);
+ strncpy(lpMl->szShortName, MIX_Labels[SOUND_MIXER_VOLUME], MIXER_SHORT_NAME_CHARS);
+ strncpy(lpMl->szName, MIX_Names[SOUND_MIXER_VOLUME], MIXER_LONG_NAME_CHARS);
- /* we have all connections found in the devmask */
+ /* we have all connections found in the MIX_DevMask */
lpMl->cConnections = 0;
for (j = 1; j < SOUND_MIXER_NRDEVICES; j++)
- if (WINE_CHN_SUPPORTS(devmask, j))
+ if (WINE_CHN_SUPPORTS(MIX_DevMask, j))
lpMl->cConnections++;
- if (stereomask & WINE_CHN_MASK(SOUND_MIXER_VOLUME))
+ if (WINE_CHN_SUPPORTS(MIX_StereoMask, SOUND_MIXER_VOLUME))
lpMl->cChannels++;
break;
case MIXER_GETLINEINFOF_SOURCE:
TRACE("SOURCE (%08lx)\n", lpMl->dwSource);
i = lpMl->dwSource;
for (j = 1; j < SOUND_MIXER_NRDEVICES; j++) {
- if (WINE_CHN_SUPPORTS(devmask, j) && (i-- == 0))
+ if (WINE_CHN_SUPPORTS(MIX_DevMask, j) && (i-- == 0))
break;
}
if (j >= SOUND_MIXER_NRDEVICES)
return MIXERR_INVALLINE;
- if (WINE_CHN_SUPPORTS(stereomask, j))
+ if (WINE_CHN_SUPPORTS(MIX_StereoMask, j))
lpMl->cChannels++;
- MIX_GetLineInfoFromIndex(lpMl, devmask, j);
+ MIX_GetLineInfoFromIndex(lpMl, MIX_DevMask, j);
break;
case MIXER_GETLINEINFOF_LINEID:
TRACE("LINEID (%08lx)\n", lpMl->dwLineID);
if (lpMl->dwLineID >= SOUND_MIXER_NRDEVICES)
return MIXERR_INVALLINE;
- if (WINE_CHN_SUPPORTS(stereomask, lpMl->dwLineID))
+ if (WINE_CHN_SUPPORTS(MIX_StereoMask, lpMl->dwLineID))
lpMl->cChannels++;
- MIX_GetLineInfoFromIndex(lpMl, devmask, lpMl->dwLineID);
+ MIX_GetLineInfoFromIndex(lpMl, MIX_DevMask, lpMl->dwLineID);
break;
case MIXER_GETLINEINFOF_COMPONENTTYPE:
TRACE("COMPONENT TYPE (%08lx)\n", lpMl->dwComponentType);
@@ -288,17 +249,17 @@
return MMSYSERR_INVALPARAM;
}
- if (WINE_CHN_SUPPORTS(devmask, i)) {
- strcpy(lpMl->szShortName, sdlabels[i]);
- strcpy(lpMl->szName, sdnames[i]);
+ if (WINE_CHN_SUPPORTS(MIX_DevMask, i)) {
+ strcpy(lpMl->szShortName, MIX_Labels[i]);
+ strcpy(lpMl->szName, MIX_Names[i]);
lpMl->dwLineID = i;
}
- if (WINE_CHN_SUPPORTS(stereomask, i))
+ if (WINE_CHN_SUPPORTS(MIX_StereoMask, i))
lpMl->cChannels++;
lpMl->cConnections = 0;
if (isDst) {
for (j = 1; j < SOUND_MIXER_NRDEVICES; j++) {
- if (WINE_CHN_SUPPORTS(devmask, j)) {
+ if (WINE_CHN_SUPPORTS(MIX_DevMask, j)) {
lpMl->cConnections++;
}
}
@@ -319,7 +280,6 @@
lpMl->Target.vDriverVersion = WINE_MIXER_VERSION;
strcpy(lpMl->Target.szPname, WINE_MIXER_NAME);
- close(mixer);
return ret;
}
@@ -328,21 +288,80 @@
*/
static DWORD MIX_Open(WORD wDevID, LPMIXEROPENDESC lpMod, DWORD flags)
{
- int mixer;
-
TRACE("(%04X, %p, %lu);\n", wDevID, lpMod, flags);
if (lpMod == NULL) return MMSYSERR_INVALPARAM;
- /* hmm. We don't keep the mixer device open. only check if it's present */
- if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) {
- if (errno == ENODEV || errno == ENXIO) {
- /* no driver present */
- return MMSYSERR_NODRIVER;
- }
- } else {
- close(mixer);
- }
+
+ return (MIX_DevMask == 0) ? MMSYSERR_NODRIVER : MMSYSERR_NOERROR;
+}
- return MMSYSERR_NOERROR;
+/**************************************************************************
+ * MIX_MakeControlID [internal]
+ */
+static DWORD MIX_MakeControlID(DWORD lineID, DWORD controlType)
+{
+ switch (controlType) {
+ case MIXERCONTROL_CONTROLTYPE_VOLUME:
+ return 2 * lineID + 0;
+ case MIXERCONTROL_CONTROLTYPE_MUTE:
+ return 2 * lineID + 1;
+ }
+ FIXME("Internal error");
+ return 0x00FADE00;
+}
+
+/**************************************************************************
+ * MIX_SplitControlID [internal]
+ */
+static BOOL MIX_SplitControlID(DWORD controlID, LPDWORD lineID, LPDWORD controlType)
+{
+ *lineID = controlID / 2;
+ *controlType = (controlID & 1) ?
+ MIXERCONTROL_CONTROLTYPE_MUTE : MIXERCONTROL_CONTROLTYPE_VOLUME;
+
+ return *lineID < SOUND_MIXER_NRDEVICES && WINE_CHN_SUPPORTS(MIX_DevMask, *lineID);
+}
+
+/**************************************************************************
+ * MIX_DoGetLineControls [internal]
+ */
+static void MIX_DoGetLineControls(LPMIXERCONTROLA mc, DWORD lineID, DWORD dwType)
+{
+ mc->cbStruct = sizeof(MIXERCONTROLA);
+
+ switch (dwType) {
+ case MIXERCONTROL_CONTROLTYPE_VOLUME:
+ TRACE("Returning volume control\n");
+ mc->dwControlID = MIX_MakeControlID(lineID, dwType);
+ mc->dwControlType = MIXERCONTROL_CONTROLTYPE_VOLUME;
+ mc->fdwControl = 0;
+ mc->cMultipleItems = 0;
+ strncpy(mc->szShortName, "Vol", MIXER_SHORT_NAME_CHARS);
+ strncpy(mc->szName, "Volume", MIXER_LONG_NAME_CHARS);
+ memset(&mc->Bounds, 0, sizeof(mc->Bounds));
+ /* CONTROLTYPE_VOLUME uses the MIXER_CONTROLDETAILS_UNSIGNED struct,
+ * [0, 100] is the range supported by OSS
+ * FIXME: sounds like MIXERCONTROL_CONTROLTYPE_VOLUME is always between 0 and 65536
+ * whatever the min and max values are...
+ * look at conversions done in (Get|Set)ControlDetails to stay in [0, 100] range
+ */
+ mc->Bounds.s1.dwMinimum = 0;
+ mc->Bounds.s1.dwMaximum = 100;
+ memset(&mc->Metrics, 0, sizeof(mc->Metrics));
+ break;
+ case MIXERCONTROL_CONTROLTYPE_MUTE:
+ TRACE("Returning mute control\n");
+ mc->dwControlID = MIX_MakeControlID(lineID, dwType);
+ mc->dwControlType = MIXERCONTROL_CONTROLTYPE_MUTE;
+ mc->fdwControl = 0;
+ mc->cMultipleItems = 0;
+ strncpy(mc->szShortName, "Mute", MIXER_SHORT_NAME_CHARS);
+ strncpy(mc->szName, "Mute", MIXER_LONG_NAME_CHARS);
+ memset(&mc->Bounds, 0, sizeof(mc->Bounds));
+ memset(&mc->Metrics, 0, sizeof(mc->Metrics));
+ break;
+ default:
+ FIXME("Internal error: unknown type: %08lx\n", dwType);
+ }
}
/**************************************************************************
@@ -350,9 +369,10 @@
*/
static DWORD MIX_GetLineControls(WORD wDevID, LPMIXERLINECONTROLSA lpMlc, DWORD flags)
{
- LPMIXERCONTROLA mc;
+ DWORD dwRet = MMSYSERR_NOERROR;
+ DWORD lineID, controlType;
- TRACE("(%04X, %p, %lu): stub!\n", wDevID, lpMlc, flags);
+ TRACE("(%04X, %p, %lu);\n", wDevID, lpMlc, flags);
if (lpMlc == NULL) return MMSYSERR_INVALPARAM;
if (lpMlc->cbStruct < sizeof(*lpMlc) ||
@@ -362,47 +382,39 @@
switch (flags & MIXER_GETLINECONTROLSF_QUERYMASK) {
case MIXER_GETLINECONTROLSF_ALL:
TRACE("line=%08lx GLCF_ALL (%ld)\n", lpMlc->dwLineID, lpMlc->cControls);
- if (lpMlc->cControls != 1)
- return MMSYSERR_INVALPARAM;
+ if (lpMlc->cControls != 2) {
+ dwRet = MMSYSERR_INVALPARAM;
+ } else {
+ MIX_DoGetLineControls(&lpMlc->pamxctrl[0], lpMlc->dwLineID, MIXERCONTROL_CONTROLTYPE_VOLUME);
+ MIX_DoGetLineControls(&lpMlc->pamxctrl[1], lpMlc->dwLineID, MIXERCONTROL_CONTROLTYPE_MUTE);
+ }
break;
case MIXER_GETLINECONTROLSF_ONEBYID:
TRACE("line=%08lx GLCF_ONEBYID (%lx)\n", lpMlc->dwLineID, lpMlc->u.dwControlID);
- if (lpMlc->u.dwControlID != 0)
- return MMSYSERR_INVALPARAM;
+ if (MIX_SplitControlID(lpMlc->u.dwControlID, &lineID, &controlType))
+ MIX_DoGetLineControls(&lpMlc->pamxctrl[0], lineID, controlType);
+ else
+ dwRet = MMSYSERR_INVALPARAM;
break;
case MIXER_GETLINECONTROLSF_ONEBYTYPE:
TRACE("line=%08lx GLCF_ONEBYTYPE (%lx)\n", lpMlc->dwLineID, lpMlc->u.dwControlType);
- if ((lpMlc->u.dwControlType & MIXERCONTROL_CT_CLASS_MASK) != MIXERCONTROL_CT_CLASS_FADER)
- return MMSYSERR_INVALPARAM;
+ switch (lpMlc->u.dwControlType & MIXERCONTROL_CT_CLASS_MASK) {
+ case MIXERCONTROL_CT_CLASS_FADER:
+ MIX_DoGetLineControls(&lpMlc->pamxctrl[0], lpMlc->dwLineID, MIXERCONTROL_CONTROLTYPE_VOLUME);
+ break;
+ case MIXERCONTROL_CT_CLASS_SWITCH:
+ MIX_DoGetLineControls(&lpMlc->pamxctrl[0], lpMlc->dwLineID, MIXERCONTROL_CONTROLTYPE_MUTE);
+ break;
+ default:
+ dwRet = MMSYSERR_INVALPARAM;
+ }
break;
default:
ERR("Unknown flag %08lx\n", flags & MIXER_GETLINECONTROLSF_QUERYMASK);
- return MMSYSERR_INVALPARAM;
+ dwRet = MMSYSERR_INVALPARAM;
}
- TRACE("Returning volume control\n");
- /* currently, OSS only provides 1 control per line
- * so one by id == one by type == all
- */
- mc = lpMlc->pamxctrl;
- mc->cbStruct = sizeof(MIXERCONTROLA);
- /* since we always have a single control per line, we'll use for controlID the lineID */
- mc->dwControlID = lpMlc->dwLineID;
- mc->dwControlType = MIXERCONTROL_CONTROLTYPE_VOLUME;
- mc->fdwControl = 0;
- mc->cMultipleItems = 0;
- strncpy(mc->szShortName, "Vol", MIXER_SHORT_NAME_CHARS);
- strncpy(mc->szName, "Volume", MIXER_LONG_NAME_CHARS);
- memset(&mc->Bounds, 0, sizeof(mc->Bounds));
- /* CONTROLTYPE_VOLUME uses the MIXER_CONTROLDETAILS_UNSIGNED struct,
- * [0, 100] is the range supported by OSS
- * FIXME: sounds like MIXERCONTROL_CONTROLTYPE_VOLUME is always between 0 and 65536...
- * look at conversions done in (Get|Set)ControlDetails to stay in [0, 100] range
- */
- mc->Bounds.s1.dwMinimum = 0;
- mc->Bounds.s1.dwMaximum = 100;
- memset(&mc->Metrics, 0, sizeof(mc->Metrics));
- mc->Metrics.cSteps = 0;
- return MMSYSERR_NOERROR;
+
+ return dwRet;
}
/**************************************************************************
@@ -411,43 +423,60 @@
static DWORD MIX_GetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd, DWORD fdwDetails)
{
DWORD ret = MMSYSERR_NOTSUPPORTED;
+ DWORD lineID, controlType;
- TRACE("(%04X, %p, %lu)\n", wDevID, lpmcd, fdwDetails);
+ TRACE("(%04X, %p, %lu);\n", wDevID, lpmcd, fdwDetails);
if (lpmcd == NULL) return MMSYSERR_INVALPARAM;
switch (fdwDetails & MIXER_GETCONTROLDETAILSF_QUERYMASK) {
case MIXER_GETCONTROLDETAILSF_VALUE:
TRACE("GCD VALUE (%08lx)\n", lpmcd->dwControlID);
- {
- LPMIXERCONTROLDETAILS_UNSIGNED mcdu;
- int val;
+ if (MIX_SplitControlID(lpmcd->dwControlID, &lineID, &controlType)) {
+ switch (controlType) {
+ case MIXERCONTROL_CONTROLTYPE_VOLUME:
+ {
+ LPMIXERCONTROLDETAILS_UNSIGNED mcdu;
+ int val;
- /* ControlID == LineID == OSS mixer channel */
- /* return value is 00RL (4 bytes)... */
- if (!MIX_GetVal(lpmcd->dwControlID, &val))
- return MMSYSERR_INVALPARAM;
+ /* return value is 00RL (4 bytes)... */
+ if ((val = MIX_Volume[lineID]) == -1 && !MIX_GetVal(lineID, &val))
+ return MMSYSERR_INVALPARAM;
- switch (lpmcd->cChannels) {
- case 1:
- /* mono... so R = L */
- mcdu = (LPMIXERCONTROLDETAILS_UNSIGNED)lpmcd->paDetails;
- mcdu->dwValue = (LOBYTE(LOWORD(val)) * 65536L) / 100;
+ switch (lpmcd->cChannels) {
+ case 1:
+ /* mono... so R = L */
+ mcdu = (LPMIXERCONTROLDETAILS_UNSIGNED)lpmcd->paDetails;
+ mcdu->dwValue = (LOBYTE(LOWORD(val)) * 65536L) / 100;
+ break;
+ case 2:
+ /* stereo, left is paDetails[0] */
+ mcdu = (LPMIXERCONTROLDETAILS_UNSIGNED)((char*)lpmcd->paDetails + 0 * lpmcd->cbDetails);
+ mcdu->dwValue = (LOBYTE(LOWORD(val)) * 65536L) / 100;
+ mcdu = (LPMIXERCONTROLDETAILS_UNSIGNED)((char*)lpmcd->paDetails + 1 * lpmcd->cbDetails);
+ mcdu->dwValue = (HIBYTE(LOWORD(val)) * 65536L) / 100;
+ break;
+ default:
+ WARN("Unknown cChannels (%ld)\n", lpmcd->cChannels);
+ return MMSYSERR_INVALPARAM;
+ }
+ TRACE("=> %08lx\n", mcdu->dwValue);
+ }
break;
- case 2:
- /* stereo, left is paDetails[0] */
- mcdu = (LPMIXERCONTROLDETAILS_UNSIGNED)((char*)lpmcd->paDetails + 0 * lpmcd->cbDetails);
- mcdu->dwValue = (LOBYTE(LOWORD(val)) * 65536L) / 100;
- mcdu = (LPMIXERCONTROLDETAILS_UNSIGNED)((char*)lpmcd->paDetails + 1 * lpmcd->cbDetails);
- mcdu->dwValue = (HIBYTE(LOWORD(val)) * 65536L) / 100;
+ case MIXERCONTROL_CONTROLTYPE_MUTE:
+ {
+ LPMIXERCONTROLDETAILS_BOOLEAN mcdb;
+
+ /* we mute both channels at the same time */
+ mcdb = (LPMIXERCONTROLDETAILS_BOOLEAN)lpmcd->paDetails;
+ mcdb->fValue = (MIX_Volume[lineID] != -1);
+ }
break;
- default:
- WARN("Unknown cChannels (%ld)\n", lpmcd->cChannels);
- return MMSYSERR_INVALPARAM;
}
- TRACE("=> %08lx\n", mcdu->dwValue);
+ ret = MMSYSERR_NOERROR;
+ } else {
+ ret = MMSYSERR_INVALPARAM;
}
- ret = MMSYSERR_NOERROR;
break;
case MIXER_GETCONTROLDETAILSF_LISTTEXT:
FIXME("NIY\n");
@@ -464,45 +493,73 @@
static DWORD MIX_SetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd, DWORD fdwDetails)
{
DWORD ret = MMSYSERR_NOTSUPPORTED;
+ DWORD lineID, controlType;
+ int val;
- TRACE("(%04X, %p, %lu)\n", wDevID, lpmcd, fdwDetails);
+ TRACE("(%04X, %p, %lu);\n", wDevID, lpmcd, fdwDetails);
if (lpmcd == NULL) return MMSYSERR_INVALPARAM;
switch (fdwDetails & MIXER_GETCONTROLDETAILSF_QUERYMASK) {
case MIXER_GETCONTROLDETAILSF_VALUE:
TRACE("GCD VALUE (%08lx)\n", lpmcd->dwControlID);
- {
- LPMIXERCONTROLDETAILS_UNSIGNED mcdu;
- int val;
-
- /* val should contain 00RL */
- switch (lpmcd->cChannels) {
- case 1:
- /* mono... so R = L */
- mcdu = (LPMIXERCONTROLDETAILS_UNSIGNED)lpmcd->paDetails;
- TRACE("Setting RL to %08ld\n", mcdu->dwValue);
- val = 0x101 * ((mcdu->dwValue * 100) >> 16);
+ if (MIX_SplitControlID(lpmcd->dwControlID, &lineID, &controlType)) {
+ switch (controlType) {
+ case MIXERCONTROL_CONTROLTYPE_VOLUME:
+ {
+ LPMIXERCONTROLDETAILS_UNSIGNED mcdu;
+
+ /* val should contain 00RL */
+ switch (lpmcd->cChannels) {
+ case 1:
+ /* mono... so R = L */
+ mcdu = (LPMIXERCONTROLDETAILS_UNSIGNED)lpmcd->paDetails;
+ TRACE("Setting RL to %08ld\n", mcdu->dwValue);
+ val = 0x101 * ((mcdu->dwValue * 100) >> 16);
+ break;
+ case 2:
+ /* stereo, left is paDetails[0] */
+ mcdu = (LPMIXERCONTROLDETAILS_UNSIGNED)((char*)lpmcd->paDetails + 0 * lpmcd->cbDetails);
+ TRACE("Setting L to %08ld\n", mcdu->dwValue);
+ val = ((mcdu->dwValue * 100) >> 16);
+ mcdu = (LPMIXERCONTROLDETAILS_UNSIGNED)((char*)lpmcd->paDetails + 1 * lpmcd->cbDetails);
+ TRACE("Setting R to %08ld\n", mcdu->dwValue);
+ val += ((mcdu->dwValue * 100) >> 16) << 8;
+ break;
+ default:
+ WARN("Unknown cChannels (%ld)\n", lpmcd->cChannels);
+ return MMSYSERR_INVALPARAM;
+ }
+
+ if (MIX_Volume[lineID] == -1) {
+ if (!MIX_SetVal(lineID, val))
+ return MMSYSERR_INVALPARAM;
+ } else {
+ MIX_Volume[lineID] = val;
+ }
+ }
+ ret = MMSYSERR_NOERROR;
break;
- case 2:
- /* stereo, left is paDetails[0] */
- mcdu = (LPMIXERCONTROLDETAILS_UNSIGNED)((char*)lpmcd->paDetails + 0 * lpmcd->cbDetails);
- TRACE("Setting L to %08ld\n", mcdu->dwValue);
- val = ((mcdu->dwValue * 100) >> 16);
- mcdu = (LPMIXERCONTROLDETAILS_UNSIGNED)((char*)lpmcd->paDetails + 1 * lpmcd->cbDetails);
- TRACE("Setting R to %08ld\n", mcdu->dwValue);
- val += ((mcdu->dwValue * 100) >> 16) << 8;
+ case MIXERCONTROL_CONTROLTYPE_MUTE:
+ {
+ LPMIXERCONTROLDETAILS_BOOLEAN mcdb;
+
+ mcdb = (LPMIXERCONTROLDETAILS_BOOLEAN)lpmcd->paDetails;
+ if (mcdb->fValue) {
+ if (!MIX_GetVal(lineID, &MIX_Volume[lineID]))
+ return MMSYSERR_INVALPARAM;
+ if (!MIX_SetVal(lineID, 0))
+ return MMSYSERR_INVALPARAM;
+ } else {
+ if (!MIX_SetVal(lineID, MIX_Volume[lineID]))
+ return MMSYSERR_INVALPARAM;
+ MIX_Volume[lineID] = -1;
+ }
+ }
+ ret = MMSYSERR_NOERROR;
break;
- default:
- WARN("Unknown cChannels (%ld)\n", lpmcd->cChannels);
- return MMSYSERR_INVALPARAM;
}
-
- /* ControlID == LineID == OSS mixer channel */
- if (!MIX_SetVal(lpmcd->dwControlID, &val))
- return MMSYSERR_INVALPARAM;
}
- ret = MMSYSERR_NOERROR;
break;
case MIXER_GETCONTROLDETAILSF_LISTTEXT:
FIXME("NIY\n");
@@ -513,22 +570,64 @@
return MMSYSERR_NOTSUPPORTED;
}
+/**************************************************************************
+ * MIX_GetNumDevs [internal]
+ */
static DWORD MIX_GetNumDevs(UINT wDevID)
{
- int mixer;
- int ret;
+ return (MIX_DevMask != 0) ? 1 : 0;
+}
+
+/**************************************************************************
+ * MIX_Init [internal]
+ */
+static DWORD MIX_Init(void)
+{
+ int mixer, i;
if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) {
- /* FIXME: ENXIO => no mixer installed */
- WARN("mixer device not available !\n");
- ret = 0;
- } else {
- close(mixer);
- ret = 1;
+ if (errno == ENODEV || errno == ENXIO) {
+ /* no driver present */
+ return MMSYSERR_NODRIVER;
+ }
+ return MMSYSERR_ERROR;
}
- TRACE("return %d;\n", ret);
- return ret;
+ if (ioctl(mixer, SOUND_MIXER_READ_DEVMASK, &MIX_DevMask) == -1) {
+ close(mixer);
+ perror("ioctl mixer SOUND_MIXER_DEVMASK");
+ return MMSYSERR_NOTENABLED;
+ }
+ MIX_DevMask &= WINE_MIXER_MASK;
+ if (ioctl(mixer, SOUND_MIXER_READ_STEREODEVS, &MIX_StereoMask) == -1) {
+ close(mixer);
+ perror("ioctl mixer SOUND_MIXER_STEREODEVS");
+ return MMSYSERR_NOTENABLED;
+ }
+ MIX_StereoMask &= WINE_MIXER_MASK;
+
+#if 0
+ int recsrc, recmask;
+
+ if (ioctl(mixer, SOUND_MIXER_READ_RECSRC, &recsrc) == -1) {
+ close(mixer);
+ perror("ioctl mixer SOUND_MIXER_RECSRC");
+ return MMSYSERR_NOTENABLED;
+ }
+
+ if (ioctl(mixer, SOUND_MIXER_READ_RECMASK, &recmask) == -1) {
+ close(mixer);
+ perror("ioctl mixer SOUND_MIXER_RECMASK");
+ return MMSYSERR_NOTENABLED;
+ }
+#endif
+ for (i = 0; i < SOUND_MIXER_NRDEVICES; i++) {
+ MIX_Volume[i] = -1;
+ }
+ close(mixer);
+
+ return MMSYSERR_NOERROR;
}
+
#endif /* HAVE_OSS */
/**************************************************************************
@@ -543,6 +642,8 @@
#ifdef HAVE_OSS
switch(wMsg) {
case DRVM_INIT:
+ return MIX_Init();
+ break;
case DRVM_EXIT:
case DRVM_ENABLE:
case DRVM_DISABLE:
