[mupen64plus-audio-sdl] 140/163: Remove upstream merged initialize_audiobuffer.patch

[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 ca0422af06c0b7fc69f5f17d46f14346567ef5b9
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Jul 5 10:04:24 2013 +0200

    Remove upstream merged initialize_audiobuffer.patch
---
 debian/changelog                            |  2 ++
 debian/patches/initialize_audiobuffer.patch | 27 ---------------------------
 debian/patches/series                       |  1 -
 3 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cfa4e63..d3e743b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ mupen64plus-audio-sdl (2.0-1) UNRELEASED; urgency=low
       override_dh_auto_{clean,test} rule
   * debian/watch:
     - Verify new upstream versions using GPG key 954F81B094AA5BB226F5
+  * debian/patches:
+    - Remove upstream merged initialize_audiobuffer.patch
 
  -- Sven Eckelmann <sven at narfation.org>  Wed, 26 Jun 2013 12:29:58 +0200
 
diff --git a/debian/patches/initialize_audiobuffer.patch b/debian/patches/initialize_audiobuffer.patch
deleted file mode 100644
index 1fe013a..0000000
--- a/debian/patches/initialize_audiobuffer.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Initialize audiobuffer before mixing it against our data
- SDL doesn't guarantee that the target audio buffer passed in its callback is
- initialized to zero (silence). SDL_MixAudio may now try to mix the random data
- from the dst buffer and the new data from the src buffer together and creating
- distorted sound in this process.
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/src/main.c b/src/main.c
-index ff5e31983fd9ac4f3dfda1e7bd3eb2db1a9aeb33..e116c7376064013da69e5844ca94cbbb143862a2 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/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0819e18..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-initialize_audiobuffer.patch

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