File libmodplug-api-change.patch of Package libmodplug.import4614

Overview Repositories Revisions Requests Users Attributes Meta

File libmodplug-api-change.patch of Package libmodplug.import4614

Patch reverts these two commits:
commit 4ca46320375dac2837691e14feff0a397058210f
Author: Konstanty Bialkowski <kon@mini.plasma.kon>
Date:   Sun Apr 4 22:48:51 2010 +1000

Allow StereoSeparation and MaxMixChannels to be configurable in API.

commit 2cdef8dd1754638a4f588443ed93daa79099f329
Author: Konstanty Bialkowski <kon@mini.plasma.kon>
Date:   Sat Apr 17 17:33:17 2010 +1000

Increment version number and soname.

Index: libmodplug-0.8.8.3/configure.in
===================================================================
--- libmodplug-0.8.8.3.orig/configure.in
+++ libmodplug-0.8.8.3/configure.in
@@ -59,9 +59,6 @@ AC_TYPE_UINT32_T
 AC_TYPE_INT64_T
 AC_TYPE_UINT64_T
 
-MODPLUG_LIBRARY_VERSION=1:0:0
-
-AC_SUBST(MODPLUG_LIBRARY_VERSION)
 
 AC_CONFIG_FILES([Makefile
           src/Makefile
Index: libmodplug-0.8.8.3/src/Makefile.am
===================================================================
--- libmodplug-0.8.8.3.orig/src/Makefile.am
+++ libmodplug-0.8.8.3/src/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src/libmodplug
 
 lib_LTLIBRARIES = libmodplug.la
-libmodplug_la_LDFLAGS = -version-info $(MODPLUG_LIBRARY_VERSION) $(LT_LDFLAGS)
+libmodplug_la_LDFLAGS = $(LT_LDFLAGS)
 libmodplug_la_LIBADD = -lm
 libmodplug_la_SOURCES = tables.h         \
                         sndmix.cpp         \
Index: libmodplug-0.8.8.3/src/libmodplug/sndfile.h
===================================================================
--- libmodplug-0.8.8.3.orig/src/libmodplug/sndfile.h
+++ libmodplug-0.8.8.3/src/libmodplug/sndfile.h
@@ -678,7 +678,6 @@ public:
 public:
 	// Mixer Config
 	static BOOL InitPlayer(BOOL bReset=FALSE);
-	static BOOL SetMixConfig(UINT nStereoSeparation, UINT nMaxMixChannels);
 	static BOOL SetWaveConfig(UINT nRate,UINT nBits,UINT nChannels,BOOL bMMX=FALSE);
 	static BOOL SetResamplingMode(UINT nMode); // SRCMODE_XXXX
 	static BOOL IsStereo() { return (gnChannels > 1) ? TRUE : FALSE; }
Index: libmodplug-0.8.8.3/src/modplug.cpp
===================================================================
--- libmodplug-0.8.8.3.orig/src/modplug.cpp
+++ libmodplug-0.8.8.3/src/modplug.cpp
@@ -30,8 +30,6 @@ namespace ModPlug
 		0,
 		0,
 		0,
-		0,
-		0,
 		0
 	};
 
@@ -62,10 +60,8 @@ namespace ModPlug
 		if(updateBasicConfig)
 		{
 			CSoundFile::SetWaveConfig(gSettings.mFrequency,
-                                                  gSettings.mBits,
+			                          gSettings.mBits,
 			                          gSettings.mChannels);
-			CSoundFile::SetMixConfig(gSettings.mStereoSeparation,
-                                                 gSettings.mMaxMixChannels);
 
 			gSampleSize = gSettings.mBits / 8 * gSettings.mChannels;
 		}
Index: libmodplug-0.8.8.3/src/modplug.h
===================================================================
--- libmodplug-0.8.8.3.orig/src/modplug.h
+++ libmodplug-0.8.8.3/src/modplug.h
@@ -80,9 +80,6 @@ typedef struct _ModPlug_Settings
 	int mBits;           /* Bits per sample - 8, 16, or 32 */
 	int mFrequency;      /* Sampling rate - 11025, 22050, or 44100 */
 	int mResamplingMode; /* One of MODPLUG_RESAMPLE_*, above */
-
-	int mStereoSeparation; /* Stereo separation, 1 - 256 */
-	int mMaxMixChannels; /* Maximum number of mixing channels (polyphony), 32 - 256 */
 	
 	int mReverbDepth;    /* Reverb level 0(quiet)-100(loud)      */
 	int mReverbDelay;    /* Reverb delay in ms, usually 40-200ms */
Index: libmodplug-0.8.8.3/src/sndfile.cpp
===================================================================
--- libmodplug-0.8.8.3.orig/src/sndfile.cpp
+++ libmodplug-0.8.8.3/src/sndfile.cpp
@@ -480,16 +480,6 @@ BOOL CSoundFile::SetWaveConfig(UINT nRat
 	return TRUE;
 }
 
-BOOL CSoundFile::SetMixConfig(UINT nStereoSeparation, UINT nMaxMixChannels)
-//-------------------------------------------------------------------------
-{
-	if (nMaxMixChannels < 2) return FALSE;
-
-	m_nMaxMixChannels = nMaxMixChannels;
-	m_nStereoSeparation = nStereoSeparation;
-	return TRUE;
-}
-
 
 BOOL CSoundFile::SetResamplingMode(UINT nMode)
 //--------------------------------------------
Index: libmodplug-0.8.8.3/src/sndmix.cpp
===================================================================
--- libmodplug-0.8.8.3.orig/src/sndmix.cpp
+++ libmodplug-0.8.8.3/src/sndmix.cpp
@@ -18,10 +18,10 @@
 // VU-Meter
 #define VUMETER_DECAY		4
 
-// SNDMIX: These are global flags for playback control (first two configurable via SetMixConfig)
+// SNDMIX: These are global flags for playback control
 UINT CSoundFile::m_nStereoSeparation = 128;
-UINT CSoundFile::m_nMaxMixChannels = 32;
 LONG CSoundFile::m_nStreamVolume = 0x8000;
+UINT CSoundFile::m_nMaxMixChannels = 32;
 // Mixing Configuration (SetWaveConfig)
 DWORD CSoundFile::gdwSysInfo = 0;
 DWORD CSoundFile::gnChannels = 1;

Places

File libmodplug-api-change.patch of Package libmodplug.import4614

Places