Mercurial > audlegacy
changeset 4247:58bc8f042f69
Automated merge with ssh://hg.atheme.org//hg/audacious
| author | Eugene Zagidullin <e.asphyx@gmail.com> |
|---|---|
| date | Mon, 04 Feb 2008 06:11:37 +0300 |
| parents | b1e08fcb4273 (current diff) 254ec9932b37 (diff) |
| children | 5ac89fc5f101 |
| files | src/audacious/output.c |
| diffstat | 2 files changed, 3 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/audacious/output.c Mon Feb 04 06:09:51 2008 +0300 +++ b/src/audacious/output.c Mon Feb 04 06:11:37 2008 +0300 @@ -725,7 +725,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 */ @@ -734,14 +734,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)
--- a/src/libid3tag/field.c Mon Feb 04 06:09:51 2008 +0300 +++ b/src/libid3tag/field.c Mon Feb 04 06:11:37 2008 +0300 @@ -265,7 +265,7 @@ end = *ptr + length; - while (end - *ptr > 0) { + while (end - *ptr > 0 && **ptr != '\0') { latin1 = id3_parse_latin1(ptr, end - *ptr, 0); if (latin1 == 0) goto fail; @@ -304,7 +304,7 @@ end = *ptr + length; - while (end - *ptr > 0) { + while (end - *ptr > 0 && **ptr != '\0') { ucs4 = id3_parse_string(ptr, end - *ptr, *encoding, 0); if (ucs4 == 0) goto fail;