[mupen64plus-audio-sdl] 136/163: Imported Upstream version 2.0

[Sven Eckelmann]

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 8636f0c03f17606a75ab51c053d2123e6980f0f5
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Jul 5 09:38:03 2013 +0200

    Imported Upstream version 2.0
---
 LICENSES   |  1 +
 RELEASE    | 10 ++++++++--
 src/main.c |  6 +-----
 src/main.h |  2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/LICENSES b/LICENSES
index b5cf836..ac42959 100644
--- a/LICENSES
+++ b/LICENSES
@@ -13,6 +13,7 @@ The authors of Mupen64Plus are:
   * Louai Al-Khanji (slougi)
   * Bob Forder (orbitaldecay)
   * Jason Espinosa (hasone)
+  * Casualjames
   * HyperHacker
   * and others.
 
diff --git a/RELEASE b/RELEASE
index fe1a388..ed489c1 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1,12 +1,18 @@
 SDL Audio plugin for Mupen64Plus
 ---------------------------------
 
-Mupen64Plus-audio-sdl - LATEST REVISION
----------------------------------------
+Mupen64Plus-audio-sdl - v2.0 - July 4, 2013
+-------------------------------------------
+ - Add support for resampling with speexdsp library
+ - Add more resampling quality options
  - Bugfix: Don't assume OSS is installed in all linux systems.
  - Bugfix: Some combinations of VolumeSetLevel and VolumeMute caused VolumeGetString to return "Mute" when not muted
  - Make SDL volume handling the default, since OSS is no longer included in the kernel.
  - Minor refactoring of volume handling code.
+ - MS Visual Studio 2012 project files
+ - Makefile improvements
+   - support for ARM and MINGW architectures
+   - support for cross-compiling (MXE win32 builds under Unix)
 
 Mupen64Plus-audio-sdl v1.99.5 - March 10, 2012
 --------------------------------------------------
diff --git a/src/main.c b/src/main.c
index ff5e319..08c5abc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -597,13 +597,9 @@ static void my_audio_callback(void *userdata, unsigned char *stream, int len)
         else
 #endif
         {
-#if SDL_VERSION_ATLEAST(1,3,0)
-#warning Mixing disabled with SDL >= 1.3 because it creates distorted audio
-            input_used = resample(primaryBuffer, buffer_pos, oldsamplerate, stream, len, newsamplerate);
-#else
             input_used = resample(primaryBuffer, buffer_pos, oldsamplerate, mixBuffer, len, newsamplerate);
+            memset(stream, 0, len);
             SDL_MixAudio(stream, mixBuffer, len, VolSDL);
-#endif
         }
         memmove(primaryBuffer, &primaryBuffer[input_used], buffer_pos - input_used);
         buffer_pos -= input_used;
diff --git a/src/main.h b/src/main.h
index c46bdc3..b7cb3a7 100644
--- a/src/main.h
+++ b/src/main.h
@@ -20,7 +20,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /* version info */
-#define SDL_AUDIO_PLUGIN_VERSION 0x016305
+#define SDL_AUDIO_PLUGIN_VERSION 0x020000
 #define AUDIO_PLUGIN_API_VERSION 0x020000
 #define CONFIG_API_VERSION       0x020100
 #define CONFIG_PARAM_VERSION     1.00

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-audio-sdl.git