# HG changeset patch # User yaz # Date 1172759480 28800 # Node ID 2430c9773fa7815131981c72015e7a6aa80156cf # Parent 5810f14fc8e65e3aa8e884eee6df3703c4315724 [svn] - determine whether stream is seekable or not by checking duration. it is safe to use with proxy. diff -r 5810f14fc8e6 -r 2430c9773fa7 ChangeLog --- a/ChangeLog Thu Mar 01 04:33:43 2007 -0800 +++ b/ChangeLog Thu Mar 01 06:31:20 2007 -0800 @@ -1,3 +1,11 @@ +2007-03-01 12:33:43 +0000 William Pitcock + revision [1626] + - revert r1624 due to the fact that it breaks + + trunk/src/curl/curl.c | 134 ++++++++++++++------------------------------------ + 1 file changed, 39 insertions(+), 95 deletions(-) + + 2007-03-01 07:01:41 +0000 Daniel Barkalow revision [1624] Add support for resuming lost connections. diff -r 5810f14fc8e6 -r 2430c9773fa7 src/madplug/input.c --- a/src/madplug/input.c Thu Mar 01 04:33:43 2007 -0800 +++ b/src/madplug/input.c Thu Mar 01 06:31:20 2007 -0800 @@ -341,6 +341,9 @@ gchar *string = NULL; TitleInput *title_input; +#ifdef DEBUG + g_message("f: input_read_tag\n"); +#endif if (info->tuple == NULL) { title_input = bmp_title_input_new(); info->tuple = title_input; @@ -394,7 +397,7 @@ if (string) { title_input->length = atoi(string); #ifdef DEBUG - printf("input_read_tag: TLEN = %d\n", title_input->length); + g_message("input_read_tag: TLEN = %d\n", title_input->length); #endif g_free(string); string = NULL; @@ -409,6 +412,11 @@ info->title = xmms_get_titlestring(audmad_config.title_override == TRUE ? audmad_config.id3_format : xmms_get_gentitle_format(), title_input); + +#ifdef DEBUG + g_message("e: input_read_tag\n"); +#endif + } /** @@ -433,7 +441,7 @@ vfs_fseek(info->infile, 0, SEEK_SET); info->offset = 0; - if(info->remote && info->size == 0){ + if(info->remote && mad_timer_count(info->duration, MAD_UNITS_SECONDS) == 0){ gchar *stream_name = vfs_get_metadata(info->infile, "stream-name"); gchar *track_name = vfs_get_metadata(info->infile, "track-name"); gchar *tmp = NULL; @@ -499,7 +507,7 @@ madinfo->playback->eof = TRUE; } - if(madinfo->remote && madinfo->size == 0) { + if(madinfo->remote && mad_timer_count(madinfo->duration, MAD_UNITS_SECONDS) == 0){ gchar *stream_name = vfs_get_metadata(madinfo->infile, "stream-name"); gchar *track_name = vfs_get_metadata(madinfo->infile, "track-name"); gchar *tmp = NULL; diff -r 5810f14fc8e6 -r 2430c9773fa7 src/madplug/plugin.c --- a/src/madplug/plugin.c Thu Mar 01 04:33:43 2007 -0800 +++ b/src/madplug/plugin.c Thu Mar 01 06:31:20 2007 -0800 @@ -496,7 +496,7 @@ string = NULL; #endif - if(info.remote && info.size == 0){ + if(info.remote && mad_timer_count(info.duration, MAD_UNITS_SECONDS) == 0){ if(info.playback && info.playback->playing) { tuple = bmp_title_input_new(); #ifdef DEBUG