# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1189365940 -10800
# Node ID aee4ebea943aa125d3b621659e684af4483dcf58
# Parent  ae9b0327b62073688b61a3697d719e56d95bd647
xmms_usleep() was removed, use g_usleep()

diff -r ae9b0327b620 -r aee4ebea943a src/CoreAudio/audio.c
--- a/src/CoreAudio/audio.c	Sun Sep 09 22:06:10 2007 +0300
+++ b/src/CoreAudio/audio.c	Sun Sep 09 22:25:40 2007 +0300
@@ -498,7 +498,7 @@
 
 	while (flush != -1)
 	{
-		xmms_usleep(10000);
+		g_usleep(10000);
 	}
 }
 
diff -r ae9b0327b620 -r aee4ebea943a src/OSS/audio.c
--- a/src/OSS/audio.c	Sun Sep 09 22:06:10 2007 +0300
+++ b/src/OSS/audio.c	Sun Sep 09 22:25:40 2007 +0300
@@ -305,7 +305,7 @@
 #endif
     if (realtime && !ioctl(fd, SNDCTL_DSP_GETOSPACE, &abuf_info)) {
         while (abuf_info.bytes < length) {
-            xmms_usleep(10000);
+            g_usleep(10000);
             if (ioctl(fd, SNDCTL_DSP_GETOSPACE, &abuf_info))
                 break;
         }
@@ -511,7 +511,7 @@
     if (!realtime) {
         flush = time;
         while (flush != -1)
-            xmms_usleep(10000);
+            g_usleep(10000);
     }
     else {
         ioctl(fd, SNDCTL_DSP_RESET, 0);
@@ -566,7 +566,7 @@
             }
         }
         else
