[mupen64plus-audio-sdl] 32/163: Imported Upstream version 1.99.4
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 05:53:06 UTC 2015
This is an automated email from the git hooks/post-receive script.
ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-audio-sdl.
commit f7552de3a4ecfe0cad10a8615f4455cc8b6bfb72
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date: Wed Nov 24 20:13:41 2010 +0100
Imported Upstream version 1.99.4
---
RELEASE | 6 ++++++
projects/unix/Makefile | 20 +++++++++++++++-----
src/main.c | 36 ++++++++++++++++++------------------
src/main.h | 2 +-
4 files changed, 40 insertions(+), 24 deletions(-)
diff --git a/RELEASE b/RELEASE
index 32196c6..82dc6f5 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1,6 +1,12 @@
SDL Audio plugin for Mupen64Plus
---------------------------------
+Mupen64Plus-audio-sdl v1.99.4 - November 22, 2010
+--------------------------------------------------
+ - Bugfix: Plugin should write default config values at startup time
+ - Bugfix: fixed fast-forward for banjo-kazooie and other games which was broken due to limitation in basic resampling algorithm
+ - makefile fixes and improvements
+
Mupen64Plus-audio-sdl v1.99.3 - February 13, 2010
--------------------------------------------------
- sync with core<-->plugin API change for RomOpen()
diff --git a/projects/unix/Makefile b/projects/unix/Makefile
index e8f5bab..7e24a25 100644
--- a/projects/unix/Makefile
+++ b/projects/unix/Makefile
@@ -34,6 +34,11 @@ ifeq ("$(UNAME)","linux")
SHARED = -shared
SO_EXTENSION = so
endif
+ifneq ("$(filter GNU hurd,$(UNAME))","")
+ OS = LINUX
+ SHARED = -shared
+ SO_EXTENSION = so
+endif
ifeq ("$(UNAME)","Darwin")
OS = OSX
SHARED = -bundle
@@ -84,7 +89,6 @@ endif
# base CFLAGS, LIBS, and LDFLAGS
CFLAGS += -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -fvisibility=hidden -I../../src
-LDFLAGS += -ldl
# Since we are building a shared library, we must compile with -fPIC for x86_64 CPUs.
# On 32-bit systems we do not want to use -fPIC because we don't have to and it has a big performance penalty on this arch
@@ -105,8 +109,10 @@ ifeq ($(OS), LINUX)
ifeq ($(CPU), X86)
ifeq ($(ARCH_DETECTED), 64BITS)
CFLAGS += -pipe -O3 -march=athlon64
+ LDFLAGS += -ldl
else
CFLAGS += -pipe -O3 -mmmx -msse -march=i686 -mtune=pentium-m -fomit-frame-pointer
+ LDFLAGS += -ldl
endif
endif
endif
@@ -114,15 +120,16 @@ ifeq ($(OS), OSX)
ifeq ($(CPU), X86)
ifeq ($(ARCH_DETECTED), 64BITS)
CFLAGS += -pipe -O3 -arch x86_64 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk
- LDFLAGS += -arch x86_64
+ LDFLAGS += -arch x86_64 -ldl
else
CFLAGS += -pipe -O3 -mmmx -msse -fomit-frame-pointer -arch i686 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk
- LDFLAGS += -arch i686
+ LDFLAGS += -arch i686 -ldl
endif
endif
endif
ifeq ($(CPU), PPC)
CFLAGS += -mcpu=powerpc
+ LDFLAGS += -ldl
endif
# test for presence of SDL
@@ -130,8 +137,8 @@ ifeq ($(shell which sdl-config 2>/dev/null),)
$(error No SDL development libraries found!)
endif
ifeq ($(OS),FREEBSD)
- CFLAGS += `${SDL_CONFIG} --cflags`
- LDFLAGS += `${SDL_CONFIG} --libs`
+ CFLAGS += $(shell sdl-config --cflags)
+ LDFLAGS += $(shell sdl-config --libs)
endif
ifeq ($(OS),OSX)
CFLAGS += $(shell sdl-config --cflags)
@@ -189,6 +196,9 @@ endif
ifeq ($(OS),OSX)
STRIP ?= strip -x
endif
+ifeq ($(OS),FREEBSD)
+ STRIP += strip -s
+endif
# set special flags for given Makefile parameters
ifeq ($(DEBUG),1)
diff --git a/src/main.c b/src/main.c
index 6419c15..0675812 100644
--- a/src/main.c
+++ b/src/main.c
@@ -189,6 +189,24 @@ EXPORT m64p_error CALL PluginStartup(m64p_dynlib_handle CoreLibHandle, void *Con
!ConfigGetParamInt || !ConfigGetParamFloat || !ConfigGetParamBool || !ConfigGetParamString)
return M64ERR_INCOMPATIBLE;
+ /* get a configuration section handle */
+ if (ConfigOpenSection("Audio-SDL", &l_ConfigAudio) != M64ERR_SUCCESS)
+ {
+ DebugMessage(M64MSG_ERROR, "Couldn't open config section 'Audio-SDL'");
+ return M64ERR_INPUT_NOT_FOUND;
+ }
+
+ /* set the default values for this plugin */
+ ConfigSetDefaultInt(l_ConfigAudio, "DEFAULT_FREQUENCY", DEFAULT_FREQUENCY, "Frequency which is used if rom doesn't want to change it");
+ ConfigSetDefaultBool(l_ConfigAudio, "SWAP_CHANNELS", 0, "Swaps left and right channels");
+ ConfigSetDefaultInt(l_ConfigAudio, "PRIMARY_BUFFER_SIZE", PRIMARY_BUFFER_SIZE, "Size of primary buffer in output samples. This is where audio is loaded after it's extracted from n64's memory.");
+ ConfigSetDefaultInt(l_ConfigAudio, "PRIMARY_BUFFER_TARGET", PRIMARY_BUFFER_TARGET, "Fullness level target for Primary audio buffer, in equivalent output samples");
+ ConfigSetDefaultInt(l_ConfigAudio, "SECONDARY_BUFFER_SIZE", SECONDARY_BUFFER_SIZE, "Size of secondary buffer in output samples. This is SDL's hardware buffer.");
+ ConfigSetDefaultInt(l_ConfigAudio, "RESAMPLE", 1, "Audio resampling algorithm. 1 = unfiltered, 2 = SINC resampling (Best Quality, requires libsamplerate)");
+ ConfigSetDefaultInt(l_ConfigAudio, "VOLUME_CONTROL_TYPE", VOLUME_TYPE_OSS, "Volume control type: 1 = SDL (only affects Mupen64Plus output) 2 = OSS mixer (adjusts master PC volume)");
+ ConfigSetDefaultInt(l_ConfigAudio, "VOLUME_ADJUST", 5, "Percentage change each time the volume is increased or decreased");
+ ConfigSetDefaultInt(l_ConfigAudio, "VOLUME_DEFAULT", 80, "Default volume when a game is started. Only used if VOLUME_CONTROL_TYPE is 1");
+
l_PluginInit = 1;
return M64ERR_SUCCESS;
}
@@ -698,24 +716,6 @@ EXPORT void CALL SetSpeedFactor(int percentage)
static void ReadConfig()
{
- /* get a configuration section handle */
- if (ConfigOpenSection("Audio-SDL", &l_ConfigAudio) != M64ERR_SUCCESS)
- {
- DebugMessage(M64MSG_ERROR, "Couldn't open config section 'Audio-SDL'");
- return;
- }
-
- /* set the default values for this plugin */
- ConfigSetDefaultInt(l_ConfigAudio, "DEFAULT_FREQUENCY", DEFAULT_FREQUENCY, "Frequency which is used if rom doesn't want to change it");
- ConfigSetDefaultBool(l_ConfigAudio, "SWAP_CHANNELS", 0, "Swaps left and right channels");
- ConfigSetDefaultInt(l_ConfigAudio, "PRIMARY_BUFFER_SIZE", PRIMARY_BUFFER_SIZE, "Size of primary buffer in output samples. This is where audio is loaded after it's extracted from n64's memory.");
- ConfigSetDefaultInt(l_ConfigAudio, "PRIMARY_BUFFER_TARGET", PRIMARY_BUFFER_TARGET, "Fullness level target for Primary audio buffer, in equivalent output samples");
- ConfigSetDefaultInt(l_ConfigAudio, "SECONDARY_BUFFER_SIZE", SECONDARY_BUFFER_SIZE, "Size of secondary buffer in output samples. This is SDL's hardware buffer.");
- ConfigSetDefaultInt(l_ConfigAudio, "RESAMPLE", 1, "Audio resampling algorithm. 1 = unfiltered, 2 = SINC resampling (Best Quality, requires libsamplerate)");
- ConfigSetDefaultInt(l_ConfigAudio, "VOLUME_CONTROL_TYPE", VOLUME_TYPE_OSS, "Volume control type: 1 = SDL (only affects Mupen64Plus output) 2 = OSS mixer (adjusts master PC volume)");
- ConfigSetDefaultInt(l_ConfigAudio, "VOLUME_ADJUST", 5, "Percentage change each time the volume is increased or decreased");
- ConfigSetDefaultInt(l_ConfigAudio, "VOLUME_DEFAULT", 80, "Default volume when a game is started. Only used if VOLUME_CONTROL_TYPE is 1");
-
/* read the configuration values into our static variables */
GameFreq = ConfigGetParamInt(l_ConfigAudio, "DEFAULT_FREQUENCY");
SwapChannels = ConfigGetParamBool(l_ConfigAudio, "SWAP_CHANNELS");
diff --git a/src/main.h b/src/main.h
index d11ffe0..96207cb 100644
--- a/src/main.h
+++ b/src/main.h
@@ -20,7 +20,7 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* version info */
-#define SDL_AUDIO_PLUGIN_VERSION 0x016303
+#define SDL_AUDIO_PLUGIN_VERSION 0x016304
/* declarations of pointers to Core config functions */
extern ptr_ConfigListSections ConfigListSections;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-audio-sdl.git
More information about the Pkg-games-commits
mailing list