comparison Plugins/Input/wav/wav-sndfile.c @ 264:852a1455dfb7 trunk

[svn] Use a mutex, lower timeouts. Do not spin waiting for playback to start.

263:ddb59458d7a9

static	int 	bit_rate = 0;
static	int 	decoding;
static	int 	seek_time = -1;

static	GThread *decode_thread;


InputPlugin wav_ip = {
    NULL,
    NULL,
    NULL,

static void*
play_loop (void *arg)
{	static short buffer [BUFFER_SIZE];
	int samples;

	decoding = TRUE;
	while (decoding)
	{
		/* sf_read_short will return 0 for all reads at EOF. */

		if (samples > 0 && decoding)
		{	wav_ip.add_vis_pcm (wav_ip.output->written_time (), HOST_SIGNED_SHORT, sfinfo.channels, samples * sizeof (short), buffer);

			while ((wav_ip.output->buffer_free () < (samples * sizeof (short))) && decoding)
				xmms_usleep (80000);
			
			wav_ip.output->write_audio (buffer, samples * sizeof (short));
   			}
		else
			xmms_usleep (80000);

			seek_time = -1;
   			};

  		}; /* while (decoding) */

	g_thread_exit (NULL);
	return NULL;
} /* play_loop */

static void

	wav_ip.set_info (song_title, song_length, bit_rate, sfinfo.samplerate, sfinfo.channels);
	g_free (song_title);

	decode_thread = g_thread_create ((GThreadFunc)play_loop, NULL, TRUE, NULL);

	while (decoding == FALSE)
	    xmms_usleep (80000);
} /* play_start */

static void
play_stop (void)
{

264:852a1455dfb7

static	int 	bit_rate = 0;
static	int 	decoding;
static	int 	seek_time = -1;

static	GThread *decode_thread;
GStaticMutex decode_mutex = G_STATIC_MUTEX_INIT;

InputPlugin wav_ip = {
    NULL,
    NULL,
    NULL,

static void*
play_loop (void *arg)
{	static short buffer [BUFFER_SIZE];
	int samples;

	g_static_mutex_lock(&decode_mutex);

	decoding = TRUE;
	while (decoding)
	{
		/* sf_read_short will return 0 for all reads at EOF. */

		if (samples > 0 && decoding)
		{	wav_ip.add_vis_pcm (wav_ip.output->written_time (), HOST_SIGNED_SHORT, sfinfo.channels, samples * sizeof (short), buffer);

			while ((wav_ip.output->buffer_free () < (samples * sizeof (short))) && decoding)
				xmms_usleep (10000);
			
			wav_ip.output->write_audio (buffer, samples * sizeof (short));
   			}
		else
			xmms_usleep (80000);

			seek_time = -1;
   			};

  		}; /* while (decoding) */

	g_static_mutex_unlock(&decode_mutex);
	g_thread_exit (NULL);
	return NULL;
} /* play_loop */

static void

	wav_ip.set_info (song_title, song_length, bit_rate, sfinfo.samplerate, sfinfo.channels);
	g_free (song_title);

	decode_thread = g_thread_create ((GThreadFunc)play_loop, NULL, TRUE, NULL);

    	xmms_usleep (40000);
} /* play_start */

static void
play_stop (void)
{