Changeset 19403


Ignore:
Timestamp:
Jul 12, 2002, 10:12:30 AM (23 years ago)
Author:
sandervl
Message:

some cleanup

Location:
tags/trunk/src/winmm
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified tags/trunk/src/winmm/mixer.cpp

    r19083 r19403  
    1 /* $Id: mixer.cpp,v 1.25 2002-05-30 14:31:07 sandervl Exp $ */
     1/* $Id: mixer.cpp,v 1.26 2002-07-12 08:12:29 sandervl Exp $ */
    22
    33/*
    … …  
    507507                                return MIXERR_INVALCONTROL;
    508508                            }
    509                             return MMSYSERR_NOERROR;
     509                            goto success;
    510510                        }
    511511                    }
    … …  
    538538            mixerControls[lpmcd->dwControlID].val[0].dwValue = dwVolumeL;
    539539            mixerControls[lpmcd->dwControlID].val[1].dwValue = dwVolumeR;
    540             return MMSYSERR_NOERROR;
     540            goto success;
    541541        }
    542542
    … …  
    559559            }
    560560            mixerControls[lpmcd->dwControlID].val[0].dwValue = fMute;
    561             return MMSYSERR_NOERROR;
     561            goto success;
    562562        }
    563563
    … …  
    588588            }
    589589            mixerControls[lpmcd->dwControlID].val[0].dwValue = dwLevel;
    590             return MMSYSERR_NOERROR;
     590            goto success;
    591591        }
    592592       
    … …  
    678678    }
    679679    return MMSYSERR_NOTSUPPORTED;
     680
     681success:
     682    if(pMixInfo->dwFlags & CALLBACK_WINDOW && pMixInfo->dwCallback) {
     683        dprintf(("Notify window %x of control change", pMixInfo->dwCallback));
     684        PostMessageA((HWND)pMixInfo->dwCallback, MM_MIXM_CONTROL_CHANGE, (WPARAM)hmxobj, (LPARAM)lpmcd->dwControlID);
     685    }
     686    return MMSYSERR_NOERROR;
    680687}
    681688/******************************************************************************/
    … …  
    15281535/******************************************************************************/
    15291536void mixerExit()
    1530 {
     1537{
     1538    if(fMMPMAvailable == FALSE) return;
     1539
    15311540    OSLibMixerClose();
    15321541}
    … …  
    15551564    pline->Target.vDriverVersion = WINMM_MIXER_CAPS_VERSION;
    15561565    pline->dwSource              = nrSources;
     1566    OSLibMixGetLineCaps(dwSource, &pline->cChannels);
    15571567    nrSources++;
    15581568
    … …  
    15621572    case MIXER_SRC_IN_L_PHONE:
    15631573    case MIXER_SRC_IN_W_PHONE:
    1564         pline->cChannels       = 1;
    15651574        pline->dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_TELEPHONE;
    15661575        pline->Target.dwType   = MIXERLINE_TARGETTYPE_UNDEFINED;
    … …  
    15691578    case MIXER_SRC_IN_L_MIC:
    15701579    case MIXER_SRC_IN_W_MIC:
    1571         pline->cChannels       = 1;
    15721580        pline->dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_MICROPHONE;
    15731581        pline->Target.dwType   = MIXERLINE_TARGETTYPE_UNDEFINED;
    … …  
    15761584    case MIXER_SRC_IN_L_LINE:
    15771585    case MIXER_SRC_IN_W_LINE:
    1578         pline->cChannels       = 2;
    15791586        pline->dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_LINE;
    15801587        pline->Target.dwType   = MIXERLINE_TARGETTYPE_UNDEFINED;
    … …  
    15831590    case MIXER_SRC_IN_L_CD:
    15841591    case MIXER_SRC_IN_W_CD:
    1585         pline->cChannels       = 2;
    15861592        pline->dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_COMPACTDISC;
    15871593        pline->Target.dwType   = MIXERLINE_TARGETTYPE_UNDEFINED;
    … …  
    15901596    case MIXER_SRC_IN_L_SPDIF:
    15911597    case MIXER_SRC_IN_W_SPDIF:
    1592         pline->cChannels       = 2;
    15931598        pline->dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_DIGITAL;
    15941599        pline->Target.dwType   = MIXERLINE_TARGETTYPE_UNDEFINED;
    … …  
    15971602    case MIXER_SRC_IN_L_VIDEO:
    15981603    case MIXER_SRC_IN_W_VIDEO:
    1599         pline->cChannels       = 2;
    16001604        pline->dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_UNDEFINED;
    16011605        pline->Target.dwType   = MIXERLINE_TARGETTYPE_UNDEFINED;
    … …  
    16041608    case MIXER_SRC_IN_L_AUX:
    16051609    case MIXER_SRC_IN_W_AUX:
    1606         pline->cChannels       = 2;
    16071610        pline->dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_AUXILIARY;
    16081611        pline->Target.dwType   = MIXERLINE_TARGETTYPE_AUX;
    … …  
    16111614    case MIXER_SRC_IN_L_PCM:
    16121615    case MIXER_SRC_IN_W_PCM:
    1613         pline->cChannels       = 2;
    16141616        pline->dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_WAVEOUT;
    16151617        pline->Target.dwType   = MIXERLINE_TARGETTYPE_WAVEOUT;
    … …  
    16201622    case MIXER_SRC_IN_L_MIDI:
    16211623    case MIXER_SRC_IN_W_MIDI:
    1622         pline->cChannels       = 2;
    16231624        pline->dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_SYNTHESIZER;
    16241625        pline->Target.dwType   = MIXERLINE_TARGETTYPE_MIDIOUT;

  • TabularUnified tags/trunk/src/winmm/mixeros2.cpp

    r19083 r19403  
    1 /* $Id: mixeros2.cpp,v 1.8 2002-05-30 14:31:07 sandervl Exp $ */
     1/* $Id: mixeros2.cpp,v 1.9 2002-07-12 08:12:30 sandervl Exp $ */
    22
    33/*
    … …  
    4444    char szPDDName[128] = "\\DEV\\";
    4545
    46     if(GetAudioPDDName(&szPDDName[5]) == FALSE) {
     46    if(OSLibGetAudioPDDName(&szPDDName[5]) == FALSE) {
    4747        return FALSE;
    4848    }
    … …  
    317317    mixstruct.Mute = fMute;
    318318
     319    dprintf(("OSLibMixSetMute (%d,%d) %d", mixstruct.VolumeL, mixstruct.VolumeR, mixstruct.Mute));
    319320    if(mixerapiIOCTL90(hPDDMix, dwFunc, &mixstruct, sizeof(mixstruct)) == TRUE) {
    320321        return TRUE;
    321322    }
    322     dprintf(("OSLibMixSetVolume: mixerapiIOCTL90 %d failed!!", dwFunc));
     323    dprintf(("OSLibMixSetMute: mixerapiIOCTL90 %d failed!!", dwFunc));
    323324    return FALSE;
    324325}
    … …  
    422423/******************************************************************************/
    423424/******************************************************************************/
     425BOOL OSLibMixGetLineCaps(DWORD dwLine, DWORD *pcChannels)
     426{
     427    switch(dwLine) {
     428    case MIXER_SRC_IN_L_MONOIN:
     429    case MIXER_SRC_IN_W_MONOIN:
     430    case MIXER_SRC_IN_L_PHONE:
     431    case MIXER_SRC_IN_W_PHONE:
     432    case MIXER_SRC_IN_L_MIC:
     433    case MIXER_SRC_IN_W_MIC:
     434        *pcChannels = 1;
     435        break;
     436
     437    case MIXER_SRC_IN_W_LINE:
     438    case MIXER_SRC_IN_W_CD:
     439    case MIXER_SRC_IN_W_SPDIF:
     440    case MIXER_SRC_IN_W_VIDEO:
     441    case MIXER_SRC_IN_W_AUX:
     442    case MIXER_SRC_IN_W_PCM:
     443    case MIXER_SRC_IN_W_WAVETABLE:
     444    case MIXER_SRC_IN_W_MIDI:
     445        *pcChannels = 2;
     446        break;
     447
     448    case MIXER_SRC_IN_L_LINE:
     449    case MIXER_SRC_IN_L_CD:
     450    case MIXER_SRC_IN_L_SPDIF:
     451    case MIXER_SRC_IN_L_VIDEO:
     452    case MIXER_SRC_IN_L_AUX:
     453    case MIXER_SRC_IN_L_PCM:
     454    case MIXER_SRC_IN_L_WAVETABLE:
     455    case MIXER_SRC_IN_L_MIDI:
     456        *pcChannels = 2;
     457        break;
     458    default:
     459        DebugInt3();
     460        return FALSE;
     461    }
     462
     463    return TRUE;
     464}
     465/******************************************************************************/
     466/******************************************************************************/
    424467BOOL OSLibMixGetCtrlCaps(DWORD dwControl, LONG *plMinimum, LONG *plMaximum, DWORD *pcSteps)
    425468{
    … …  
    649692// for the default MMPM/2 WaveAudio device.  Joe Nord 10-Mar-1999
    650693/******************************************************************************/
    651 static BOOL GetAudioPDDName (char *pszPDDName)
     694BOOL OSLibGetAudioPDDName (char *pszPDDName)
    652695{
    653696   ULONG                   ulRC;

  • TabularUnified tags/trunk/src/winmm/mixeros2.h

    r19063 r19403  
    1 /* $Id: mixeros2.h,v 1.8 2002-05-28 17:10:02 sandervl Exp $ */
     1/* $Id: mixeros2.h,v 1.9 2002-07-12 08:12:30 sandervl Exp $ */
    22
    33/*
    … …  
    123123BOOL OSLibMixIsRecSourcePresent(DWORD dwRecSrc);
    124124BOOL OSLibMixGetCtrlCaps(DWORD dwControl, LONG *plMinimum, LONG *plMaximum, DWORD *pcSteps);
     125BOOL OSLibMixGetLineCaps(DWORD dwControl, DWORD *pcChannels);
     126BOOL OSLibGetAudioPDDName(char *pszPDDName);
    125127
    126128#ifdef __cplusplus
Note: See TracChangeset for help on using the changeset viewer.