|
|
ae202eb |
diff -Nur audacious-plugins-2.2-orig/src/skins/ui_vis.c audacious-plugins-2.2-ui_vis/src/skins/ui_vis.c
|
|
|
ae202eb |
--- audacious-plugins-2.2-orig/src/skins/ui_vis.c 2009-11-22 23:49:53.000000000 +0100
|
|
|
f4e4e9b |
+++ audacious-plugins-2.2-ui_vis/src/skins/ui_vis.c 2010-03-19 19:13:13.000000000 +0100
|
|
|
ae202eb |
@@ -292,7 +292,7 @@
|
|
|
ae202eb |
else{
|
|
|
ae202eb |
memset(rgb_data, 0, (guint)(76 * config.scale_factor) * 32);
|
|
|
ae202eb |
for (y = 1; y < 16; y += 2) {
|
|
|
ae202eb |
- ptr = rgb_data + (y * (guint)(76 * 4 * config.scale_factor));
|
|
|
ae202eb |
+ ptr = rgb_data + (y * (guint)(76 * 2 * config.scale_factor));
|
|
|
ae202eb |
for (x = 0; x < 76; x += 2, ptr += 4) {
|
|
|
ae202eb |
*ptr = 1;
|
|
|
ae202eb |
*(ptr + 1) = 1;
|
|
|
ae202eb |
@@ -328,10 +328,10 @@
|
|
|
ae202eb |
}
|
|
|
ae202eb |
}
|
|
|
ae202eb |
else{
|
|
|
ae202eb |
- ptr = rgb_data + ((16 - h) * (guint)(76 * 4 * config.scale_factor)) + (guint)(x * config.scale_factor);
|
|
|
ae202eb |
+ ptr = rgb_data + ((16 - h) * (guint)(76 * 2 * config.scale_factor)) + (guint)(x * config.scale_factor);
|
|
|
ae202eb |
switch (config.analyzer_mode) {
|
|
|
ae202eb |
case ANALYZER_NORMAL:
|
|
|
ae202eb |
- for (y = 0; y < h; y++, ptr += (guint)(76 * 4 * config.scale_factor)) {
|
|
|
ae202eb |
+ for (y = 0; y < h; y++, ptr += (guint)(76 * 2 * config.scale_factor)) {
|
|
|
ae202eb |
*ptr = 18 - h + y;
|
|
|
ae202eb |
*(ptr + 1) = 18 - h + y;
|
|
|
ae202eb |
*(ptr + (guint)(76 * config.scale_factor)) = 18 - h + y;
|
|
|
ae202eb |
@@ -339,7 +339,7 @@
|
|
|
ae202eb |
}
|
|
|
ae202eb |
break;
|
|
|
ae202eb |
case ANALYZER_FIRE:
|
|
|
ae202eb |
- for (y = 0; y < h; y++, ptr += (guint)(76 * 4 * config.scale_factor)) {
|
|
|
ae202eb |
+ for (y = 0; y < h; y++, ptr += (guint)(76 * 2 * config.scale_factor)) {
|
|
|
ae202eb |
*ptr = y + 2;
|
|
|
ae202eb |
*(ptr + 1) = y + 2;
|
|
|
ae202eb |
*(ptr + (guint)(76 * config.scale_factor)) = y + 2;
|
|
|
ae202eb |
@@ -347,7 +347,7 @@
|
|
|
ae202eb |
}
|
|
|
ae202eb |
break;
|
|
|
ae202eb |
case ANALYZER_VLINES:
|
|
|
ae202eb |
- for (y = 0; y < h; y++, ptr += (guint)(76 * 4 * config.scale_factor)) {
|
|
|
ae202eb |
+ for (y = 0; y < h; y++, ptr += (guint)(76 * 2 * config.scale_factor)) {
|
|
|
ae202eb |
*ptr = 18 - h;
|
|
|
ae202eb |
*(ptr + 1) = 18 - h;
|
|
|
ae202eb |
*(ptr + (guint)(76 * config.scale_factor)) = 18 - h;
|
|
|
ae202eb |
@@ -371,7 +371,7 @@
|
|
|
ae202eb |
rgb_data[(16 - h) * 76 + x] = 23;
|
|
|
ae202eb |
}
|
|
|
ae202eb |
else{
|
|
|
ae202eb |
- ptr = rgb_data + (16 - h) * (guint)(76 * 4 * config.scale_factor) + (guint)(x * config.scale_factor);
|
|
|
ae202eb |
+ ptr = rgb_data + (16 - h) * (guint)(76 * 2 * config.scale_factor) + (guint)(x * config.scale_factor);
|
|
|
ae202eb |
*ptr = 23;
|
|
|
ae202eb |
*(ptr + 1) = 23;
|
|
|
ae202eb |
*(ptr + (guint)(76 * config.scale_factor)) = 23;
|
|
|
ae202eb |
@@ -445,13 +445,13 @@
|
|
|
ae202eb |
rgb_data[x * 3 + y * 76*3+n] = voice_c[n];
|
|
|
ae202eb |
}
|
|
|
ae202eb |
else{
|
|
|
ae202eb |
- ptr = rgb_data + (guint)(x * 3 * config.scale_factor) + (guint) (y * 76 * 3 * config.scale_factor);
|
|
|
ae202eb |
- for(n=0;n<3;n++)
|
|
|
ae202eb |
- {
|
|
|
ae202eb |
- *(ptr + n) = voice_c[n];
|
|
|
ae202eb |
- *(ptr + n + 3) = voice_c[n];
|
|
|
ae202eb |
- *(ptr + (guint)(n + 76 * config.scale_factor * 3)) = voice_c[n];
|
|
|
ae202eb |
- *(ptr + (guint)(n + 3 + 76 * config.scale_factor * 3)) = voice_c[n];
|
|
|
ae202eb |
+ ptr = rgb_data + x * 3 * (guint)config.scale_factor + y * 76 * 3 * 2 * (guint)config.scale_factor;
|
|
|
ae202eb |
+ for(n=0;n<3;n++)
|
|
|
ae202eb |
+ {
|
|
|
ae202eb |
+ *(ptr + n) = voice_c[n];
|
|
|
ae202eb |
+ *(ptr + n + 3) = voice_c[n];
|
|
|
ae202eb |
+ *(ptr + (n + 76 * 3 * (guint)config.scale_factor)) = voice_c[n];
|
|
|
ae202eb |
+ *(ptr + (n + 3 + 76 * 3 * (guint)config.scale_factor)) = voice_c[n];
|
|
|
ae202eb |
}
|
|
|
ae202eb |
}
|
|
|
ae202eb |
}
|
|
|
f4e4e9b |
@@ -465,13 +465,13 @@
|
|
|
f4e4e9b |
h = vis->data[x];
|
|
|
f4e4e9b |
if (!vis->scaled) {
|
|
|
ae202eb |
ptr = rgb_data + ((14 - h) * 76) + x;
|
|
|
f4e4e9b |
- *ptr = vis_scope_colors[h + 1];
|
|
|
f4e4e9b |
+ *ptr = vis_scope_colors[h];
|
|
|
ae202eb |
}else{
|
|
|
ae202eb |
- ptr = rgb_data + ((14 - h) * (guint)(76 * 4 * config.scale_factor)) + (guint)(x * config.scale_factor);
|
|
|
f4e4e9b |
- *ptr = vis_scope_colors[h + 1];
|
|
|
f4e4e9b |
- *(ptr + 1) = vis_scope_colors[h + 1];
|
|
|
f4e4e9b |
- *(ptr + (guint)(76 * config.scale_factor)) = vis_scope_colors[h + 1];
|
|
|
f4e4e9b |
- *(ptr + (guint)(76 * config.scale_factor)+1) = vis_scope_colors[h + 1];
|
|
|
ae202eb |
+ ptr = rgb_data + ((14 - h) * (guint)(76 * 2 * config.scale_factor)) + (guint)(x * config.scale_factor);
|
|
|
f4e4e9b |
+ *ptr = vis_scope_colors[h];
|
|
|
f4e4e9b |
+ *(ptr + 1) = vis_scope_colors[h];
|
|
|
f4e4e9b |
+ *(ptr + (guint)(76 * config.scale_factor)) = vis_scope_colors[h];
|
|
|
f4e4e9b |
+ *(ptr + (guint)(76 * config.scale_factor)+1) = vis_scope_colors[h];
|
|
|
f4e4e9b |
}
|
|
|
f4e4e9b |
break;
|
|
|
f4e4e9b |
case SCOPE_LINE:
|
|
|
ae202eb |
@@ -489,8 +489,8 @@
|
|
|
ae202eb |
*ptr = vis_scope_colors[y - 2];
|
|
|
ae202eb |
}
|
|
|
ae202eb |
else{
|
|
|
ae202eb |
- ptr = rgb_data + (h * (guint)(76 * 4 * config.scale_factor)) + (guint)(x * config.scale_factor);
|
|
|
ae202eb |
- for (y = h; y <= h2; y++, ptr += (guint)(76 * 4 * config.scale_factor)) {
|
|
|
ae202eb |
+ ptr = rgb_data + (h * (guint)(76 * 2 * config.scale_factor)) + (guint)(x * config.scale_factor);
|
|
|
ae202eb |
+ for (y = h; y <= h2; y++, ptr += (guint)(76 * 2 * config.scale_factor)) {
|
|
|
ae202eb |
*ptr = vis_scope_colors[y - 2];
|
|
|
ae202eb |
*(ptr + 1) = vis_scope_colors[y - 2];
|
|
|
ae202eb |
*(ptr + (guint)(76 * config.scale_factor)) = vis_scope_colors[y - 2];
|
|
|
f4e4e9b |
@@ -502,13 +502,13 @@
|
|
|
f4e4e9b |
h = 14 - vis->data[x];
|
|
|
f4e4e9b |
if (!vis->scaled) {
|
|
|
ae202eb |
ptr = rgb_data + (h * 76) + x;
|
|
|
f4e4e9b |
- *ptr = vis_scope_colors[h + 1];
|
|
|
f4e4e9b |
+ *ptr = vis_scope_colors[h];
|
|
|
ae202eb |
}else{
|
|
|
ae202eb |
- ptr = rgb_data + (h * (guint)(76 * 4 * config.scale_factor)) + (guint)(x * config.scale_factor);
|
|
|
f4e4e9b |
- *ptr = vis_scope_colors[h + 1];
|
|
|
f4e4e9b |
- *(ptr + 1) = vis_scope_colors[h + 1];
|
|
|
f4e4e9b |
- *(ptr + (guint)(76 * config.scale_factor)) = vis_scope_colors[h + 1];
|
|
|
f4e4e9b |
- *(ptr + (guint)(76 * config.scale_factor)+1) = vis_scope_colors[h + 1];
|
|
|
ae202eb |
+ ptr = rgb_data + (h * (guint)(76 * 2 * config.scale_factor)) + (guint)(x * config.scale_factor);
|
|
|
f4e4e9b |
+ *ptr = vis_scope_colors[h];
|
|
|
f4e4e9b |
+ *(ptr + 1) = vis_scope_colors[h];
|
|
|
f4e4e9b |
+ *(ptr + (guint)(76 * config.scale_factor)) = vis_scope_colors[h];
|
|
|
f4e4e9b |
+ *(ptr + (guint)(76 * config.scale_factor)+1) = vis_scope_colors[h];
|
|
|
f4e4e9b |
}
|
|
|
f4e4e9b |
}
|
|
|
f4e4e9b |
break;
|
|
|
ae202eb |
@@ -526,8 +526,8 @@
|
|
|
ae202eb |
for (y = h; y <= h2; y++, ptr += 76)
|
|
|
ae202eb |
*ptr = c;
|
|
|
ae202eb |
}else{
|
|
|
ae202eb |
- ptr = rgb_data + (h * (guint)(76 * 4 * config.scale_factor)) + (guint)(x * config.scale_factor);
|
|
|
ae202eb |
- for (y = h; y <= h2; y++, ptr += (guint)(76 * 4 * config.scale_factor)) {
|
|
|
ae202eb |
+ ptr = rgb_data + (h * (guint)(76 * 2 * config.scale_factor)) + (guint)(x * config.scale_factor);
|
|
|
ae202eb |
+ for (y = h; y <= h2; y++, ptr += (guint)(76 * 2 * config.scale_factor)) {
|
|
|
ae202eb |
*ptr = c;
|
|
|
ae202eb |
*(ptr + 1) = c;
|
|
|
ae202eb |
*(ptr + (guint)(76 * config.scale_factor)) = c;
|