Changeset 21916 for trunk/src/dsound


Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
10 deleted
5 edited
10 copied

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/src/dsound/DAudioNotify.h

    r5608 r21916  
    4646};
    4747
     48HRESULT __stdcall DAudioNotifyQueryInterface(THIS, REFIID riid, LPVOID * ppvObj);
     49ULONG   __stdcall DAudioNotifyAddRef(THIS);
     50ULONG   __stdcall DAudioNotifyRelease(THIS);
     51HRESULT __stdcall DAudioNotifySetNotificationPositions(THIS, DWORD cPositionNotifies, LPCDSBPOSITIONNOTIFY lpcPositionNotifies);
     52
    4853#endif //__DAUDIONOTIFY_H__

  • trunk/src/dsound/OS23DBuffer.h

    r3099 r21916  
    5858};
    5959
     60HRESULT __stdcall Sound3DBufferQueryInterface(THIS, REFIID riid, LPVOID * ppvObj);
     61ULONG   __stdcall Sound3DBufferAddRef(THIS);
     62ULONG   __stdcall Sound3DBufferRelease(THIS);
     63HRESULT __stdcall Sound3DBufferGetAllParameters(THIS, LPDS3DBUFFER lpDs3dBuffer);
     64HRESULT __stdcall Sound3DBufferSetAllParameters(THIS, LPCDS3DBUFFER lpcDs3dBuffer, DWORD dwApply);
     65HRESULT __stdcall Sound3DBufferGetMaxDistance(THIS, LPD3DVALUE lpflMaxDistance);
     66HRESULT __stdcall Sound3DBufferGetMinDistance(THIS, LPD3DVALUE lpflMinDistance);
     67HRESULT __stdcall Sound3DBufferSetMaxDistance(THIS, D3DVALUE flMaxDistance, DWORD dwApply);
     68HRESULT __stdcall Sound3DBufferSetMinDistance(THIS, D3DVALUE flMinDistance, DWORD dwApply);
     69HRESULT __stdcall Sound3DBufferGetMode(THIS, LPDWORD lpdwMode);
     70HRESULT __stdcall Sound3DBufferSetMode(THIS, DWORD dwMode, DWORD dwApply);
     71HRESULT __stdcall Sound3DBufferGetPosition(THIS, LPD3DVECTOR lpvPosition);
     72HRESULT __stdcall Sound3DBufferSetPosition(THIS, D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply);
     73HRESULT __stdcall Sound3DBufferGetConeAngles(THIS, LPDWORD lpdwInsideConeAngle, LPDWORD lpdwOutsideConeAngle);
     74HRESULT __stdcall Sound3DBufferSetConeAngles(THIS, DWORD dwInsideConeAngle, DWORD dwOutsideConeAngle, DWORD dwApply);
     75HRESULT __stdcall Sound3DBufferGetConeOrientation(THIS, LPD3DVECTOR lpvOrientation);
     76HRESULT __stdcall Sound3DBufferSetConeOrientation(THIS, D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply);
     77HRESULT __stdcall Sound3DBufferGetConeOutsideVolume(THIS, LPLONG lplConeOutsideVolume);
     78HRESULT __stdcall Sound3DBufferSetConeOutsideVolume(THIS, LONG lConeOutsideVolume, DWORD dwApply);
     79HRESULT __stdcall Sound3DBufferGetVelocity(THIS, LPD3DVECTOR lpvVelocity);
     80HRESULT __stdcall Sound3DBufferSetVelocity(THIS, D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply);
     81
    6082#endif

  • trunk/src/dsound/OS23DListener.h

    r3099 r21916  
    5555};
    5656
     57HRESULT __stdcall Sound3DListenerQueryInterface(THIS, REFIID riid, LPVOID * ppvObj);
     58ULONG   __stdcall Sound3DListenerAddRef(THIS);
     59ULONG   __stdcall Sound3DListenerRelease(THIS);
     60HRESULT __stdcall Sound3DListenerGetAllParameters(THIS, LPDS3DLISTENER lpListener);
     61HRESULT __stdcall Sound3DListenerSetAllParameters(THIS, LPCDS3DLISTENER lpcListener, DWORD dwApply);
     62HRESULT __stdcall Sound3DListenerCommitDeferredSettings(THIS);
     63HRESULT __stdcall Sound3DListenerGetDistanceFactor(THIS, LPD3DVALUE lpflDistanceFactor);
     64HRESULT __stdcall Sound3DListenerSetDistanceFactor(THIS, D3DVALUE flDistanceFactor, DWORD dwApply);
     65HRESULT __stdcall Sound3DListenerGetDopplerFactor(THIS, LPD3DVALUE lpflDopplerFactor);
     66HRESULT __stdcall Sound3DListenerSetDopplerFactor(THIS, D3DVALUE flDopplerFactor, DWORD dwApply);
     67HRESULT __stdcall Sound3DListenerGetOrientation(THIS, LPD3DVECTOR lpvOrientFront, LPD3DVECTOR lpvOrientTop);
     68HRESULT __stdcall Sound3DListenerSetOrientation(THIS, D3DVALUE xFront, D3DVALUE yFront, D3DVALUE zFront, D3DVALUE xTop, D3DVALUE yTop, D3DVALUE zTop, DWORD dwApply);
     69HRESULT __stdcall Sound3DListenerGetPosition(THIS, LPD3DVECTOR lpvPosition);
     70HRESULT __stdcall Sound3DListenerSetPosition(THIS, D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply);
     71HRESULT __stdcall Sound3DListenerGetRolloffFactor(THIS, LPD3DVALUE lpflRolloffFactor);
     72HRESULT __stdcall Sound3DListenerSetRolloffFactor(THIS, D3DVALUE flRolloffFactor, DWORD dwApply);
     73HRESULT __stdcall Sound3DListenerGetVelocity(THIS, LPD3DVECTOR lpvVelocity);
     74HRESULT __stdcall Sound3DListenerSetVelocity(THIS, D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply);
     75
    5776#endif

  • trunk/src/dsound/OS2PrimBuff.h

    r5285 r21916  
    7474};
    7575
     76HRESULT __stdcall PrimBufQueryInterface(THIS, REFIID riid, LPVOID * ppvObj);
     77ULONG   __stdcall PrimBufAddRef(THIS);
     78ULONG   __stdcall PrimBufRelease(THIS);
    7679HRESULT __stdcall PrimBufGetCaps(THIS_ LPDSBCAPS );
    7780HRESULT __stdcall PrimBufGetCurrentPosition(THIS_ LPDWORD,LPDWORD ) ;
Note: See TracChangeset for help on using the changeset viewer.