[SCM] idjc packaging branch, master, updated. debian/0.8.2-1-4-gfb6a8f8

[quadrispro-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fb6a8f867b0c542e56ac03d92ecd9f2c99314e84
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Wed May 5 10:58:00 2010 +0200

    Add the patch

diff --git a/debian/patches/idjcmixer_sigsegv.patch b/debian/patches/idjcmixer_sigsegv.patch
new file mode 100644
index 0000000..80a7b44
--- /dev/null
+++ b/debian/patches/idjcmixer_sigsegv.patch
@@ -0,0 +1,55 @@
+Author: Gabriel M. Beddingfield <gabrbedd at gmail.com>
+Description: Fix segmentation fault at idjcmixer startup.
+Bug: http://sourceforge.net/support/tracker.php?aid=2996992
+Bug-Debian: http://bugs.debian.org/580262
+Forwarded: yes
+---
+ c/idjcmixer.c |   12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+--- idjc.orig/c/idjcmixer.c
++++ idjc/c/idjcmixer.c
+@@ -98,7 +98,7 @@ int left_samples_total, right_samples_to
+ int main_play;
+ /* if the main app segfaults or similar this counter will see that the mixer terminates */
+ int timeout;
+-int shutdown;
++int g_shutdown;
+ /* flag set when jack closes the client thread for example when the jackd is closed */
+ int jack_closed_f;
+ /* flag to indicate whether to use the player reading function which supports speed variance */
+@@ -533,10 +533,10 @@ void process_audio(jack_nframes_t nframe
+ 
+    if (timeout > 8000)
+       {
+-      if (!shutdown)
++      if (!g_shutdown)
+          {
+          fprintf(stderr, "timeout exceeded\n");
+-         shutdown = TRUE;
++         g_shutdown = TRUE;
+          }
+       plr_l->command = CMD_COMPLETE;
+       plr_r->command = CMD_COMPLETE;
+@@ -587,10 +587,10 @@ void process_audio(jack_nframes_t nframe
+    if (!(lp_lc && lp_rc && rp_lc && rp_rc && jp_lc && jp_rc && ip_lc && ip_rc &&
+          lp_lcf && lp_rcf && rp_lcf && rp_rcf && jp_lcf && jp_rcf && ip_lcf && ip_rcf))
+       {
+-      if (!shutdown)
++      if (!g_shutdown)
+          {
+          printf("Malloc failure in process audio\n");
+-         shutdown = TRUE;
++         g_shutdown = TRUE;
+          }
+       plr_l->command = CMD_COMPLETE;
+       plr_r->command = CMD_COMPLETE;
+@@ -1705,7 +1705,7 @@ int main(int argc, char **argv)
+       
+    while (kvp_parse(kvpdict, fp))
+       {
+-      if (jack_closed_f == TRUE || shutdown == TRUE)
++      if (jack_closed_f == TRUE || g_shutdown == TRUE)
+          break;
+          
+       if (!strcmp(action, "sync"))

-- 
idjc packaging