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 @@ -292,7 +292,7 @@ else{ memset(rgb_data, 0, (guint)(76 * config.scale_factor) * 32); for (y = 1; y < 16; y += 2) { - ptr = rgb_data + (y * (guint)(76 * 4 * config.scale_factor)); + ptr = rgb_data + (y * (guint)(76 * 2 * config.scale_factor)); for (x = 0; x < 76; x += 2, ptr += 4) { *ptr = 1; *(ptr + 1) = 1; @@ -328,10 +328,10 @@ } } else{ - ptr = rgb_data + ((16 - h) * (guint)(76 * 4 * config.scale_factor)) + (guint)(x * config.scale_factor); + ptr = rgb_data + ((16 - h) * (guint)(76 * 2 * config.scale_factor)) + (guint)(x * config.scale_factor); switch (config.analyzer_mode) { case ANALYZER_NORMAL: - for (y = 0; y < h; y++, ptr += (guint)(76 * 4 * config.scale_factor)) { + for (y = 0; y < h; y++, ptr += (guint)(76 * 2 * config.scale_factor)) { *ptr = 18 - h + y; *(ptr + 1) = 18 - h + y; *(ptr + (guint)(76 * config.scale_factor)) = 18 - h + y; @@ -339,7 +339,7 @@ } break; case ANALYZER_FIRE: - for (y = 0; y < h; y++, ptr += (guint)(76 * 4 * config.scale_factor)) { + for (y = 0; y < h; y++, ptr += (guint)(76 * 2 * config.scale_factor)) { *ptr = y + 2; *(ptr + 1) = y + 2; *(ptr + (guint)(76 * config.scale_factor)) = y + 2; @@ -347,7 +347,7 @@ } break; case ANALYZER_VLINES: - for (y = 0; y < h; y++, ptr += (guint)(76 * 4 * config.scale_factor)) { + for (y = 0; y < h; y++, ptr += (guint)(76 * 2 * config.scale_factor)) { *ptr = 18 - h; *(ptr + 1) = 18 - h; *(ptr + (guint)(76 * config.scale_factor)) = 18 - h; @@ -371,7 +371,7 @@ rgb_data[(16 - h) * 76 + x] = 23; } else{ - ptr = rgb_data + (16 - h) * (guint)(76 * 4 * config.scale_factor) + (guint)(x * config.scale_factor); + ptr = rgb_data + (16 - h) * (guint)(76 * 2 * config.scale_factor) + (guint)(x * config.scale_factor); *ptr = 23; *(ptr + 1) = 23; *(ptr + (guint)(76 * config.scale_factor)) = 23; @@ -445,13 +445,13 @@ rgb_data[x * 3 + y * 76*3+n] = voice_c[n]; } else{ - ptr = rgb_data + (guint)(x * 3 * config.scale_factor) + (guint) (y * 76 * 3 * config.scale_factor); - for(n=0;n<3;n++) - { - *(ptr + n) = voice_c[n]; - *(ptr + n + 3) = voice_c[n]; - *(ptr + (guint)(n + 76 * config.scale_factor * 3)) = voice_c[n]; - *(ptr + (guint)(n + 3 + 76 * config.scale_factor * 3)) = voice_c[n]; + ptr = rgb_data + x * 3 * (guint)config.scale_factor + y * 76 * 3 * 2 * (guint)config.scale_factor; + for(n=0;n<3;n++) + { + *(ptr + n) = voice_c[n]; + *(ptr + n + 3) = voice_c[n]; + *(ptr + (n + 76 * 3 * (guint)config.scale_factor)) = voice_c[n]; + *(ptr + (n + 3 + 76 * 3 * (guint)config.scale_factor)) = voice_c[n]; } } } @@ -467,7 +467,7 @@ ptr = rgb_data + ((14 - h) * 76) + x; *ptr = vis_scope_colors[h + 1]; }else{ - ptr = rgb_data + ((14 - h) * (guint)(76 * 4 * config.scale_factor)) + (guint)(x * config.scale_factor); + 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]; @@ -489,8 +489,8 @@ *ptr = vis_scope_colors[y - 2]; } else{ - ptr = rgb_data + (h * (guint)(76 * 4 * config.scale_factor)) + (guint)(x * config.scale_factor); - for (y = h; y <= h2; y++, ptr += (guint)(76 * 4 * config.scale_factor)) { + ptr = rgb_data + (h * (guint)(76 * 2 * config.scale_factor)) + (guint)(x * config.scale_factor); + for (y = h; y <= h2; y++, ptr += (guint)(76 * 2 * config.scale_factor)) { *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 @@ ptr = rgb_data + (h * 76) + x; *ptr = vis_scope_colors[h + 1]; }else{ - ptr = rgb_data + (h * (guint)(76 * 4 * config.scale_factor)) + (guint)(x * config.scale_factor); + 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]; @@ -526,8 +526,8 @@ for (y = h; y <= h2; y++, ptr += 76) *ptr = c; }else{ - ptr = rgb_data + (h * (guint)(76 * 4 * config.scale_factor)) + (guint)(x * config.scale_factor); - for (y = h; y <= h2; y++, ptr += (guint)(76 * 4 * config.scale_factor)) { + ptr = rgb_data + (h * (guint)(76 * 2 * config.scale_factor)) + (guint)(x * config.scale_factor); + for (y = h; y <= h2; y++, ptr += (guint)(76 * 2 * config.scale_factor)) { *ptr = c; *(ptr + 1) = c; *(ptr + (guint)(76 * config.scale_factor)) = c;