comparison audacious/widgets/vis.c @ 2194:b9f60fcdf6cc trunk

[svn] - Improve the scope visualization
author nhjm449
date Fri, 22 Dec 2006 03:06:44 -0800
parents 9d06e177eeb1
children 60bd49189fde
comparison
equal deleted inserted replaced
2193:2522f6053168 2194:b9f60fcdf6cc
198 else if (cfg.vis_type == VIS_SCOPE) { 198 else if (cfg.vis_type == VIS_SCOPE) {
199 for (x = 0; x < 75; x++) { 199 for (x = 0; x < 75; x++) {
200 switch (cfg.scope_mode) { 200 switch (cfg.scope_mode) {
201 case SCOPE_DOT: 201 case SCOPE_DOT:
202 h = vis->vs_data[x]; 202 h = vis->vs_data[x];
203 ptr = rgb_data + ((15 - h) * 76) + x; 203 ptr = rgb_data + ((14 - h) * 76) + x;
204 *ptr = vis_scope_colors[h]; 204 *ptr = vis_scope_colors[h + 1];
205 break; 205 break;
206 case SCOPE_LINE: 206 case SCOPE_LINE:
207 if (x != 74) { 207 if (x != 74) {
208 h = 15 - vis->vs_data[x]; 208 h = 14 - vis->vs_data[x];
209 h2 = 15 - vis->vs_data[x + 1]; 209 h2 = 14 - vis->vs_data[x + 1];
210 if (h > h2) { 210 if (h > h2) {
211 y = h; 211 y = h;
212 h = h2; 212 h = h2;
213 h2 = y; 213 h2 = y;
214 } 214 }
215 ptr = rgb_data + (h * 76) + x; 215 ptr = rgb_data + (h * 76) + x;
216 for (y = h; y <= h2; y++, ptr += 76) 216 for (y = h; y <= h2; y++, ptr += 76)
217 *ptr = vis_scope_colors[y - 3]; 217 *ptr = vis_scope_colors[y - 2];
218 218
219 } 219 }
220 else { 220 else {
221 h = 15 - vis->vs_data[x]; 221 h = 14 - vis->vs_data[x];
222 ptr = rgb_data + (h * 76) + x; 222 ptr = rgb_data + (h * 76) + x;
223 *ptr = vis_scope_colors[h]; 223 *ptr = vis_scope_colors[h + 1];
224 } 224 }
225 break; 225 break;
226 case SCOPE_SOLID: 226 case SCOPE_SOLID:
227 h = 15 - vis->vs_data[x]; 227 h = 14 - vis->vs_data[x];
228 h2 = 9; 228 h2 = 8;
229 c = vis_scope_colors[(gint) vis->vs_data[x]]; 229 c = vis_scope_colors[(gint) vis->vs_data[x]];
230 if (h > h2) { 230 if (h > h2) {
231 y = h; 231 y = h;
232 h = h2; 232 h = h2;
233 h2 = y; 233 h2 = y;
355 else if (cfg.vis_type == VIS_SCOPE) { 355 else if (cfg.vis_type == VIS_SCOPE) {
356 for (x = 0; x < 75; x++) { 356 for (x = 0; x < 75; x++) {
357 switch (cfg.scope_mode) { 357 switch (cfg.scope_mode) {
358 case SCOPE_DOT: 358 case SCOPE_DOT:
359 h = vis->vs_data[x]; 359 h = vis->vs_data[x];
360 ptr = rgb_data + ((15 - h) * 304) + (x << 1); 360 ptr = rgb_data + ((14 - h) * 304) + (x << 1);
361 *ptr = vis_scope_colors[h]; 361 *ptr = vis_scope_colors[h + 1];
362 *(ptr + 1) = vis_scope_colors[h]; 362 *(ptr + 1) = vis_scope_colors[h + 1];
363 *(ptr + 152) = vis_scope_colors[h]; 363 *(ptr + 152) = vis_scope_colors[h + 1];
364 *(ptr + 153) = vis_scope_colors[h]; 364 *(ptr + 153) = vis_scope_colors[h + 1];
365 break; 365 break;
366 case SCOPE_LINE: 366 case SCOPE_LINE:
367 if (x != 74) { 367 if (x != 74) {
368 h = 15 - vis->vs_data[x]; 368 h = 14 - vis->vs_data[x];
369 h2 = 15 - vis->vs_data[x + 1]; 369 h2 = 14 - vis->vs_data[x + 1];
370 if (h > h2) { 370 if (h > h2) {
371 y = h; 371 y = h;
372 h = h2; 372 h = h2;
373 h2 = y; 373 h2 = y;
374 } 374 }
375 ptr = rgb_data + (h * 304) + (x << 1); 375 ptr = rgb_data + (h * 304) + (x << 1);
376 for (y = h; y <= h2; y++, ptr += 304) { 376 for (y = h; y <= h2; y++, ptr += 304) {
377 *ptr = vis_scope_colors[y - 3]; 377 *ptr = vis_scope_colors[y - 2];
378 *(ptr + 1) = vis_scope_colors[y - 3]; 378 *(ptr + 1) = vis_scope_colors[y - 2];
379 *(ptr + 152) = vis_scope_colors[y - 3]; 379 *(ptr + 152) = vis_scope_colors[y - 2];
380 *(ptr + 153) = vis_scope_colors[y - 3]; 380 *(ptr + 153) = vis_scope_colors[y - 2];
381 } 381 }
382 } 382 }
383 else { 383 else {
384 h = 15 - vis->vs_data[x]; 384 h = 14 - vis->vs_data[x];
385 ptr = rgb_data + (h * 304) + (x << 1); 385 ptr = rgb_data + (h * 304) + (x << 1);
386 *ptr = vis_scope_colors[h]; 386 *ptr = vis_scope_colors[h + 1];
387 *(ptr + 1) = vis_scope_colors[h]; 387 *(ptr + 1) = vis_scope_colors[h + 1];
388 *(ptr + 152) = vis_scope_colors[h]; 388 *(ptr + 152) = vis_scope_colors[h + 1];
389 *(ptr + 153) = vis_scope_colors[h]; 389 *(ptr + 153) = vis_scope_colors[h + 1];
390 } 390 }
391 break; 391 break;
392 case SCOPE_SOLID: 392 case SCOPE_SOLID:
393 h = 15 - vis->vs_data[x]; 393 h = 14 - vis->vs_data[x];
394 h2 = 9; 394 h2 = 8;
395 c = vis_scope_colors[(gint) vis->vs_data[x]]; 395 c = vis_scope_colors[(gint) vis->vs_data[x]];
396 if (h > h2) { 396 if (h > h2) {
397 y = h; 397 y = h;
398 h = h2; 398 h = h2;
399 h2 = y; 399 h2 = y;