Mark Harmstone : dsound: Remove unused struct entries.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Dec 29 15:42:42 CST 2014
Module: wine
Branch: master
Commit: b7a2f0879c6982eff9e8923b3c3bdd437205bb36
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7a2f0879c6982eff9e8923b3c3bdd437205bb36
Author: Mark Harmstone <hellas at burntcomma.com>
Date: Sat Dec 27 21:31:00 2014 +0000
dsound: Remove unused struct entries.
---
dlls/dsound/dsound_private.h | 3 ---
dlls/dsound/mixer.c | 8 --------
2 files changed, 11 deletions(-)
diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
index a8f5f42..493df91 100644
--- a/dlls/dsound/dsound_private.h
+++ b/dlls/dsound/dsound_private.h
@@ -53,10 +53,7 @@ typedef struct _DSVOLUMEPAN
DWORD dwTotalLeftAmpFactor;
DWORD dwTotalRightAmpFactor;
LONG lVolume;
- DWORD dwVolAmpFactor;
LONG lPan;
- DWORD dwPanLeftAmpFactor;
- DWORD dwPanRightAmpFactor;
} DSVOLUMEPAN,*PDSVOLUMEPAN;
/*****************************************************************************
diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c
index 0fae20e..5e24382 100644
--- a/dlls/dsound/mixer.c
+++ b/dlls/dsound/mixer.c
@@ -51,8 +51,6 @@ void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan)
TRACE("Vol=%d Pan=%d\n", volpan->lVolume, volpan->lPan);
/* the AmpFactors are expressed in 16.16 fixed point */
- volpan->dwVolAmpFactor = (ULONG) (pow(2.0, volpan->lVolume / 600.0) * 0xffff);
- /* FIXME: dwPan{Left|Right}AmpFactor */
/* FIXME: use calculated vol and pan ampfactors */
temp = (double) (volpan->lVolume - (volpan->lPan > 0 ? volpan->lPan : 0));
@@ -78,15 +76,9 @@ void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan)
else
right=600 * log(((double)volpan->dwTotalRightAmpFactor) / 0xffff) / log(2);
if (left<right)
- {
volpan->lVolume=right;
- volpan->dwVolAmpFactor=volpan->dwTotalRightAmpFactor;
- }
else
- {
volpan->lVolume=left;
- volpan->dwVolAmpFactor=volpan->dwTotalLeftAmpFactor;
- }
if (volpan->lVolume < -10000)
volpan->lVolume=-10000;
volpan->lPan=right-left;
More information about the wine-cvs
mailing list