mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-21 07:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/modplug/libmodplug/load_ptm.cpp: Fix compilation with gcc-4.1 and -Werror (#327355).

Browse source 
Original commit message from CVS:
* gst/modplug/libmodplug/load_ptm.cpp:
Fix compilation with gcc-4.1 and -Werror (#327355).
This commit is contained in:
Tim-Philipp Müller 2006-03-21 16:02:09 +00:00
parent 353131d32d
commit 2fd4b22a83
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2006-03-21 Tim-Philipp Müller <tim at centricular dot net>
* gst/modplug/libmodplug/load_ptm.cpp:
Fix compilation with gcc-4.1 and -Werror (#327355).
2006-03-20 Tim-Philipp Müller <tim at centricular dot net> 2006-03-20 Tim-Philipp Müller <tim at centricular dot net>
* ext/taglib/gsttaglib.h: * ext/taglib/gsttaglib.h:

13
gst/modplug/libmodplug/load_ptm.cpp
View file

@ -120,10 +120,15 @@ BOOL CSoundFile::ReadPTM(const BYTE *lpStream, DWORD dwMemLength)
{ {
UINT smpflg = RS_PCM8D; UINT smpflg = RS_PCM8D;
DWORD samplepos; DWORD samplepos;
pins->nLength = bswapLE32(*(LPDWORD)(psmp->length)); DWORD psmp_length, psmp_loopbeg, psmp_loopend, psmp_fileofs;
pins->nLoopStart = bswapLE32(*(LPDWORD)(psmp->loopbeg)); memcpy (&psmp_length, (void *) psmp->length, sizeof (DWORD));
pins->nLoopEnd = bswapLE32(*(LPDWORD)(psmp->loopend)); memcpy (&psmp_loopbeg, (void *) psmp->loopbeg, sizeof (DWORD));
samplepos = bswapLE32(*(LPDWORD)(&psmp->fileofs)); memcpy (&psmp_loopend, (void *) psmp->loopend, sizeof (DWORD));
memcpy (&psmp_fileofs, (void *) psmp->fileofs, sizeof (DWORD));
pins->nLength = bswapLE32(psmp_length);
pins->nLoopStart = bswapLE32(psmp_loopbeg);
pins->nLoopEnd = bswapLE32(psmp_loopend);
samplepos = bswapLE32(psmp_fileofs);
if (psmp->sampletype & 4) pins->uFlags |= CHN_LOOP; if (psmp->sampletype & 4) pins->uFlags |= CHN_LOOP;
if (psmp->sampletype & 8) pins->uFlags |= CHN_PINGPONGLOOP; if (psmp->sampletype & 8) pins->uFlags |= CHN_PINGPONGLOOP;
if (psmp->sampletype & 16) if (psmp->sampletype & 16)