diff src/wma/wma.c @ 1697:f35f9d6fcb6d

Automated merge with file:/home/ccr/audacious/plugins
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 09 Sep 2007 23:23:00 +0300
parents d158ce84fda7 aee4ebea943a
children add71276abfc
line wrap: on
line diff
--- a/src/wma/wma.c	Sun Sep 09 23:22:52 2007 +0300
+++ b/src/wma/wma.c	Sun Sep 09 23:23:00 2007 +0300
@@ -232,7 +232,7 @@
 {
     wma_seekpos = time;
     if(wma_pause) playback->output->pause(0);
-    while(wma_decode && wma_seekpos!=-1) xmms_usleep(10000);
+    while(wma_decode && wma_seekpos!=-1) g_usleep(10000);
     if(wma_pause) playback->output->pause(1);
 }
 
@@ -334,7 +334,7 @@
     {
         sst_buff = wma_st_buff;
 	if(wma_pause) memset(wma_s_outbuf, 0, sst_buff);	
-    	while(playback->output->buffer_free() < wma_st_buff) xmms_usleep(20000);
+    	while(playback->output->buffer_free() < wma_st_buff) g_usleep(20000);
 	produce_audio(playback->output->written_time(), FMT_S16_NE,
     			    c->channels, sst_buff, (short *)wma_s_outbuf, NULL);
 	memset(wma_s_outbuf, 0, sst_buff);
@@ -381,7 +381,7 @@
             if(pkt.data) av_free_packet(&pkt);
         }
     }
-    while(playback->playing && playback->output->buffer_playing()) xmms_usleep(30000);
+    while(playback->playing && playback->output->buffer_playing()) g_usleep(30000);
     playback->playing = 0;
     if(wma_s_outbuf) g_free(wma_s_outbuf);
     if(wma_outbuf) g_free(wma_outbuf);