-            xmms_usleep(10000);
+            g_usleep(10000);
         oss_calc_device_buffer_used();
         if (do_pause && !paused) {
             do_pause = FALSE;
diff -r ae9b0327b620 -r aee4ebea943a src/OSS4/audio.c
--- a/src/OSS4/audio.c	Sun Sep 09 22:06:10 2007 +0300
+++ b/src/OSS4/audio.c	Sun Sep 09 22:25:40 2007 +0300
@@ -305,7 +305,7 @@
 #endif
     if (realtime && !ioctl(fd, SNDCTL_DSP_GETOSPACE, &abuf_info)) {
         while (abuf_info.bytes < length) {
-            xmms_usleep(10000);
+            g_usleep(10000);
             if (ioctl(fd, SNDCTL_DSP_GETOSPACE, &abuf_info))
                 break;
         }
@@ -511,7 +511,7 @@
     if (!realtime) {
         flush = time;
         while (flush != -1)
-            xmms_usleep(10000);
+            g_usleep(10000);
     }
     else {
         ioctl(fd, SNDCTL_DSP_RESET, 0);
@@ -566,7 +566,7 @@
             }
         }
         else
-            xmms_usleep(10000);
+            g_usleep(10000);
         oss_calc_device_buffer_used();
         if (do_pause && !paused) {
             do_pause = FALSE;
diff -r ae9b0327b620 -r aee4ebea943a src/aac/src/libmp4.c
--- a/src/aac/src/libmp4.c	Sun Sep 09 22:06:10 2007 +0300
+++ b/src/aac/src/libmp4.c	Sun Sep 09 22:25:40 2007 +0300
@@ -311,7 +311,7 @@
 {
     seekPosition = time;
     while(buffer_playing && seekPosition != -1)
-        xmms_usleep(10000);
+        g_usleep(10000);
 }
 
 static void mp4_cleanup(void)
@@ -549,7 +549,7 @@
             /* Finish playing before we close the
                output. */
             while ( playback->output->buffer_playing() ) {
-                xmms_usleep(10000);
+                g_usleep(10000);
             }
 
             playback->output->flush(seekPosition*1000);
diff -r ae9b0327b620 -r aee4ebea943a src/adplug/adplug-xmms.cc
--- a/src/adplug/adplug-xmms.cc	Sun Sep 09 22:06:10 2007 +0300
+++ b/src/adplug/adplug-xmms.cc	Sun Sep 09 22:25:40 2007 +0300
@@ -853,7 +853,7 @@
 
     // write sound buffer
     while (playback->output->buffer_free () < SNDBUFSIZE * sampsize)
-      xmms_usleep (10000);
+      g_usleep (10000);
     produce_audio (playback->output->written_time (),
                    bit16 ? FORMAT_16 : FORMAT_8,
                    stereo ? 2 : 1, SNDBUFSIZE * sampsize, sndbuf, NULL);
@@ -869,7 +869,7 @@
   {                             // wait for output plugin to finish if song has self-ended
     dbg_printf ("wait, ");
     while (playback->output->buffer_playing ())
-      xmms_usleep (10000);
+      g_usleep (10000);
   }
   else
   {                             // or else, flush its output buffers
diff -r ae9b0327b620 -r aee4ebea943a src/alsa/audio.c
--- a/src/alsa/audio.c	Sun Sep 09 22:06:10 2007 +0300
+++ b/src/alsa/audio.c	Sun Sep 09 22:25:40 2007 +0300
@@ -155,7 +155,7 @@
 
 	while ((err = snd_pcm_resume(alsa_pcm)) == -EAGAIN)
 		/* wait until suspend flag is released */
-		xmms_usleep(1000000);
+		g_usleep(1000000);
 	if (err < 0)
 	{
 		g_warning("alsa_handle_error(): "
@@ -316,7 +316,7 @@
 {
 	flush_request = time;
 	while (flush_request != -1)
-		xmms_usleep(10000);
+		g_usleep(10000);
 }
 
 static void parse_mixer_name(char *str, char **name, int *index)
@@ -854,7 +854,7 @@
 			}
 		}
 		else
-			xmms_usleep(10000);
+			g_usleep(10000);
 
 		if (pause_request != paused)
 			alsa_do_pause(pause_request);
diff -r ae9b0327b620 -r aee4ebea943a src/flacng/plugin.c
--- a/src/flacng/plugin.c	Sun Sep 09 22:06:10 2007 +0300
+++ b/src/flacng/plugin.c	Sun Sep 09 22:25:40 2007 +0300
@@ -614,7 +614,7 @@
     seek_to = time;
 
     while (-1 != seek_to) {
-        xmms_usleep(10000);
+        g_usleep(10000);
     }
 
     _LEAVE;
diff -r ae9b0327b620 -r aee4ebea943a src/metronom/metronom.c
--- a/src/metronom/metronom.c	Sun Sep 09 22:06:10 2007 +0300
+++ b/src/metronom/metronom.c	Sun Sep 09 22:25:40 2007 +0300
@@ -148,7 +148,7 @@
 			t++;
 		}
 		while(playback->output->buffer_free() < BUF_BYTES && going)
-			xmms_usleep(30000);
+			g_usleep(30000);
 		if (going)
 			produce_audio(playback->output->written_time(), FMT_S16_LE, 1, BUF_BYTES, data, &going);
 	}
diff -r ae9b0327b620 -r aee4ebea943a src/musepack/libmpc.cxx
--- a/src/musepack/libmpc.cxx	Sun Sep 09 22:06:10 2007 +0300
+++ b/src/musepack/libmpc.cxx	Sun Sep 09 22:25:40 2007 +0300
@@ -865,7 +865,7 @@
         else
         {
             lockRelease();
-            xmms_usleep(10000);
+            g_usleep(10000);
         }
     }
     return endThread(filename, input, false);
