[Pkg-wmaker-commits] [wmix] 16/18: debian/patches/wmix-3.2-fix-volume-adjustment.diff: Convert to quilt.

Doug Torrance dtorrance-guest at moszumanska.debian.org
Sun Oct 1 00:36:34 UTC 2017


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

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

commit c457e0f2f95ce15847ae2de0c4054f91acfb996c
Author: Doug Torrance <dtorrance at piedmont.edu>
Date:   Sat Sep 30 20:10:59 2017 -0400

    debian/patches/wmix-3.2-fix-volume-adjustment.diff: Convert to quilt.
---
 debian/patches/series                              |  1 +
 debian/patches/wmix-3.2-fix-volume-adjustment.diff | 24 ++++++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..455f6ae
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+wmix-3.2-fix-volume-adjustment.diff
diff --git a/debian/patches/wmix-3.2-fix-volume-adjustment.diff b/debian/patches/wmix-3.2-fix-volume-adjustment.diff
index 95356d8..d1051f5 100644
--- a/debian/patches/wmix-3.2-fix-volume-adjustment.diff
+++ b/debian/patches/wmix-3.2-fix-volume-adjustment.diff
@@ -1,6 +1,9 @@
-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
+Description: Fix for inaccurate volume adjustments.
+Author: Dan Pascu <dan at ag-projects.com>
+Last-Update: 2017-09-30
+
+--- a/mixer-oss.c
++++ b/mixer-oss.c
 @@ -179,8 +179,8 @@
  	vb_to_lr(mixer[cur_channel].volume,
  		 mixer[cur_channel].balance, &left, &right);
@@ -12,10 +15,9 @@ diff -ur wmix-3.2.orig/mixer-oss.c wmix-3.2/mixer-oss.c
      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 @@
+--- a/ui_x.c
++++ b/ui_x.c
+@@ -93,7 +93,7 @@
  static void draw_stereo_led(void);
  static void draw_rec_led(void);
  static void draw_mute_led(void);
@@ -24,7 +26,7 @@ diff -ur wmix-3.2.orig/ui_x.c wmix-3.2/ui_x.c
  static void draw_knob(float volume);
  static void draw_slider(float offset);
  
-@@ -527,16 +527,16 @@
+@@ -588,16 +588,16 @@
  	copy_xpm_area(65, 21, 20, 7, 39, 14);	/* turn off LCD */
  }
  
@@ -35,7 +37,7 @@ diff -ur wmix-3.2.orig/ui_x.c wmix-3.2/ui_x.c
 +    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);
@@ -47,8 +49,8 @@ diff -ur wmix-3.2.orig/ui_x.c wmix-3.2/ui_x.c
      } else {
  	copy_xpm_area(6, 67, 6, 9, 41, 22);
  	copy_xpm_area(0, 67, 6, 9, 47, 22);
-@@ -570,7 +570,7 @@
-     }
+@@ -629,7 +629,7 @@
+ 
      XCopyArea(display, led_pixmap, dockapp.pixmap, dockapp.gc,
  	    0, 0, LED_WIDTH, LED_HEIGHT, led_topleft_x, led_topleft_y);
 -    draw_percent();

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



More information about the Pkg-wmaker-commits mailing list