Skip to content

Remove a few unused variables #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove a few unused variables #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/fastmix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1485,13 +1485,12 @@ UINT CSoundFile::CreateStereoMix(int count)
{
const LPMIXINTERFACE *pMixFuncTable;
MODCHANNEL * const pChannel = &Chn[ChnMix[nChn]];
UINT nFlags, nMasterCh;
UINT nFlags;
LONG nSmpCount;
int nsamples;
int *pbuffer;

if (!pChannel->pCurrentSample) continue;
nMasterCh = (ChnMix[nChn] < m_nChannels) ? ChnMix[nChn]+1 : pChannel->nMasterChn;
pOfsR = &gnDryROfsVol;
pOfsL = &gnDryLOfsVol;
nFlags = 0;
Expand Down
2 changes: 0 additions & 2 deletions src/load_669.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,12 @@ DWORD lengthArrayToDWORD(const BYTE length[4]) {
BOOL CSoundFile::Read669(const BYTE *lpStream, DWORD dwMemLength)
//---------------------------------------------------------------
{
BOOL b669Ext;
const FILEHEADER669 *pfh = (const FILEHEADER669 *)lpStream;
const SAMPLE669 *psmp = (const SAMPLE669 *)(lpStream + 0x1F1);
DWORD dwMemPos = 0;

if ((!lpStream) || (dwMemLength < sizeof(FILEHEADER669))) return FALSE;
if ((bswapLE16(pfh->sig) != 0x6669) && (bswapLE16(pfh->sig) != 0x4E4A)) return FALSE;
b669Ext = (bswapLE16(pfh->sig) == 0x4E4A) ? TRUE : FALSE;
if ((!pfh->samples) || (pfh->samples > 64) || (pfh->restartpos >= 128)
|| (!pfh->patterns) || (pfh->patterns > 128)) return FALSE;
DWORD dontfuckwithme = 0x1F1 + pfh->samples * sizeof(SAMPLE669) + pfh->patterns * 0x600;
Expand Down
7 changes: 1 addition & 6 deletions src/load_it.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ BOOL CSoundFile::ReadIT(const BYTE *lpStream, DWORD dwMemLength)
DWORD inspos[MAX_INSTRUMENTS];
DWORD smppos[MAX_SAMPLES];
DWORD patpos[MAX_PATTERNS];
BYTE chnmask[64], channels_used[64];
BYTE chnmask[64];
MODCOMMAND lastvalue[64];

if ((!lpStream) || (dwMemLength < sizeof(ITFILEHEADER))) return FALSE;
Expand Down Expand Up @@ -514,7 +514,6 @@ BOOL CSoundFile::ReadIT(const BYTE *lpStream, DWORD dwMemLength)
if (note < 0x80) note++;
m[ch].note = note;
lastvalue[ch].note = note;
channels_used[ch] = TRUE;
}
}
if (chnmask[ch] & 2)
Expand Down Expand Up @@ -1217,7 +1216,6 @@ void ITUnpack8Bit(signed char *pSample, DWORD dwLen, LPBYTE lpMemFile, DWORD dwM
{
signed char *pDst = pSample;
LPBYTE pSrc = lpMemFile;
DWORD wHdr = 0;
DWORD wCount = 0;
DWORD bitbuf = 0;
UINT bitnum = 0;
Expand All @@ -1228,7 +1226,6 @@ void ITUnpack8Bit(signed char *pSample, DWORD dwLen, LPBYTE lpMemFile, DWORD dwM
if (!wCount)
{
wCount = 0x8000;
wHdr = bswapLE16(*((LPWORD)pSrc));
pSrc += 2;
bLeft = 9;
bTemp = bTemp2 = 0;
Expand Down Expand Up @@ -1299,7 +1296,6 @@ void ITUnpack16Bit(signed char *pSample, DWORD dwLen, LPBYTE lpMemFile, DWORD dw
{
signed short *pDst = (signed short *)pSample;
LPBYTE pSrc = lpMemFile;
DWORD wHdr = 0;
DWORD wCount = 0;
DWORD bitbuf = 0;
UINT bitnum = 0;
Expand All @@ -1311,7 +1307,6 @@ void ITUnpack16Bit(signed char *pSample, DWORD dwLen, LPBYTE lpMemFile, DWORD dw
if (!wCount)
{
wCount = 0x4000;
wHdr = bswapLE16(*((LPWORD)pSrc));
pSrc += 2;
bLeft = 17;
wTemp = wTemp2 = 0;
Expand Down
3 changes: 1 addition & 2 deletions src/load_okt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ BOOL CSoundFile::ReadOKT(const BYTE *lpStream, DWORD dwMemLength)
{
const OKTFILEHEADER *pfh = (OKTFILEHEADER *)lpStream;
DWORD dwMemPos = sizeof(OKTFILEHEADER);
UINT nsamples = 0, npatterns = 0, norders = 0;
UINT nsamples = 0, norders = 0;

if ((!lpStream) || (dwMemLength < 1024)) return FALSE;
if ((pfh->okta != 0x41544B4F) || (pfh->song != 0x474E4F53)
Expand Down Expand Up @@ -88,7 +88,6 @@ BOOL CSoundFile::ReadOKT(const BYTE *lpStream, DWORD dwMemLength)
if (dwMemPos >= dwMemLength) return TRUE;
if (*((DWORD *)(lpStream + dwMemPos)) == 0x4E454C53)
{
npatterns = lpStream[dwMemPos+9];
dwMemPos += bswapBE32(*((DWORD *)(lpStream + dwMemPos + 4))) + 8;
}
// PLEN
Expand Down