Ignore:
Timestamp:
May 22, 2002, 5:50:26 PM (23 years ago)
Author:
sandervl
Message:

added debug wrappers (.def)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/winmm/waveout.cpp

    r7196 r8470  
    1 /* $Id: waveout.cpp,v 1.22 2001-10-24 22:47:42 sandervl Exp $ */
     1/* $Id: waveout.cpp,v 1.23 2002-05-22 15:50:26 sandervl Exp $ */
    22//#undef DEBUG
    33/*
    … …  
    3636#include "dbglocal.h"
    3737
    38 ODINDEBUGCHANNEL(WINMM-WAVEOUT)
    39 
    40 
    41 /******************************************************************************/
    42 /******************************************************************************/
    43 
    44 //@@@PH 1999/12/28 this function needs the win32 tib FS selector for callback purposes
    45 //                 therefore, one cannot use ODINFUNCTION macro wrappers! The xxxFS
    46 //                 macro passes in USHORT selFS as first parameter.
    47 ODINFUNCTION6(MMRESULT, waveOutOpen,
    48               LPHWAVEOUT, phwo,
    49               UINT, uDeviceID,
    50               const LPWAVEFORMATEX, pwfx,
    51               DWORD, dwCallback,
    52               DWORD, dwInstance,
    53               DWORD, fdwOpen)
     38
     39/******************************************************************************/
     40/******************************************************************************/
     41MMRESULT WINAPI waveOutOpen(LPHWAVEOUT phwo, UINT uDeviceID, const LPWAVEFORMATEX pwfx,
     42                            DWORD dwCallback, DWORD dwInstance, DWORD fdwOpen)
    5443{
    5544  MMRESULT rc;
    … …  
    9079/******************************************************************************/
    9180/******************************************************************************/
    92 ODINFUNCTION3(MMRESULT, waveOutWrite,
    93               HWAVEOUT, hwo,
    94               LPWAVEHDR, pwh,
    95               UINT, cbwh)
     81MMRESULT WINAPI waveOutWrite(HWAVEOUT hwo, LPWAVEHDR pwh, UINT cbwh)
    9682{
    9783    WaveOut *dwave = (WaveOut *)hwo;
    … …  
    115101/******************************************************************************/
    116102/******************************************************************************/
    117 ODINFUNCTION1(MMRESULT, waveOutReset,
    118               HWAVEOUT, hwaveout)
     103MMRESULT WINAPI waveOutReset(HWAVEOUT hwaveout)
    119104{
    120105  WaveOut *dwave = (WaveOut *)hwaveout;
    … …  
    126111/******************************************************************************/
    127112/******************************************************************************/
    128 ODINFUNCTION1(MMRESULT, waveOutBreakLoop,
    129               HWAVEOUT, hwaveout)
     113MMRESULT WINAPI waveOutBreakLoop(HWAVEOUT hwaveout)
    130114{
    131115    WaveOut *dwave = (WaveOut *)hwaveout;
    … …  
    138122/******************************************************************************/
    139123/******************************************************************************/
    140 ODINFUNCTION1(MMRESULT, waveOutClose,
    141               HWAVEOUT, hwaveout)
     124MMRESULT WINAPI waveOutClose(HWAVEOUT hwaveout)
    142125{
    143126    WaveOut *dwave = (WaveOut *)hwaveout;
    … …  
    155138/******************************************************************************/
    156139/******************************************************************************/
    157 ODINFUNCTION1(MMRESULT, waveOutPause,
    158               HWAVEOUT, hwaveout)
     140MMRESULT WINAPI waveOutPause(HWAVEOUT hwaveout)
    159141{
    160142    WaveOut *dwave = (WaveOut *)hwaveout;
    … …  
    166148/******************************************************************************/
    167149/******************************************************************************/
    168 ODINFUNCTION1(MMRESULT, waveOutRestart,
    169               HWAVEOUT, hwaveout)
     150MMRESULT WINAPI waveOutRestart(HWAVEOUT hwaveout)
    170151{
    171152    WaveOut *dwave = (WaveOut *)hwaveout;
    … …  
    177158/******************************************************************************/
    178159/******************************************************************************/
    179 ODINFUNCTION3(MMRESULT, waveOutPrepareHeader,
    180               HWAVEOUT, hwo,
    181               LPWAVEHDR, pwh,
    182               UINT, cbwh)
     160MMRESULT WINAPI waveOutPrepareHeader(HWAVEOUT hwo, LPWAVEHDR pwh, UINT cbwh)
    183161{
    184162    WaveOut *dwave = (WaveOut *)hwo;
    … …  
    198176/******************************************************************************/
    199177/******************************************************************************/
    200 ODINFUNCTION3(MMRESULT, waveOutUnprepareHeader,
    201               HWAVEOUT, hwo,
    202               LPWAVEHDR, pwh,
    203               UINT, cbwh)
     178MMRESULT WINAPI waveOutUnprepareHeader(HWAVEOUT hwo, LPWAVEHDR pwh, UINT cbwh)
    204179{
    205180    WaveOut *dwave = (WaveOut *)hwo;
    … …  
    218193/******************************************************************************/
    219194/******************************************************************************/
    220 ODINFUNCTION3(MMRESULT, waveOutGetPosition,
    221               HWAVEOUT, hwo,
    222               LPMMTIME, pmmt,
    223               UINT, cbmmt)
     195MMRESULT WINAPI waveOutGetPosition(HWAVEOUT hwo, LPMMTIME pmmt, UINT cbmmt)
    224196{
    225197  WaveOut *dwave = (WaveOut *)hwo;
    … …  
    273245/******************************************************************************/
    274246/******************************************************************************/
    275 ODINFUNCTION3(MMRESULT, waveOutGetDevCapsA,
    276               UINT, uDeviceID,
    277               LPWAVEOUTCAPSA, pwoc,
    278               UINT, cbwoc)
     247MMRESULT WINAPI waveOutGetDevCapsA(UINT uDeviceID, LPWAVEOUTCAPSA pwoc, UINT cbwoc)
    279248{
    280249    if(fMMPMAvailable == FALSE) return MMSYSERR_NODRIVER;
    … …  
    305274/******************************************************************************/
    306275/******************************************************************************/
    307 ODINFUNCTION3(MMRESULT, waveOutGetDevCapsW,
    308               UINT, uDeviceID,
    309               LPWAVEOUTCAPSW, pwoc,
    310               UINT, cbwoc)
     276MMRESULT WINAPI waveOutGetDevCapsW(UINT uDeviceID, LPWAVEOUTCAPSW pwoc, UINT cbwoc)
    311277{
    312278    if(fMMPMAvailable == FALSE) return MMSYSERR_NODRIVER;
    … …  
    336302/******************************************************************************/
    337303/******************************************************************************/
    338 ODINFUNCTION0(UINT, waveOutGetNumDevs)
     304UINT WINAPI waveOutGetNumDevs()
    339305{
    340306  if(fMMPMAvailable == FALSE) return 0;
    … …  
    344310/******************************************************************************/
    345311/******************************************************************************/
    346 ODINFUNCTION3(MMRESULT, waveOutGetErrorTextA,
    347               MMRESULT, wError,
    348               LPSTR, lpText,
    349               UINT, cchText)
     312MMRESULT WINAPI waveOutGetErrorTextA(MMRESULT wError, LPSTR lpText, UINT cchText)
    350313{
    351314    char * theMsg = getWinmmMsg( wError );
    … …  
    363326/******************************************************************************/
    364327/******************************************************************************/
    365 ODINFUNCTION3(MMRESULT, waveOutGetErrorTextW,
    366               MMRESULT, wError,
    367               LPWSTR, lpText,
    368               UINT, cchText)
     328MMRESULT WINAPI waveOutGetErrorTextW(MMRESULT wError, LPWSTR lpText, UINT cchText)
    369329{
    370330    char * theMsg = getWinmmMsg( wError );
    … …  
    382342/******************************************************************************/
    383343/******************************************************************************/
    384 ODINFUNCTION2(MMRESULT, waveOutGetID,
    385               HWAVEOUT, hwo,
    386               LPUINT, puDeviceID)
     344MMRESULT WINAPI waveOutGetID(HWAVEOUT hwo, LPUINT puDeviceID)
    387345{
    388346    WaveOut *dwave = (WaveOut *)hwo;
    … …  
    396354/******************************************************************************/
    397355/******************************************************************************/
    398 ODINFUNCTION2(MMRESULT, waveOutGetPitch,
    399               HWAVEOUT, hwo,
    400               LPDWORD, pdwPitch)
    401 {
    402   WaveOut *dwave = (WaveOut *)hwo;
    403   if(WaveOut::find(dwave) == TRUE)
     356MMRESULT WINAPI waveOutGetPitch(HWAVEOUT hwo, LPDWORD pdwPitch)
     357{
     358    WaveOut *dwave = (WaveOut *)hwo;
     359    if(WaveOut::find(dwave) == TRUE)
    404360        return MMSYSERR_NOTSUPPORTED;
    405   else  return(MMSYSERR_INVALHANDLE);
    406 }
    407 /******************************************************************************/
    408 /******************************************************************************/
    409 ODINFUNCTION2(MMRESULT, waveOutSetPitch,
    410               HWAVEOUT, hwo,
    411               DWORD, dwPitch)
     361    else return(MMSYSERR_INVALHANDLE);
     362}
     363/******************************************************************************/
     364/******************************************************************************/
     365MMRESULT WINAPI waveOutSetPitch(HWAVEOUT hwo, DWORD dwPitch)
    412366{
    413367    WaveOut *dwave = (WaveOut *)hwo;
    … …  
    418372/******************************************************************************/
    419373/******************************************************************************/
    420 ODINFUNCTION2(MMRESULT, waveOutGetVolume,
    421               HWAVEOUT, hwo,
    422               LPDWORD, pdwVolume)
    423 {
    424   WaveOut *dwave = (WaveOut *)hwo;
    425   if(WaveOut::find(dwave) == TRUE)
    426   {
     374MMRESULT WINAPI waveOutGetVolume(HWAVEOUT hwo, LPDWORD pdwVolume)
     375{
     376    WaveOut *dwave = (WaveOut *)hwo;
     377    if(WaveOut::find(dwave) == TRUE)
     378    {
    427379        if(pdwVolume!=NULL)
    428380            *pdwVolume=dwave->getVolume();
    429381        return MMSYSERR_NOERROR;
    430   }
    431   else
    432       return MMSYSERR_NOERROR;
     382    }
     383    else return MMSYSERR_NOERROR;
    433384//    return(MMSYSERR_INVALHANDLE);
    434385}
    435386/******************************************************************************/
    436387/******************************************************************************/
    437 ODINFUNCTION2(MMRESULT, waveOutSetVolume,
    438               HWAVEOUT, hwo,
    439               DWORD, dwVolume)
    440 {
    441   WaveOut *dwave = (WaveOut *)hwo;
    442   if(WaveOut::find(dwave) == TRUE)
    443   {
    444     return(dwave->setVolume(dwVolume));
    445   }
    446   if(hwo == NULL) {
    447       WaveOut::setDefaultVolume(dwVolume);
    448   }
    449   return MMSYSERR_NOERROR;
     388MMRESULT WINAPI waveOutSetVolume(HWAVEOUT hwo, DWORD dwVolume)
     389{
     390    WaveOut *dwave = (WaveOut *)hwo;
     391    if(WaveOut::find(dwave) == TRUE)
     392    {
     393        return(dwave->setVolume(dwVolume));
     394    }
     395    if(hwo == NULL) {
     396        WaveOut::setDefaultVolume(dwVolume);
     397    }
     398    return MMSYSERR_NOERROR;
    450399//    return(MMSYSERR_INVALHANDLE);
    451400}
    452401/******************************************************************************/
    453402/******************************************************************************/
    454 ODINFUNCTION2(MMRESULT, waveOutGetPlaybackRate,
    455               HWAVEOUT, hwo,
    456               LPDWORD, pdwRate)
    457 {
    458   WaveOut *dwave = (WaveOut *)hwo;
    459   if(WaveOut::find(dwave) == TRUE)
    460   {
     403MMRESULT WINAPI waveOutGetPlaybackRate(HWAVEOUT hwo, LPDWORD pdwRate)
     404{
     405    WaveOut *dwave = (WaveOut *)hwo;
     406
     407    dprintf(("waveOutGetPlaybackRate: NOT IMPLEMENTED!!"));
     408    if(WaveOut::find(dwave) == TRUE)
     409    {
    461410        return MMSYSERR_NOTSUPPORTED;
    462   }
    463   else return(MMSYSERR_INVALHANDLE);
    464 }
    465 /******************************************************************************/
    466 /******************************************************************************/
    467 ODINFUNCTION2(MMRESULT, waveOutSetPlaybackRate,
    468               HWAVEOUT, hwo,
    469               DWORD, dwRate)
    470 {
    471   WaveOut *dwave = (WaveOut *)hwo;
    472   if(WaveOut::find(dwave) == TRUE)
    473   {
     411    }
     412    else return(MMSYSERR_INVALHANDLE);
     413}
     414/******************************************************************************/
     415/******************************************************************************/
     416MMRESULT WINAPI waveOutSetPlaybackRate(HWAVEOUT hwo, DWORD dwRate)
     417{
     418    WaveOut *dwave = (WaveOut *)hwo;
     419   
     420    dprintf(("waveOutSetPlaybackRate: NOT IMPLEMENTED!!"));
     421    if(WaveOut::find(dwave) == TRUE)
     422    {
    474423        return MMSYSERR_NOTSUPPORTED;
    475   }
    476   else  return(MMSYSERR_INVALHANDLE);
    477 }
    478 /******************************************************************************/
    479 /******************************************************************************/
    480 ODINFUNCTION4(MMRESULT, waveOutMessage,
    481               HWAVEOUT, hwo,
    482               UINT, uMsg,
    483               DWORD, dw1,
    484               DWORD, dw2)
    485 {
    486   WaveOut *dwave = (WaveOut *)hwo;
    487   if(WaveOut::find(dwave) == TRUE)
    488   {
    489     return MMSYSERR_NOTSUPPORTED;
    490   }
    491   else
    492     return(MMSYSERR_INVALHANDLE);
    493 }
    494 /******************************************************************************/
    495 /******************************************************************************/
    496 
    497 
     424    }
     425    else return(MMSYSERR_INVALHANDLE);
     426}
     427/******************************************************************************/
     428/******************************************************************************/
     429MMRESULT WINAPI waveOutMessage(HWAVEOUT hwo, UINT uMsg, DWORD dw1, DWORD dw2)
     430{
     431    WaveOut *dwave = (WaveOut *)hwo;
     432
     433    dprintf(("waveOutMessage: NOT IMPLEMENTED!!"));
     434    if(WaveOut::find(dwave) == TRUE)
     435    {
     436        return MMSYSERR_NOTSUPPORTED;
     437    }
     438    else
     439        return(MMSYSERR_INVALHANDLE);
     440}
     441/******************************************************************************/
     442/******************************************************************************/
     443
     444
Note: See TracChangeset for help on using the changeset viewer.