rpms/audacious-plugins/F-10 audacious-plugins-1.5.1-pulseaudio-volume-accuracy.patch, NONE, 1.1 audacious-plugins.spec, 1.38, 1.39

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22883

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-1.5.1-pulseaudio-volume-accuracy.patch 
Log Message:
* Wed Oct 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-13
- Patch pulseaudio plugin to not suffer from precision loss when
  calculating the volume level to save.


audacious-plugins-1.5.1-pulseaudio-volume-accuracy.patch:
 pulse_audio.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE audacious-plugins-1.5.1-pulseaudio-volume-accuracy.patch ---
diff -Nur audacious-plugins-fedora-1.5.1-pulseaudio/src/pulse_audio/pulse_audio.c audacious-plugins-fedora-1.5.1-pulseaudio-volume/src/pulse_audio/pulse_audio.c
--- audacious-plugins-fedora-1.5.1-pulseaudio/src/pulse_audio/pulse_audio.c	2009-10-21 22:41:24.333804845 +0200
+++ audacious-plugins-fedora-1.5.1-pulseaudio-volume/src/pulse_audio/pulse_audio.c	2009-10-21 22:40:05.605807471 +0200
@@ -38,6 +38,7 @@
 
 static pa_cvolume volume;
 static int volume_valid = 0;
+static int save_volume_l = 0, save_volume_r = 0;
 
 static int do_trigger = 0;
 static uint64_t written = 0;
@@ -200,8 +201,8 @@
 
     if (b) {
         if (v.channels == 2) {
-            *l = (int) ((v.values[0]*100)/PA_VOLUME_NORM);
-            *r = (int) ((v.values[1]*100)/PA_VOLUME_NORM);
+            *l = save_volume_l;
+            *r = save_volume_r;
         } else
             *l = *r = (int) ((pa_cvolume_avg(&v)*100)/PA_VOLUME_NORM);
     }
@@ -222,6 +223,8 @@
 }
 
 static void pulse_set_volume(int l, int r) {
+    save_volume_l = l;
+    save_volume_r = r;
 
     if (connected) {
         pa_threaded_mainloop_lock(mainloop);


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-10/audacious-plugins.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- audacious-plugins.spec	19 Oct 2009 16:30:26 -0000	1.38
+++ audacious-plugins.spec	21 Oct 2009 20:53:08 -0000	1.39
@@ -4,7 +4,7 @@
 
 Name:           audacious-plugins
 Version:        1.5.1
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Plugins for the Audacious media player
 Group:          Applications/Multimedia
 
@@ -27,6 +27,7 @@ Patch6:         audacious-plugins-1.5.1-
 Patch7:         audacious-plugins-1.5.1-neon-reader-error-crash.patch
 Patch8:         audacious-plugins-1.5.1-sndfile-cleanup.patch
 Patch9:         audacious-plugins-1.5.1-pulseaudio-volume.patch
+Patch10:        audacious-plugins-1.5.1-pulseaudio-volume-accuracy.patch
 
 # alsa-ng plugin from 2.1 devel up to 2.2 alpha1
 Patch50: audacious-plugins-1.5.1-alsa-ng.patch
@@ -179,6 +180,7 @@ vortex compressed files.
 %patch8 -p1 -b .sndfile-cleanup
 
 %patch9 -p1 -b .pulseaudio-volume
+%patch10 -p1 -b .pulseaudio-volume-accuracy
 
 %patch50 -p1 -b .alsa-ng
 %patch51 -p1 -b .alsa-ng2
@@ -278,6 +280,10 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Wed Oct 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-13
+- Patch pulseaudio plugin to not suffer from precision loss when
+  calculating the volume level to save.
+
 * Mon Oct 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-12
 - Patch pulseaudio plugin to not get confused by volume values passed
   in via callback.