diff -r ae9b0327b620 -r aee4ebea943a src/shnplug/shn.c
--- a/src/shnplug/shn.c	Sun Sep 09 22:06:10 2007 +0300
+++ b/src/shnplug/shn.c	Sun Sep 09 22:25:40 2007 +0300
@@ -796,7 +796,7 @@
 		this_shn->wave_header.channels, bytes_to_write, this_shn->vars.buffer);
 
 	while(shn_ip.output->buffer_free() < bytes_to_write && playback->playing && this_shn->vars.seek_to == -1)
-		xmms_usleep(10000);
+		g_usleep(10000);
 
 	if(playback->playing && this_shn->vars.seek_to == -1) {
 		if (shn_cfg.swap_bytes)
@@ -1187,7 +1187,7 @@
                 goto restart;
               }
               else
-                xmms_usleep(10000);
+                g_usleep(10000);
             }
 
             goto cleanup;
@@ -1227,7 +1227,7 @@
     write_and_wait(this_shn,this_shn->vars.bytes_in_buf);
     shn_ip.output->buffer_free();
     shn_ip.output->buffer_free();
-    xmms_usleep(10000);
+    g_usleep(10000);
 
 finish:
 
@@ -1328,7 +1328,7 @@
 	shnfile->vars.seek_to = time;
 
 	while (shnfile->vars.seek_to != -1)
-		xmms_usleep(10000);
+		g_usleep(10000);
 }
 
 static void shn_get_file_info(char *filename, char **title, int *length)
diff -r ae9b0327b620 -r aee4ebea943a src/sid/xmms-sid.c
--- a/src/sid/xmms-sid.c	Sun Sep 09 22:06:10 2007 +0300
+++ b/src/sid/xmms-sid.c	Sun Sep 09 22:25:40 2007 +0300
@@ -526,7 +526,7 @@
 
 		/* Wait a little */
 		while (xs_status.isPlaying && (pb->output->buffer_free() < audioGot))
-			xmms_usleep(500);
+			g_usleep(500);
 
 		/* Check if we have played enough */
 		XS_MUTEX_LOCK(xs_status);
diff -r ae9b0327b620 -r aee4ebea943a src/sun/audio.c
--- a/src/sun/audio.c	Sun Sep 09 22:06:10 2007 +0300
+++ b/src/sun/audio.c	Sun Sep 09 22:25:40 2007 +0300
@@ -501,7 +501,7 @@
 			}
 		}
 		else
-			xmms_usleep(10000);
+			g_usleep(10000);
 
 		sun_bufused();
 
diff -r ae9b0327b620 -r aee4ebea943a src/sun/configure.c
--- a/src/sun/configure.c	Sun Sep 09 22:06:10 2007 +0300
+++ b/src/sun/configure.c	Sun Sep 09 22:25:40 2007 +0300
@@ -443,7 +443,7 @@
 		gtk_label_set_text(GTK_LABEL(stats_frame.ooffs_label), sl);
 
 		pthread_mutex_unlock(&stats_frame.audioctl_mutex);
-		xmms_usleep(400000);
+		g_usleep(400000);
 	}
 	pthread_mutex_unlock(&stats_frame.active_mutex);
 
diff -r ae9b0327b620 -r aee4ebea943a src/timidity/src/xmms-timidity.c
--- a/src/timidity/src/xmms-timidity.c	Sun Sep 09 22:06:10 2007 +0300
+++ b/src/timidity/src/xmms-timidity.c	Sun Sep 09 22:25:40 2007 +0300
@@ -382,7 +382,7 @@
 	playback->eof = FALSE;
 
 	while (xmmstimid_seek_to != -1)
-		xmms_usleep(10000);
+		g_usleep(10000);
 }
 
 int xmmstimid_get_time(InputPlayback * playback) {
diff -r ae9b0327b620 -r aee4ebea943a src/tonegen/tonegen.c
--- a/src/tonegen/tonegen.c	Sun Sep 09 22:06:10 2007 +0300
+++ b/src/tonegen/tonegen.c	Sun Sep 09 22:25:40 2007 +0300
@@ -115,7 +115,7 @@
 				       (sum_sines / frequencies->len));
 		}
 		while (playback->output->buffer_free() < BUF_BYTES && going)
