[Pkg-wmaker-commits] [wmix] 08/10: Import Debian changes 3.1-4

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmix.

commit 21bb6a75295b751f937be066fc53b62f0ad9dfb9
Author: Fredrik Steen <stone at debian.org>
Date:   Mon Apr 24 16:34:06 2006 +0200

    Import Debian changes 3.1-4
    
    wmix (3.1-4) unstable; urgency=low
    
      * Fix for inaccurate volume adjustments. Patch from
        Dan Pascu <dan at ag-projects.com>
---
 debian/changelog                                   |  7 +++
 debian/control                                     |  2 +-
 debian/patches/wmix-3.2-fix-volume-adjustment.diff | 58 ++++++++++++++++++++++
 debian/rules                                       |  1 +
 4 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 252010b..91be9b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+wmix (3.1-4) unstable; urgency=low
+
+  * Fix for inaccurate volume adjustments. Patch from
+    Dan Pascu <dan at ag-projects.com>
+
+ -- Fredrik Steen <stone at debian.org>  Mon, 24 Apr 2006 16:34:06 +0200
+
 wmix (3.1-3) unstable; urgency=low
 
   * Tested under ALSA won't work, removed ALSA text from 
diff --git a/debian/control b/debian/control
index 2008e58..fadd187 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: wmix
 Section: x11
 Priority: extra
-Build-Depends: debhelper (>> 2.0.0), cdbs (>= 0.2.4), libx11-dev, libxext-dev, libxpm-dev, x-dev
+Build-Depends: debhelper (>> 2.0.0), cdbs (>= 0.2.4), libx11-dev, libxext-dev, libxpm-dev, x-dev, patchutils
 Maintainer: Fredrik Steen <stone at debian.org>
 Standards-Version: 3.6.2.0
 
diff --git a/debian/patches/wmix-3.2-fix-volume-adjustment.diff b/debian/patches/wmix-3.2-fix-volume-adjustment.diff
new file mode 100644
index 0000000..95356d8
--- /dev/null
+++ b/debian/patches/wmix-3.2-fix-volume-adjustment.diff
@@ -0,0 +1,58 @@
+diff -ur wmix-3.2.orig/mixer-oss.c wmix-3.2/mixer-oss.c
+--- wmix-3.2.orig/mixer-oss.c	2004-10-27 11:37:52.000000000 +0300
++++ wmix-3.2/mixer-oss.c	2006-04-09 02:12:24.000000000 +0300
+@@ -179,8 +179,8 @@
+ 	vb_to_lr(mixer[cur_channel].volume,
+ 		 mixer[cur_channel].balance, &left, &right);
+ 
+-    dev_left_volume = (int) (100.0 * left);
+-    dev_right_volume = (int) (100.0 * right);
++    dev_left_volume = (int) (100.0 * left + 0.5);
++    dev_right_volume = (int) (100.0 * right + 0.5);
+     dev_lr_volume = (dev_right_volume << 8) | dev_left_volume;
+     ioctl(mixer_fd, MIXER_WRITE(mixer[cur_channel].dev), &dev_lr_volume);
+ }
+diff -ur wmix-3.2.orig/ui_x.c wmix-3.2/ui_x.c
+--- wmix-3.2.orig/ui_x.c	2004-10-27 11:37:52.000000000 +0300
++++ wmix-3.2/ui_x.c	2006-04-09 02:05:43.000000000 +0300
+@@ -91,7 +91,7 @@
+ static void draw_stereo_led(void);
+ static void draw_rec_led(void);
+ static void draw_mute_led(void);
+-static void draw_percent(void);
++static void draw_percent(float volume);
+ static void draw_knob(float volume);
+ static void draw_slider(float offset);
+ 
+@@ -527,16 +527,16 @@
+ 	copy_xpm_area(65, 21, 20, 7, 39, 14);	/* turn off LCD */
+ }
+ 
+-static void draw_percent(void)
++static void draw_percent(float volume)
+ {
+-    int volume = (int)(mixer_get_volume() * 100);
++    int vol = (int)(volume*100 + 0.5);
+ 
+     copy_xpm_area(0, 87, 18, 9, 41, 22);	/* clear percentage */
+     
+-    if (volume < 100) {
+-	if (volume >= 10)
+-	    copy_xpm_area((volume / 10) * 6, 67, 6, 9, 47, 22);
+-	copy_xpm_area((volume % 10) * 6, 67, 6, 9, 53, 22);
++    if (vol < 100) {
++	if (vol >= 10)
++	    copy_xpm_area((vol / 10) * 6, 67, 6, 9, 47, 22);
++	copy_xpm_area((vol % 10) * 6, 67, 6, 9, 53, 22);
+     } else {
+ 	copy_xpm_area(6, 67, 6, 9, 41, 22);
+ 	copy_xpm_area(0, 67, 6, 9, 47, 22);
+@@ -570,7 +570,7 @@
+     }
+     XCopyArea(display, led_pixmap, dockapp.pixmap, dockapp.gc,
+ 	    0, 0, LED_WIDTH, LED_HEIGHT, led_topleft_x, led_topleft_y);
+-    draw_percent();
++    draw_percent(volume);
+ }
+ 
+ static void draw_slider(float offset)
diff --git a/debian/rules b/debian/rules
index ace0ff4..585a6c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
 # -*- mode: makefile; coding: utf-8 -*-
 # Copyright © 2003 Fredrik Steen <stone at debian.org>
 export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 DEB_INSTALL_MANPAGES_wmix := debian/wmix.1x

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmix.git