rpms/audacious-plugins/F-13 audacious-plugins-2.2-ui_vis.patch, 1.1, 1.2 audacious-plugins.spec, 1.103, 1.104

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30314/F-13

Modified Files:
	audacious-plugins-2.2-ui_vis.patch audacious-plugins.spec 
Log Message:
* Fri Mar 19 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-30
- Fix colour array indexing in Scope Mode.


audacious-plugins-2.2-ui_vis.patch:
 ui_vis.c |   58 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

Index: audacious-plugins-2.2-ui_vis.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-13/audacious-plugins-2.2-ui_vis.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- audacious-plugins-2.2-ui_vis.patch	19 Mar 2010 17:55:56 -0000	1.1
+++ audacious-plugins-2.2-ui_vis.patch	19 Mar 2010 18:19:22 -0000	1.2
@@ -1,6 +1,6 @@
 diff -Nur audacious-plugins-2.2-orig/src/skins/ui_vis.c audacious-plugins-2.2-ui_vis/src/skins/ui_vis.c
 --- audacious-plugins-2.2-orig/src/skins/ui_vis.c	2009-11-22 23:49:53.000000000 +0100
-+++ audacious-plugins-2.2-ui_vis/src/skins/ui_vis.c	2010-03-19 17:47:02.000000000 +0100
++++ audacious-plugins-2.2-ui_vis/src/skins/ui_vis.c	2010-03-19 19:13:13.000000000 +0100
 @@ -292,7 +292,7 @@
        else{
  	memset(rgb_data, 0, (guint)(76 * config.scale_factor) * 32);
@@ -71,15 +71,26 @@ diff -Nur audacious-plugins-2.2-orig/src
  		}
  	    }
  	  }
-@@ -467,7 +467,7 @@
+@@ -465,13 +465,13 @@
+ 	  h = vis->data[x];
+ 	  if (!vis->scaled) {
  	  ptr = rgb_data + ((14 - h) * 76) + x;
- 	    *ptr = vis_scope_colors[h + 1];
+-	    *ptr = vis_scope_colors[h + 1];
++	    *ptr = vis_scope_colors[h];
  	  }else{
 -	    ptr = rgb_data + ((14 - h) * (guint)(76 * 4 * config.scale_factor)) + (guint)(x * config.scale_factor);
+-	    *ptr = vis_scope_colors[h + 1];
+-	    *(ptr + 1) = vis_scope_colors[h + 1];
+-	    *(ptr + (guint)(76 * config.scale_factor)) = vis_scope_colors[h + 1];
+-	    *(ptr + (guint)(76 * config.scale_factor)+1) = vis_scope_colors[h + 1];
 +	    ptr = rgb_data + ((14 - h) * (guint)(76 * 2 * config.scale_factor)) + (guint)(x * config.scale_factor);
- 	    *ptr = vis_scope_colors[h + 1];
- 	    *(ptr + 1) = vis_scope_colors[h + 1];
- 	    *(ptr + (guint)(76 * config.scale_factor)) = vis_scope_colors[h + 1];
++	    *ptr = vis_scope_colors[h];
++	    *(ptr + 1) = vis_scope_colors[h];
++	    *(ptr + (guint)(76 * config.scale_factor)) = vis_scope_colors[h];
++	    *(ptr + (guint)(76 * config.scale_factor)+1) = vis_scope_colors[h];
+ 	  }
+ 	  break;
+ 	case SCOPE_LINE:
 @@ -489,8 +489,8 @@
  	      *ptr = vis_scope_colors[y - 2];
  	    }
@@ -91,15 +102,26 @@ diff -Nur audacious-plugins-2.2-orig/src
  		*ptr = vis_scope_colors[y - 2];
  		*(ptr + 1) = vis_scope_colors[y - 2];
  		*(ptr + (guint)(76 * config.scale_factor)) = vis_scope_colors[y - 2];
-@@ -504,7 +504,7 @@
+@@ -502,13 +502,13 @@
+ 	    h = 14 - vis->data[x];
+ 	    if (!vis->scaled) {
  	      ptr = rgb_data + (h * 76) + x;
- 	      *ptr = vis_scope_colors[h + 1];
+-	      *ptr = vis_scope_colors[h + 1];
++	      *ptr = vis_scope_colors[h];
  	    }else{
 -	      ptr = rgb_data + (h * (guint)(76 * 4 * config.scale_factor)) + (guint)(x * config.scale_factor);
+-	      *ptr = vis_scope_colors[h + 1];
+-	      *(ptr + 1) = vis_scope_colors[h + 1];
+-	      *(ptr + (guint)(76 * config.scale_factor)) = vis_scope_colors[h + 1];
+-	      *(ptr + (guint)(76 * config.scale_factor)+1) = vis_scope_colors[h + 1];
 +	      ptr = rgb_data + (h * (guint)(76 * 2 * config.scale_factor)) + (guint)(x * config.scale_factor);
- 	      *ptr = vis_scope_colors[h + 1];
- 	      *(ptr + 1) = vis_scope_colors[h + 1];
- 	      *(ptr + (guint)(76 * config.scale_factor)) = vis_scope_colors[h + 1];
++	      *ptr = vis_scope_colors[h];
++	      *(ptr + 1) = vis_scope_colors[h];
++	      *(ptr + (guint)(76 * config.scale_factor)) = vis_scope_colors[h];
++	      *(ptr + (guint)(76 * config.scale_factor)+1) = vis_scope_colors[h];
+ 	    }
+ 	  }
+ 	  break;
 @@ -526,8 +526,8 @@
  	    for (y = h; y <= h2; y++, ptr += 76)
  	      *ptr = c;


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-13/audacious-plugins.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- audacious-plugins.spec	19 Mar 2010 17:55:56 -0000	1.103
+++ audacious-plugins.spec	19 Mar 2010 18:19:22 -0000	1.104
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.2
-Release: 29%{?dist}
+Release: 30%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -320,6 +320,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Fri Mar 19 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-30
+- Fix colour array indexing in Scope Mode.
+
 * Fri Mar 19 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-29
 - Fix scaled visualization modes.