-		        xmms_usleep(30000);
+		        g_usleep(30000);
 		produce_audio(playback->output->written_time(), FMT_S16_NE, 1, BUF_BYTES, data, &going);
 	}
 
diff -r ae9b0327b620 -r aee4ebea943a src/tta/libtta.c
--- a/src/tta/libtta.c	Sun Sep 09 22:06:10 2007 +0300
+++ b/src/tta/libtta.c	Sun Sep 09 22:25:40 2007 +0300
@@ -199,7 +199,7 @@
             {
                 if (!playback->playing)
                     goto DONE;
-                xmms_usleep (10000);
+                g_usleep (10000);
             }
             if (seek_position == -1)
             {
@@ -223,7 +223,7 @@
 	    playback->output->buffer_free ();
 	    playback->output->buffer_free ();
 	    while (playback->output->buffer_playing()) {
-		    xmms_usleep(10000);
+		    g_usleep(10000);
 		    if(!playback->playing)
 			    goto DONE;
 	    }
@@ -537,7 +537,7 @@
 	    seek_position = (int)(millisec / SEEK_STEP);
 
 	    while (seek_position != -1)
-		xmms_usleep (10000);
+		g_usleep (10000);
 	}
 }
 
diff -r ae9b0327b620 -r aee4ebea943a src/vorbis/vorbis.c
--- a/src/vorbis/vorbis.c	Sun Sep 09 22:06:10 2007 +0300
+++ b/src/vorbis/vorbis.c	Sun Sep 09 22:25:40 2007 +0300
@@ -497,7 +497,7 @@
             do_seek(playback);
 
         if (playback->eof) {
-            xmms_usleep(20000);
+            g_usleep(20000);
             continue;
         }
 
@@ -585,7 +585,7 @@
     seekneeded = time;
 
     while (seekneeded != -1)
-        xmms_usleep(20000);
+        g_usleep(20000);
 }
 
 static void
diff -r ae9b0327b620 -r aee4ebea943a src/wav/wav-sndfile.c
--- a/src/wav/wav-sndfile.c	Sun Sep 09 22:06:10 2007 +0300
+++ b/src/wav/wav-sndfile.c	Sun Sep 09 22:25:40 2007 +0300
@@ -496,7 +496,7 @@
 	seek_time = (glong)millisecond;
 
 	while (seek_time != -1)
-		xmms_usleep (80000);
+		g_usleep (80000);
 }
 
 static void
diff -r ae9b0327b620 -r aee4ebea943a src/wav/wav.c
--- a/src/wav/wav.c	Sun Sep 09 22:06:10 2007 +0300
+++ b/src/wav/wav.c	Sun Sep 09 22:25:40 2007 +0300
@@ -436,7 +436,7 @@
     playback->eof = FALSE;
 
     while (wav_file->seek_to != -1)
-        xmms_usleep(10000);
+        g_usleep(10000);
 }
 
 static void
diff -r ae9b0327b620 -r aee4ebea943a src/wavpack/libwavpack.cxx
--- a/src/wavpack/libwavpack.cxx	Sun Sep 09 22:06:10 2007 +0300
+++ b/src/wavpack/libwavpack.cxx	Sun Sep 09 22:25:40 2007 +0300
@@ -358,7 +358,7 @@
             }
         }
         else {
-            xmms_usleep(10000);
+            g_usleep(10000);
         }
     }
     return end_thread();
diff -r ae9b0327b620 -r aee4ebea943a src/wma/wma.c
--- a/src/wma/wma.c	Sun Sep 09 22:06:10 2007 +0300
+++ b/src/wma/wma.c	Sun Sep 09 22:25:40 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);
 }
 
@@ -338,7 +338,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);
@@ -385,7 +385,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);