[SCM] mudita24/master: Attempt to make meters work again.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b0d9144997992153ce04c4bde5b765768ab885b3
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jan 23 18:32:32 2012 +0100

    Attempt to make meters work again.
    
    Closes: #655708

diff --git a/debian/patches/1001-fix_envy24control_poll.patch b/debian/patches/1001-fix_envy24control_poll.patch
new file mode 100644
index 0000000..fb3ecda
--- /dev/null
+++ b/debian/patches/1001-fix_envy24control_poll.patch
@@ -0,0 +1,27 @@
+Description: Attempt to make meters work again.
+From: http://lists.linuxaudio.org/pipermail/linux-audio-dev/2012-January/032645.html
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=655708
+---
+ envy24control.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- mudita24.orig/envy24control.c	2012-01-23 18:31:07.636108791 +0100
++++ mudita24/envy24control.c	2012-01-23 18:31:17.248156462 +0100
+@@ -2404,7 +2404,7 @@
+ /* NPM for efficiency&power-savings, replaced multiple 40ms&100ms timeouts
+    for each of the callbacks contained here, with a single 100ms one which
+    calls gtk_timeout_add(100, (GtkFunction)envy24control_poll, ...) */
+-void envy24control_poll() {
++gboolean envy24control_poll() {
+   level_meters_timeout_callback(NULL);
+   master_clock_status_timeout_callback(NULL);
+   internal_clock_status_timeout_callback(NULL);
+@@ -2412,6 +2412,8 @@
+   rate_reset_status_timeout_callback(NULL);
+   if (card_has_delta_iec958_input_status)
+     iec958_input_status_timeout_callback(NULL); /* NPM */
++
++  return TRUE;
+ }
+ 
+ int main(int argc, char **argv)
diff --git a/debian/patches/series b/debian/patches/series
index 114835e..4a98cfe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-manpage.patch
+1001-fix_envy24control_poll.patch

-- 
mudita24 packaging