diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2003-06-19 14:46:03 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2003-06-19 14:46:03 +0000 |
| commit | 157fdd556b04aa5ec36685a068fd088dab96d731 (patch) | |
| tree | 844e0060bc03084d9998e2639e1ca4f5ecb4876c | |
| parent | df4994a7fb4441e550a06cf5aea203594a29beb6 (diff) | |
| download | xine-lib-157fdd556b04aa5ec36685a068fd088dab96d731.tar.gz xine-lib-157fdd556b04aa5ec36685a068fd088dab96d731.tar.bz2 | |
add missing host parameterm, check for demux_action_pending to avoid read error message on a simple xine_stop()
CVS patchset: 5070
CVS date: 2003/06/19 14:46:03
| -rw-r--r-- | src/input/input_http.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/input/input_http.c b/src/input/input_http.c index 03a9d322c..7ac5e8b59 100644 --- a/src/input/input_http.c +++ b/src/input/input_http.c @@ -19,7 +19,7 @@ * * input plugin for http network streams * - * $Id: input_http.c,v 1.61 2003/06/05 19:16:28 tmattern Exp $ + * $Id: input_http.c,v 1.62 2003/06/19 14:46:03 guenter Exp $ */ #ifdef HAVE_CONFIG_H @@ -410,7 +410,8 @@ static off_t http_plugin_read (input_plugin_t *this_gen, int i = this->shoutcast_metaint - this->shoutcast_pos; i = xio_tcp_read (this->stream, this->fh, &buf[num_bytes], i); if (i < 0) { - xine_message(this->stream, XINE_MSG_READ_ERROR, NULL); + if (!this->stream->demux_action_pending) + xine_message (this->stream, XINE_MSG_READ_ERROR, this->host, NULL); xine_log (this->stream->xine, XINE_LOG_MSG, _("input_http: read error %d\n"), errno); return 0; } @@ -430,7 +431,8 @@ static off_t http_plugin_read (input_plugin_t *this_gen, /* read errors */ if (n < 0) { - xine_message(this->stream, XINE_MSG_READ_ERROR, NULL); + if (!this->stream->demux_action_pending) + xine_message(this->stream, XINE_MSG_READ_ERROR, this->host, NULL); xine_log (this->stream->xine, XINE_LOG_MSG, _("input_http: read error %d\n"), errno); return 0; } |