comparison src/crossfade/crossfade.c @ 3066:c0ae2a5a15e8

Remove monitor GUI.
author William Pitcock <nenolod@atheme.org>
date Fri, 24 Apr 2009 06:57:12 -0500
parents a0ba6102131d
children 8f56795e348d
comparison
equal deleted inserted replaced
3065:a0ba6102131d 3066:c0ae2a5a15e8
30 #include "cfgutil.h" 30 #include "cfgutil.h"
31 #include "format.h" 31 #include "format.h"
32 #include "convert.h" 32 #include "convert.h"
33 33
34 #include "configure.h" 34 #include "configure.h"
35 #include "monitor.h"
36 35
37 #include "interface-2.0.h" 36 #include "interface-2.0.h"
38 #include "support-2.0.h" 37 #include "support-2.0.h"
39 38
40 #ifdef HAVE_LIBFFTW 39 #ifdef HAVE_LIBFFTW
407 the_op = NULL; 406 the_op = NULL;
408 return -1; 407 return -1;
409 } 408 }
410 SCHED_YIELD; 409 SCHED_YIELD;
411 410
412 /* start updating monitor */
413 xfade_start_monitor();
414
415 /* done */ 411 /* done */
416 output_opened = TRUE; 412 output_opened = TRUE;
417 return 0; 413 return 0;
418 } 414 }
419 415
431 if (!config->op_config_string) config->op_config_string = g_strdup(DEFAULT_OP_CONFIG_STRING); 427 if (!config->op_config_string) config->op_config_string = g_strdup(DEFAULT_OP_CONFIG_STRING);
432 if (!config->op_name) config->op_name = g_strdup(DEFAULT_OP_NAME); 428 if (!config->op_name) config->op_name = g_strdup(DEFAULT_OP_NAME);
433 429
434 /* check for realtime priority, it needs some special attention */ 430 /* check for realtime priority, it needs some special attention */
435 realtime = xfplayer_check_realtime_priority(); 431 realtime = xfplayer_check_realtime_priority();
436
437 /* show monitor win if enabled in config */
438 xfade_check_monitor_win();
439 432
440 /* init contexts */ 433 /* init contexts */
441 convert_init(&convert_context); 434 convert_init(&convert_context);
442 #ifdef HAVE_LIBFFTW 435 #ifdef HAVE_LIBFFTW
443 fft_init(&fft_context); 436 fft_init(&fft_context);
1849 /* ----------------------------------------------------------------------- */ 1842 /* ----------------------------------------------------------------------- */
1850 1843
1851 /* cleanup: close output */ 1844 /* cleanup: close output */
1852 if (output_opened) 1845 if (output_opened)
1853 { 1846 {
1854 xfade_stop_monitor();
1855
1856 DEBUG(("[crossfade] buffer_thread_f: closing output...\n")); 1847 DEBUG(("[crossfade] buffer_thread_f: closing output...\n"));
1857 1848
1858 if (the_op->close_audio) 1849 if (the_op->close_audio)
1859 the_op->close_audio(); 1850 the_op->close_audio();
1860 1851