Mercurial > audlegacy

changeset 4231:254ec9932b37

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with ssh://hg.atheme.org//hg/audacious
author William Pitcock <nenolod@atheme.org>
date Fri, 01 Feb 2008 13:15:34 -0600
parents b3e82a1eb129 (diff) 386c712a5b5b (current diff)
children 58bc8f042f69
files
diffstat 1 files changed, 1 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/output.c	Thu Jan 31 14:51:52 2008 +0900
+++ b/src/audacious/output.c	Fri Feb 01 13:15:34 2008 -0600
@@ -490,7 +490,7 @@
             GTimeVal pb_abs_time;
 
             g_get_current_time(&pb_abs_time);
-            g_time_val_add(&pb_abs_time, (cfg.output_buffer_size / 2) * 1000);
+            g_time_val_add(&pb_abs_time, 10000);
 
             if (going && !*going)              /* thread stopped? */
                 return;                        /* so finish */
@@ -499,14 +499,9 @@
                 return;                        /* yes, so finish */
 
             /* else sleep for retry */
-#ifndef GDK_WINDOWING_QUARTZ
             g_mutex_lock(playback->pb_change_mutex);
             g_cond_timed_wait(playback->pb_change_cond, playback->pb_change_mutex, &pb_abs_time);
             g_mutex_unlock(playback->pb_change_mutex);
-#else
-            /* Darwin threading sucks. */
-            g_usleep(10000);
-#endif
         }
 
         if (ip_data.stop)