annotate audacious/widgets/vis.c @ 2188:9d06e177eeb1 trunk

[svn] - Fixed voiceprint scroll bug for stopped playback - Made doublesize voiceprint look like it should
author marvin
date Wed, 20 Dec 2006 13:05:57 -0800
parents 65ca93cd72bf
children b9f60fcdf6cc
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1653
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
1 /* BMP - Cross-platform multimedia player
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
2 * Copyright (C) 2003-2004 BMP development team.
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
3 *
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
4 * Based on XMMS:
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
5 * Copyright (C) 1998-2003 XMMS development team.
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
6 *
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
7 * This program is free software; you can redistribute it and/or modify
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
8 * it under the terms of the GNU General Public License as published by
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
9 * the Free Software Foundation; either version 2 of the License, or
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
10 * (at your option) any later version.
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
11 *
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
12 * This program is distributed in the hope that it will be useful,
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
15 * GNU General Public License for more details.
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
16 *
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
17 * You should have received a copy of the GNU General Public License
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
18 * along with this program; if not, write to the Free Software
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
20 */
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
21
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
22 #include "widgetcore.h"
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
23
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
24 #include <glib.h>
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
25 #include <gdk/gdk.h>
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
26 #include <string.h>
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
27
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
28 #include "main.h"
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
29 #include "skin.h"
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
30 #include "widget.h"
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
31
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
32 static const gfloat vis_afalloff_speeds[] = { 0.34, 0.5, 1.0, 1.3, 1.6 };
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
33 static const gfloat vis_pfalloff_speeds[] = { 1.2, 1.3, 1.4, 1.5, 1.6 };
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
34 static const gint vis_redraw_delays[] = { 1, 2, 4, 8 };
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
35 static const guint8 vis_scope_colors[] =
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
36 { 21, 21, 20, 20, 19, 19, 18, 19, 19, 20, 20, 21, 21 };
2161
c12319817d7e [svn] - patch to add a scrolling voiceprint to the mini visualizer.
nenolod
parents: 1938
diff changeset
37 static guint8 vs_data_ext[1216];
c12319817d7e [svn] - patch to add a scrolling voiceprint to the mini visualizer.
nenolod
parents: 1938
diff changeset
38
1653
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
39
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
40 void
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
41 vis_timeout_func(Vis * vis, guchar * data)
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
42 {
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
43 static GTimer *timer = NULL;
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
44 gulong micros = 9999999;
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
45 gboolean falloff = FALSE;
2161
c12319817d7e [svn] - patch to add a scrolling voiceprint to the mini visualizer.
nenolod
parents: 1938
diff changeset
46 gint i, n;
1653
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
47
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
48 if (!timer) {
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
49 timer = g_timer_new();
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
50 g_timer_start(timer);
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
51 }
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
52 else {
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
53 g_timer_elapsed(timer, &micros);
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
54 if (micros > 14000)
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
55 g_timer_reset(timer);
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
56
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
57 }
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
58
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
59 if (cfg.vis_type == VIS_ANALYZER) {
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
60 if (micros > 14000)
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
61 falloff = TRUE;
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
62 if (data || falloff) {
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
63 for (i = 0; i < 75; i++) {
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
64 if (data && data[i] > vis->vs_data[i]) {
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
65 vis->vs_data[i] = data[i];
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
66 if (vis->vs_data[i] > vis->vs_peak[i]) {
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
67 vis->vs_peak[i] = vis->vs_data[i];
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
68 vis->vs_peak_speed[i] = 0.01;
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
69
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
70 }
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
71 else if (vis->vs_peak[i] > 0.0) {
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
72 vis->vs_peak[i] -= vis->vs_peak_speed[i];
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
73 vis->vs_peak_speed[i] *=
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
74 vis_pfalloff_speeds[cfg.peaks_falloff];
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
75 if (vis->vs_peak[i] < vis->vs_data[i])
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
76 vis->vs_peak[i] = vis->vs_data[i];
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
77 if (vis->vs_peak[i] < 0.0)
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
78 vis->vs_peak[i] = 0.0;
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
79 }
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
80 }
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
81 else if (falloff) {
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
82 if (vis->vs_data[i] > 0.0) {
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
83 vis->vs_data[i] -=
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
84 vis_afalloff_speeds[cfg.analyzer_falloff];
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
85 if (vis->vs_data[i] < 0.0)
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
86 vis->vs_data[i] = 0.0;
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
87 }
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
88 if (vis->vs_peak[i] > 0.0) {
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
89 vis->vs_peak[i] -= vis->vs_peak_speed[i];
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
90 vis->vs_peak_speed[i] *=
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
91 vis_pfalloff_speeds[cfg.peaks_falloff];
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
92 if (vis->vs_peak[i] < vis->vs_data[i])
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
93 vis->vs_peak[i] = vis->vs_data[i];
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
94 if (vis->vs_peak[i] < 0.0)
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
95 vis->vs_peak[i] = 0.0;
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
96 }
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
97 }
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
98 }
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
99 }
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
100 }
2161
c12319817d7e [svn] - patch to add a scrolling voiceprint to the mini visualizer.
nenolod
parents: 1938
diff changeset
101 else if (cfg.vis_type == VIS_VOICEPRINT && data){
c12319817d7e [svn] - patch to add a scrolling voiceprint to the mini visualizer.
nenolod
parents: 1938
diff changeset
102 for(i = 0; i < 16; i++)
c12319817d7e [svn] - patch to add a scrolling voiceprint to the mini visualizer.
nenolod
parents: 1938
diff changeset
103 {
2179
8bdcac47760b [svn] Keep the voiceprint inside the range for the theme.
marvin
parents: 2171
diff changeset
104 /*The color palette is in the range [0-17]. This makes sure we stay there.*/
8bdcac47760b [svn] Keep the voiceprint inside the range for the theme.
marvin
parents: 2171
diff changeset
105 vis->vs_data[i] = data[15 - i] > 17 ? 17 : data[15-i];
2161
c12319817d7e [svn] - patch to add a scrolling voiceprint to the mini visualizer.
nenolod
parents: 1938
diff changeset
106 }
c12319817d7e [svn] - patch to add a scrolling voiceprint to the mini visualizer.
nenolod
parents: 1938
diff changeset
107 }
1653
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
108 else if (data) {
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
109 for (i = 0; i < 75; i++)
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
110 vis->vs_data[i] = data[i];
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
111 }
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
112
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
113 if (micros > 14000) {
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
114 if (!vis->vs_refresh_delay) {
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
115 vis_draw((Widget *) vis);
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
116 vis->vs_refresh_delay = vis_redraw_delays[cfg.vis_refresh];
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
117
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
118 }
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
119 vis->vs_refresh_delay--;
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
120 }
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
121 }
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
122
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
123 void
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
124 vis_draw(Widget * w)
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
125 {
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
126 Vis *vis = (Vis *) w;
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
127 gint x, y, h = 0, h2;
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
128 guchar vis_color[24][3];
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
129 guchar rgb_data[152 * 32], *ptr, c;
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
130 guint32 colors[24];
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
131 GdkRgbCmap *cmap;
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
132
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
133 if (!vis->vs_widget.visible)
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
134 return;
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
135
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
136 skin_get_viscolor(bmp_active_skin, vis_color);
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
137 for (y = 0; y < 24; y++) {
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
138 colors[y] =
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
139 vis_color[y][0] << 16 | vis_color[y][1] << 8 | vis_color[y][2];
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
140 }
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
141 cmap = gdk_rgb_cmap_new(colors, 24);
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
142
1938
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
143 if (!vis->vs_doublesize) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
144 memset(rgb_data, 0, 76 * 16);
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
145 for (y = 1; y < 16; y += 2) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
146 ptr = rgb_data + (y * 76);
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
147 for (x = 0; x < 76; x += 2, ptr += 2)
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
148 *ptr = 1;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
149 }
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
150 if (cfg.vis_type == VIS_ANALYZER) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
151 for (x = 0; x < 75; x++) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
152 if (cfg.analyzer_type == ANALYZER_BARS && (x % 4) == 0)
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
153 h = vis->vs_data[x >> 2];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
154 else if (cfg.analyzer_type == ANALYZER_LINES)
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
155 h = vis->vs_data[x];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
156 if (h && (cfg.analyzer_type == ANALYZER_LINES ||
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
157 (x % 4) != 3)) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
158 ptr = rgb_data + ((16 - h) * 76) + x;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
159 switch (cfg.analyzer_mode) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
160 case ANALYZER_NORMAL:
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
161 for (y = 0; y < h; y++, ptr += 76)
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
162 *ptr = 18 - h + y;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
163 break;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
164 case ANALYZER_FIRE:
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
165 for (y = 0; y < h; y++, ptr += 76)
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
166 *ptr = y + 2;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
167 break;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
168 case ANALYZER_VLINES:
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
169 for (y = 0; y < h; y++, ptr += 76)
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
170 *ptr = 18 - h;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
171 break;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
172 }
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
173 }
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
174 }
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
175 if (cfg.analyzer_peaks) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
176 for (x = 0; x < 75; x++) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
177 if (cfg.analyzer_type == ANALYZER_BARS && (x % 4) == 0)
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
178 h = vis->vs_peak[x >> 2];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
179 else if (cfg.analyzer_type == ANALYZER_LINES)
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
180 h = vis->vs_peak[x];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
181 if (h
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
182 && (cfg.analyzer_type == ANALYZER_LINES
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
183 || (x % 4) != 3))
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
184 rgb_data[(16 - h) * 76 + x] = 23;
1653
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
185 }
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
186 }
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
187 }
2161
c12319817d7e [svn] - patch to add a scrolling voiceprint to the mini visualizer.
nenolod
parents: 1938
diff changeset
188 else if (cfg.vis_type == VIS_VOICEPRINT) {
2188
9d06e177eeb1 [svn] - Fixed voiceprint scroll bug for stopped playback
marvin
parents: 2181
diff changeset
189 if(!bmp_playback_get_paused() && bmp_playback_get_playing()){/*Don't scroll when it's paused or stopped*/
2181
65ca93cd72bf [svn] - Added vis gradient to Ivory skin. With any luck Aerdan won't break my legs :)
marvin
parents: 2179
diff changeset
190 for (y = 0; y < 16; y ++)
65ca93cd72bf [svn] - Added vis gradient to Ivory skin. With any luck Aerdan won't break my legs :)
marvin
parents: 2179
diff changeset
191 for (x = 74; x > 0; x--)
2161
c12319817d7e [svn] - patch to add a scrolling voiceprint to the mini visualizer.
nenolod
parents: 1938
diff changeset
192 vs_data_ext[x + (y * 76)] = vs_data_ext[x-1+(y*76)];
2181
65ca93cd72bf [svn] - Added vis gradient to Ivory skin. With any luck Aerdan won't break my legs :)
marvin
parents: 2179
diff changeset
193 for(y=0;y<16;y++)
65ca93cd72bf [svn] - Added vis gradient to Ivory skin. With any luck Aerdan won't break my legs :)
marvin
parents: 2179
diff changeset
194 vs_data_ext[y * 76] = vis->vs_data[y];
2161
c12319817d7e [svn] - patch to add a scrolling voiceprint to the mini visualizer.
nenolod
parents: 1938
diff changeset
195 }
c12319817d7e [svn] - patch to add a scrolling voiceprint to the mini visualizer.
nenolod
parents: 1938
diff changeset
196 memcpy(rgb_data, vs_data_ext,1216);
c12319817d7e [svn] - patch to add a scrolling voiceprint to the mini visualizer.
nenolod
parents: 1938
diff changeset
197 }
1938
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
198 else if (cfg.vis_type == VIS_SCOPE) {
1653
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
199 for (x = 0; x < 75; x++) {
1938
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
200 switch (cfg.scope_mode) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
201 case SCOPE_DOT:
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
202 h = vis->vs_data[x];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
203 ptr = rgb_data + ((15 - h) * 76) + x;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
204 *ptr = vis_scope_colors[h];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
205 break;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
206 case SCOPE_LINE:
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
207 if (x != 74) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
208 h = 15 - vis->vs_data[x];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
209 h2 = 15 - vis->vs_data[x + 1];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
210 if (h > h2) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
211 y = h;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
212 h = h2;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
213 h2 = y;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
214 }
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
215 ptr = rgb_data + (h * 76) + x;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
216 for (y = h; y <= h2; y++, ptr += 76)
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
217 *ptr = vis_scope_colors[y - 3];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
218
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
219 }
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
220 else {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
221 h = 15 - vis->vs_data[x];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
222 ptr = rgb_data + (h * 76) + x;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
223 *ptr = vis_scope_colors[h];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
224 }
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
225 break;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
226 case SCOPE_SOLID:
1653
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
227 h = 15 - vis->vs_data[x];
1938
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
228 h2 = 9;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
229 c = vis_scope_colors[(gint) vis->vs_data[x]];
1653
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
230 if (h > h2) {
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
231 y = h;
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
232 h = h2;
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
233 h2 = y;
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
234 }
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
235 ptr = rgb_data + (h * 76) + x;
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
236 for (y = h; y <= h2; y++, ptr += 76)
1938
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
237 *ptr = c;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
238 break;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
239 }
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
240 }
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
241 }
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
242
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
243 /* FIXME: The check "shouldn't" be neccessary? */
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
244 /* if (GTK_IS_WINDOW(vis->vs_window)) { */
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
245 GDK_THREADS_ENTER();
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
246 gdk_draw_indexed_image(vis->vs_window, vis->vs_widget.gc,
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
247 vis->vs_widget.x, vis->vs_widget.y,
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
248 vis->vs_widget.width, vis->vs_widget.height,
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
249 GDK_RGB_DITHER_NORMAL, (guchar *) rgb_data,
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
250 76, cmap);
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
251 GDK_THREADS_LEAVE();
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
252 /* } else {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
253 vis->vs_window = mainwin->window;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
254 GDK_THREADS_ENTER();
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
255 gdk_draw_indexed_image(vis->vs_window, vis->vs_widget.gc,
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
256 vis->vs_widget.x, vis->vs_widget.y,
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
257 vis->vs_widget.width, vis->vs_widget.height,
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
258 GDK_RGB_DITHER_NORMAL, (guchar *) rgb_data,
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
259 76, cmap);
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
260 GDK_THREADS_LEAVE();
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
261 }
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
262 */
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
263 }
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
264 else {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
265 memset(rgb_data, 0, 152 * 32);
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
266 for (y = 1; y < 16; y += 2) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
267 ptr = rgb_data + (y * 304);
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
268 for (x = 0; x < 76; x += 2, ptr += 4) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
269 *ptr = 1;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
270 *(ptr + 1) = 1;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
271 *(ptr + 152) = 1;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
272 *(ptr + 153) = 1;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
273 }
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
274 }
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
275 if (cfg.vis_type == VIS_ANALYZER) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
276 for (x = 0; x < 75; x++) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
277 if (cfg.analyzer_type == ANALYZER_BARS && (x % 4) == 0)
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
278 h = vis->vs_data[x >> 2];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
279 else if (cfg.analyzer_type == ANALYZER_LINES)
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
280 h = vis->vs_data[x];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
281 if (h
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
282 && (cfg.analyzer_type == ANALYZER_LINES
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
283 || (x % 4) != 3)) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
284 ptr = rgb_data + ((16 - h) * 304) + (x << 1);
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
285 switch (cfg.analyzer_mode) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
286 case ANALYZER_NORMAL:
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
287 for (y = 0; y < h; y++, ptr += 304) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
288 *ptr = 18 - h + y;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
289 *(ptr + 1) = 18 - h + y;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
290 *(ptr + 152) = 18 - h + y;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
291 *(ptr + 153) = 18 - h + y;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
292 }
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
293 break;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
294 case ANALYZER_FIRE:
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
295 for (y = 0; y < h; y++, ptr += 304) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
296 *ptr = y + 2;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
297 *(ptr + 1) = y + 2;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
298 *(ptr + 152) = y + 2;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
299 *(ptr + 153) = y + 2;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
300 }
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
301 break;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
302 case ANALYZER_VLINES:
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
303 for (y = 0; y < h; y++, ptr += 304) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
304 *ptr = 18 - h;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
305 *(ptr + 1) = 18 - h;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
306 *(ptr + 152) = 18 - h;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
307 *(ptr + 153) = 18 - h;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
308 }
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
309
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
310 break;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
311 }
1653
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
312
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
313 }
1938
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
314 }
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
315 if (cfg.analyzer_peaks) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
316
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
317 for (x = 0; x < 75; x++) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
318 if (cfg.analyzer_type == ANALYZER_BARS && (x % 4) == 0)
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
319 h = vis->vs_peak[x >> 2];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
320 else if (cfg.analyzer_type == ANALYZER_LINES)
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
321 h = vis->vs_peak[x];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
322
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
323 if (h
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
324 && (cfg.analyzer_type == ANALYZER_LINES
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
325 || (x % 4) != 3)) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
326 ptr = rgb_data + (16 - h) * 304 + (x << 1);
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
327 *ptr = 23;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
328 *(ptr + 1) = 23;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
329 *(ptr + 152) = 23;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
330 *(ptr + 153) = 23;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
331 }
1653
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
332 }
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
333 }
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
334 }
2161
c12319817d7e [svn] - patch to add a scrolling voiceprint to the mini visualizer.
nenolod
parents: 1938
diff changeset
335 else if (cfg.vis_type == VIS_VOICEPRINT) {
2188
9d06e177eeb1 [svn] - Fixed voiceprint scroll bug for stopped playback
marvin
parents: 2181
diff changeset
336 if(!bmp_playback_get_paused() && bmp_playback_get_playing()){/*Don't scroll when it's paused or stopped*/
9d06e177eeb1 [svn] - Fixed voiceprint scroll bug for stopped playback
marvin
parents: 2181
diff changeset
337 for (y = 0; y < 16; y ++)
2181
65ca93cd72bf [svn] - Added vis gradient to Ivory skin. With any luck Aerdan won't break my legs :)
marvin
parents: 2179
diff changeset
338 for (x = 74; x > 0; x--)
65ca93cd72bf [svn] - Added vis gradient to Ivory skin. With any luck Aerdan won't break my legs :)
marvin
parents: 2179
diff changeset
339 vs_data_ext[x + y * 76] = vs_data_ext[x - 1 + y * 76];
65ca93cd72bf [svn] - Added vis gradient to Ivory skin. With any luck Aerdan won't break my legs :)
marvin
parents: 2179
diff changeset
340 for(y=0;y<16;y++)
65ca93cd72bf [svn] - Added vis gradient to Ivory skin. With any luck Aerdan won't break my legs :)
marvin
parents: 2179
diff changeset
341 vs_data_ext[y * 76] = vis->vs_data[y];
65ca93cd72bf [svn] - Added vis gradient to Ivory skin. With any luck Aerdan won't break my legs :)
marvin
parents: 2179
diff changeset
342 }
2188
9d06e177eeb1 [svn] - Fixed voiceprint scroll bug for stopped playback
marvin
parents: 2181
diff changeset
343 for (y = 0; y < 16; y ++) {
2161
c12319817d7e [svn] - patch to add a scrolling voiceprint to the mini visualizer.
nenolod
parents: 1938
diff changeset
344 for (x = 74; x > 0; x--)
c12319817d7e [svn] - patch to add a scrolling voiceprint to the mini visualizer.
nenolod
parents: 1938
diff changeset
345 {
2171
7267fc6b2c67 [svn] -added analyzer vis to windowshade mode
marvin
parents: 2169
diff changeset
346 ptr = rgb_data + (x << 1) + y * 304;
2188
9d06e177eeb1 [svn] - Fixed voiceprint scroll bug for stopped playback
marvin
parents: 2181
diff changeset
347 /*draw a 2x2 area with the same data*/
9d06e177eeb1 [svn] - Fixed voiceprint scroll bug for stopped playback
marvin
parents: 2181
diff changeset
348 *ptr = vs_data_ext[x + y * 76];
9d06e177eeb1 [svn] - Fixed voiceprint scroll bug for stopped playback
marvin
parents: 2181
diff changeset
349 *(ptr + 1) = vs_data_ext[x + y * 76];
9d06e177eeb1 [svn] - Fixed voiceprint scroll bug for stopped playback
marvin
parents: 2181
diff changeset
350 *(ptr + 152) = vs_data_ext[x + y * 76];
9d06e177eeb1 [svn] - Fixed voiceprint scroll bug for stopped playback
marvin
parents: 2181
diff changeset
351 *(ptr + 153) = vs_data_ext[x + y * 76];
2161
c12319817d7e [svn] - patch to add a scrolling voiceprint to the mini visualizer.
nenolod
parents: 1938
diff changeset
352 }
c12319817d7e [svn] - patch to add a scrolling voiceprint to the mini visualizer.
nenolod
parents: 1938
diff changeset
353 }
c12319817d7e [svn] - patch to add a scrolling voiceprint to the mini visualizer.
nenolod
parents: 1938
diff changeset
354 }
1938
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
355 else if (cfg.vis_type == VIS_SCOPE) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
356 for (x = 0; x < 75; x++) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
357 switch (cfg.scope_mode) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
358 case SCOPE_DOT:
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
359 h = vis->vs_data[x];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
360 ptr = rgb_data + ((15 - h) * 304) + (x << 1);
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
361 *ptr = vis_scope_colors[h];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
362 *(ptr + 1) = vis_scope_colors[h];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
363 *(ptr + 152) = vis_scope_colors[h];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
364 *(ptr + 153) = vis_scope_colors[h];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
365 break;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
366 case SCOPE_LINE:
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
367 if (x != 74) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
368 h = 15 - vis->vs_data[x];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
369 h2 = 15 - vis->vs_data[x + 1];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
370 if (h > h2) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
371 y = h;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
372 h = h2;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
373 h2 = y;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
374 }
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
375 ptr = rgb_data + (h * 304) + (x << 1);
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
376 for (y = h; y <= h2; y++, ptr += 304) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
377 *ptr = vis_scope_colors[y - 3];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
378 *(ptr + 1) = vis_scope_colors[y - 3];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
379 *(ptr + 152) = vis_scope_colors[y - 3];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
380 *(ptr + 153) = vis_scope_colors[y - 3];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
381 }
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
382 }
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
383 else {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
384 h = 15 - vis->vs_data[x];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
385 ptr = rgb_data + (h * 304) + (x << 1);
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
386 *ptr = vis_scope_colors[h];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
387 *(ptr + 1) = vis_scope_colors[h];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
388 *(ptr + 152) = vis_scope_colors[h];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
389 *(ptr + 153) = vis_scope_colors[h];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
390 }
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
391 break;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
392 case SCOPE_SOLID:
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
393 h = 15 - vis->vs_data[x];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
394 h2 = 9;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
395 c = vis_scope_colors[(gint) vis->vs_data[x]];
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
396 if (h > h2) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
397 y = h;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
398 h = h2;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
399 h2 = y;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
400 }
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
401 ptr = rgb_data + (h * 304) + (x << 1);
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
402 for (y = h; y <= h2; y++, ptr += 304) {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
403 *ptr = c;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
404 *(ptr + 1) = c;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
405 *(ptr + 152) = c;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
406 *(ptr + 153) = c;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
407 }
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
408 break;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
409 }
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
410 }
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
411 }
1653
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
412
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
413 GDK_THREADS_ENTER();
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
414 gdk_draw_indexed_image(vis->vs_window, vis->vs_widget.gc,
1938
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
415 vis->vs_widget.x << 1,
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
416 vis->vs_widget.y << 1,
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
417 vis->vs_widget.width << 1,
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
418 vis->vs_widget.height << 1,
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
419 GDK_RGB_DITHER_NONE, (guchar *) rgb_data,
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
420 152, cmap);
1653
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
421 GDK_THREADS_LEAVE();
1938
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
422 }
1653
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
423
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
424 gdk_rgb_cmap_free(cmap);
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
425 }
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
426
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
427 void
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
428 vis_clear_data(Vis * vis)
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
429 {
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
430 gint i;
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
431
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
432 if (!vis)
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
433 return;
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
434
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
435 for (i = 0; i < 75; i++) {
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
436 vis->vs_data[i] = (cfg.vis_type == VIS_SCOPE) ? 6 : 0;
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
437 vis->vs_peak[i] = 0;
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
438 }
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
439 }
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
440
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
441 void
1938
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
442 vis_set_doublesize(Vis * vis, gboolean doublesize)
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
443 {
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
444 vis->vs_doublesize = doublesize;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
445 }
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
446
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
447 void
1653
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
448 vis_clear(Vis * vis)
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
449 {
1938
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
450 if (!vis->vs_doublesize)
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
451 gdk_window_clear_area(vis->vs_window, vis->vs_widget.x,
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
452 vis->vs_widget.y, vis->vs_widget.width,
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
453 vis->vs_widget.height);
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
454 else
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
455 gdk_window_clear_area(vis->vs_window, vis->vs_widget.x << 1,
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
456 vis->vs_widget.y << 1,
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
457 vis->vs_widget.width << 1,
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
458 vis->vs_widget.height << 1);
1653
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
459 }
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
460
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
461 void
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
462 vis_set_window(Vis * vis, GdkWindow * window)
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
463 {
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
464 vis->vs_window = window;
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
465 }
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
466
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
467 Vis *
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
468 create_vis(GList ** wlist,
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
469 GdkPixmap * parent,
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
470 GdkWindow * window,
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
471 GdkGC * gc,
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
472 gint x, gint y,
1938
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
473 gint width,
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
474 gboolean doublesize)
1653
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
475 {
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
476 Vis *vis;
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
477
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
478 vis = g_new0(Vis, 1);
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
479
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
480 widget_init(&vis->vs_widget, parent, gc, x, y, width, 16, 1);
1938
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
481
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
482 vis->vs_doublesize = doublesize;
1d9c1026d9f8 [svn] - DoubleSize support.
nenolod
parents: 1653
diff changeset
483
1653
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
484 widget_list_add(wlist, WIDGET(vis));
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
485
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
486 return vis;
a6e6d3500c13 [svn] - revert back to r2216
nenolod
parents:
diff changeset
487 }