diff options
| -rw-r--r-- | src/demuxers/demux_avi.c | 4 | ||||
| -rw-r--r-- | src/input/input_http.c | 6 | ||||
| -rw-r--r-- | src/xine-engine/xine_internal.h | 23 |
3 files changed, 14 insertions, 19 deletions
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index f2deaf674..1633a8c33 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_avi.c,v 1.176 2003/11/15 14:00:40 miguelfreitas Exp $ + * $Id: demux_avi.c,v 1.177 2003/11/15 15:04:35 miguelfreitas Exp $ * * demultiplexer for avi streams * @@ -443,7 +443,7 @@ static int idx_grow(demux_avi_t *this, int (*stopper)(demux_avi_t *, void *), chunk_pos = this->idx_grow.nexttagoffset; while (((retval = stopper(this, stopdata)) < 0) && - (!this->stream->demux_action_pending)) { + (!_x_action_pending(this->stream))) { int valid_chunk = 0; num_read += 1; diff --git a/src/input/input_http.c b/src/input/input_http.c index 91efc53d2..24d70178a 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.71 2003/11/15 13:01:08 miguelfreitas Exp $ + * $Id: input_http.c,v 1.72 2003/11/15 15:04:36 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H @@ -432,7 +432,7 @@ static off_t http_plugin_read (input_plugin_t *this_gen, int i = this->shoutcast_metaint - this->shoutcast_pos; i = _x_io_tcp_read (this->stream, this->fh, &buf[num_bytes], i); if (i < 0) { - if (!this->stream->demux_action_pending) + if (!_x_action_pending(this->stream)) _x_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; @@ -453,7 +453,7 @@ static off_t http_plugin_read (input_plugin_t *this_gen, /* read errors */ if (n < 0) { - if (!this->stream->demux_action_pending) + if (!_x_action_pending(this->stream)) _x_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; diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h index 98cd7d4db..0e5327676 100644 --- a/src/xine-engine/xine_internal.h +++ b/src/xine-engine/xine_internal.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_internal.h,v 1.146 2003/11/15 14:54:31 miguelfreitas Exp $ + * $Id: xine_internal.h,v 1.147 2003/11/15 15:04:36 miguelfreitas Exp $ * */ @@ -158,21 +158,22 @@ struct xine_stream_s { /* demuxers send data to audio decoders using this fifo */ fifo_buffer_t *audio_fifo; + /* provide access to osd api */ + osd_renderer_t *osd_renderer; + + /* master/slave streams */ + xine_stream_t *master; /* usually a pointer to itself */ + xine_stream_t *slave; + /* input_dvd uses this one. is it possible to add helper functions instead? */ spu_decoder_t *spu_decoder_plugin; - /* may we change osd api to make this private? */ - osd_renderer_t *osd_renderer; - /* dxr3 use this one, should be possible to fix to use the port instead */ vo_driver_t *video_driver; /* michael will move this one to metronom i think */ int64_t metronom_prebuffer; - /* spudec uses this one. (should be checked) */ - xine_stream_t *master; - /* these definitely should be made private! */ int audio_channel_auto; int spu_decoder_streamtype; @@ -180,7 +181,6 @@ struct xine_stream_s { int spu_channel_auto; int spu_channel_letterbox; int spu_channel; - int demux_action_pending; #ifdef XINE_ENGINE_INTERNAL /* these are private variables, plugins must not access them */ @@ -228,11 +228,6 @@ struct xine_stream_s { int stream_info[XINE_STREAM_INFO_MAX]; char *meta_info [XINE_STREAM_INFO_MAX]; - - /* master/slave streams */ -/* xine_stream_t *master; */ - xine_stream_t *slave; - /* seeking slowdown */ int first_frame_flag; pthread_mutex_t first_frame_lock; @@ -254,7 +249,7 @@ struct xine_stream_s { pthread_t demux_thread; int demux_thread_running; pthread_mutex_t demux_lock; -/* int demux_action_pending; */ + int demux_action_pending; extra_info_t *current_extra_info; pthread_mutex_t current_extra_info_lock; |