diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-02-15 20:31:10 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-02-15 20:31:10 +0000 |
| commit | 367419a18ba5c2f6197d84d748c93f52cc208196 (patch) | |
| tree | 7bbe6076119b64689446d17a04b3772eb8dcf376 /stream | |
| parent | 48614bcc10a47350cd31102e87074cfcbb672d09 (diff) | |
| download | mpv-367419a18ba5c2f6197d84d748c93f52cc208196.tar.bz2 mpv-367419a18ba5c2f6197d84d748c93f52cc208196.tar.xz | |
Move printing of Icy-Metadata into an extra function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26002 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/http.c | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/stream/http.c b/stream/http.c index 9037d22299..b071dc81ef 100644 --- a/stream/http.c +++ b/stream/http.c @@ -716,6 +716,23 @@ base64_encode(const void *enc, int encLen, char *out, int outMax) { } } +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 @@ static int http_streaming_start(stream_t *stream, int* file_format) { 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 |