summaryrefslogtreecommitdiffstats
path: root/gst/modplug/libmodplug
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2006-03-10 17:10:09 +0000
committerTim-Philipp Müller <tim@centricular.net>2006-03-10 17:10:09 +0000
commit55e2df515317dbfccb4ada11bbca22edffca4922 (patch)
tree50f889272557bc3375a9df5efa9b4d991fb3c945 /gst/modplug/libmodplug
parente276fe38badbf6f2e7b29ffa3ff0aab0bf443b8f (diff)
downloadgst-plugins-bad-55e2df515317dbfccb4ada11bbca22edffca4922.tar.gz
gst-plugins-bad-55e2df515317dbfccb4ada11bbca22edffca4922.tar.bz2
gst-plugins-bad-55e2df515317dbfccb4ada11bbca22edffca4922.zip
Original commit message from CVS:
* configure.ac: * gst/modplug/Makefile.am: * gst/modplug/gstmodplug.cc: * gst/modplug/gstmodplug.h: * gst/modplug/libmodplug/sndfile.cpp: * gst/modplug/libmodplug/sndfile.h: modplug plugin ported to 0.10 (#332598, patch by: Jonathan Matthew <jonathan at kaolin wh9 net>).
Diffstat (limited to 'gst/modplug/libmodplug')
-rw-r--r--gst/modplug/libmodplug/sndfile.cpp6
-rw-r--r--gst/modplug/libmodplug/sndfile.h1
2 files changed, 5 insertions, 2 deletions
diff --git a/gst/modplug/libmodplug/sndfile.cpp b/gst/modplug/libmodplug/sndfile.cpp
index b65a1134..5dc14179 100644
--- a/gst/modplug/libmodplug/sndfile.cpp
+++ b/gst/modplug/libmodplug/sndfile.cpp
@@ -1175,7 +1175,8 @@ UINT CSoundFile::ReadSample(MODINSTRUMENT *pIns, UINT nFlags, LPCSTR lpMemFile,
short int *pSample = (short int *)pIns->pSample;
for (UINT j=0; j<len; j+=2)
{
- *pSample++ = bswapLE16(*pSample);
+ short int s = bswapLE16(*pSample);
+ *pSample++ = s;
}
}
break;
@@ -1366,7 +1367,8 @@ UINT CSoundFile::ReadSample(MODINSTRUMENT *pIns, UINT nFlags, LPCSTR lpMemFile,
WORD *pSampleW = (WORD *)pIns->pSample;
for (UINT j=0; j<len; j+=2) // swaparoni!
{
- *pSampleW++ = bswapLE16(*pSampleW);
+ WORD s = bswapLE16(*pSampleW);
+ *pSampleW++ = s;
}
}
break;
diff --git a/gst/modplug/libmodplug/sndfile.h b/gst/modplug/libmodplug/sndfile.h
index 0bfb51f2..577bc696 100644
--- a/gst/modplug/libmodplug/sndfile.h
+++ b/gst/modplug/libmodplug/sndfile.h
@@ -448,6 +448,7 @@ typedef struct _MODCOMMAND
class IMixPlugin
{
public:
+ virtual ~IMixPlugin() {};
virtual int AddRef() = 0;
virtual int Release() = 0;
virtual void SaveAllParameters() = 0;