mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-04 09:42:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/modplug/libmodplug/: Try that again (not only should it be MODPLUG_ instead of MODFILE, also that define is alrea...

Browse source 
Original commit message from CVS:
* gst/modplug/libmodplug/Makefile.am:
* gst/modplug/libmodplug/load_it.cpp:
Try that again (not only should it be MODPLUG_ instead
of MODFILE, also that define is already set in stdafx.h;
what we really need is some more #ifndefs).
This commit is contained in:
Tim-Philipp Müller 2006-03-22 17:13:32 +00:00
parent 2d0ec410ae
commit a79a53fc89
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2006-03-22 Tim-Philipp Müller <tim at centricular dot net>
* gst/modplug/libmodplug/Makefile.am:
* gst/modplug/libmodplug/load_it.cpp:
Try that again (not only should it be MODPLUG_ instead
of MODFILE, also that define is already set in stdafx.h;
what we really need is some more #ifndefs).
2006-03-22 Tim-Philipp Müller <tim at centricular dot net>
* gst/modplug/libmodplug/Makefile.am:

2
gst/modplug/libmodplug/Makefile.am
View file

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libmodplug.la
libmodplug_la_CXXFLAGS = $(GST_CFLAGS) -D_REENTRANT -DMODFILE_NO_FILESAVE
libmodplug_la_CXXFLAGS = $(GST_CFLAGS) -D_REENTRANT
libmodplug_la_LDFLAGS = -module -avoid-version
libmodplug_la_SOURCES = tables.cpp \
sndmix.cpp \

2
gst/modplug/libmodplug/load_it.cpp
View file

@ -1290,6 +1290,7 @@ void ITUnpack16Bit(signed char *pSample, DWORD dwLen, LPBYTE lpMemFile, DWORD dw
}
}
#ifndef MODPLUG_NO_FILESAVE
UINT CSoundFile::SaveMixPlugins(FILE *f, BOOL bUpdate)
//----------------------------------------------------
@ -1357,6 +1358,7 @@ UINT CSoundFile::SaveMixPlugins(FILE *f, BOOL bUpdate)
return nTotalSize;
}
#endif /* MODPLUG_NO_FILESAVE */
UINT CSoundFile::LoadMixPlugins(const void *pData, UINT nLen)
//-----------------------------------------------------------