Mercurial > mplayer.hg

changeset 25970:c6ec51cc3b13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move printing of Icy-Metadata into an extra function
author reimar
date Fri, 15 Feb 2008 20:31:10 +0000
parents 84eb56d278b2
children 64b1e4ea04fc
files stream/http.c
diffstat 1 files changed, 18 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/stream/http.c	Fri Feb 15 20:23:59 2008 +0000
+++ b/stream/http.c	Fri Feb 15 20:31:10 2008 +0000
@@ -716,6 +716,23 @@
 	}
 }
 
+static void print_icy_metadata(HTTP_header_t *http_hdr) {
+	const char *field_data;
+	// note: I skip icy-notice1 and 2, as they contain html <BR>
+	// 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);
+	if( (field_data = http_get_field(http_hdr, "icy-genre")) != 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);
+	// 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");
+	if( (field_data = http_get_field(http_hdr, "icy-br")) != NULL )
+		mp_msg(MSGT_NETWORK,MSGL_INFO,"Bitrate: %skbit/s\n", field_data);
+}
+
 //! If this function succeeds you must closesocket stream->fd
 static int http_streaming_start(stream_t *stream, int* file_format) {
 	HTTP_header_t *http_hdr = NULL;
@@ -761,20 +778,7 @@
 			switch( http_hdr->status_code ) {
 				case 200: { // OK
 					char *field_data;
-					// note: I skip icy-notice1 and 2, as they contain html <BR>
-					// 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);
-					if( (field_data = http_get_field(http_hdr, "icy-genre")) != 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);
-					// 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");
-					if( (field_data = http_get_field(http_hdr, "icy-br")) != NULL )
-						mp_msg(MSGT_NETWORK,MSGL_INFO,"Bitrate: %skbit/s\n", field_data);
-					
+					print_icy_metadata(http_hdr);
 					// 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 
 					// handling like later