# HG changeset patch # User reimar # Date 1203107039 0 # Node ID 84eb56d278b278bd162fa4312acde3a5550993d1 # Parent c7f41f9e2eb8abdbac0ee56a129da9c07af30cea Remove useless code diff -r c7f41f9e2eb8 -r 84eb56d278b2 stream/http.c --- a/stream/http.c Fri Feb 15 20:20:16 2008 +0000 +++ b/stream/http.c Fri Feb 15 20:23:59 2008 +0000 @@ -760,20 +760,20 @@ http_get_field(http_hdr, "Icy-MetaInt") ) { switch( http_hdr->status_code ) { case 200: { // OK - char *field_data = NULL; + char *field_data; // note: I skip icy-notice1 and 2, as they contain html
// and are IMHO useless info ::atmos if( (field_data = http_get_field(http_hdr, "icy-name")) != NULL ) - mp_msg(MSGT_NETWORK,MSGL_INFO,"Name : %s\n", field_data); field_data = NULL; + mp_msg(MSGT_NETWORK,MSGL_INFO,"Name : %s\n", field_data); if( (field_data = http_get_field(http_hdr, "icy-genre")) != NULL ) - mp_msg(MSGT_NETWORK,MSGL_INFO,"Genre : %s\n", field_data); field_data = NULL; + mp_msg(MSGT_NETWORK,MSGL_INFO,"Genre : %s\n", field_data); if( (field_data = http_get_field(http_hdr, "icy-url")) != NULL ) - mp_msg(MSGT_NETWORK,MSGL_INFO,"Website: %s\n", field_data); field_data = NULL; + mp_msg(MSGT_NETWORK,MSGL_INFO,"Website: %s\n", field_data); // XXX: does this really mean public server? ::atmos if( (field_data = http_get_field(http_hdr, "icy-pub")) != NULL ) - mp_msg(MSGT_NETWORK,MSGL_INFO,"Public : %s\n", atoi(field_data)?"yes":"no"); field_data = NULL; + mp_msg(MSGT_NETWORK,MSGL_INFO,"Public : %s\n", atoi(field_data)?"yes":"no"); if( (field_data = http_get_field(http_hdr, "icy-br")) != NULL ) - mp_msg(MSGT_NETWORK,MSGL_INFO,"Bitrate: %skbit/s\n", field_data); field_data = NULL; + mp_msg(MSGT_NETWORK,MSGL_INFO,"Bitrate: %skbit/s\n", field_data); // If content-type == video/nsv we most likely have a winamp video stream // otherwise it should be mp3. if there are more types consider adding mime type