summaryrefslogtreecommitdiff
path: root/src/input/net_buf_ctrl.c
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2003-11-15 13:01:00 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2003-11-15 13:01:00 +0000
commit570fd9006dcf6f9aaa460e79b93b7ce37f7c6d7b (patch)
treeed387d71185404d03367e64a52093b0e6369ed67 /src/input/net_buf_ctrl.c
parentbb62a769e4a50cef3023408bf9a527e63b7d884d (diff)
downloadxine-lib-570fd9006dcf6f9aaa460e79b93b7ce37f7c6d7b.tar.gz
xine-lib-570fd9006dcf6f9aaa460e79b93b7ce37f7c6d7b.tar.bz2
more helper functions cleanup (stream info, meta info)
CVS patchset: 5731 CVS date: 2003/11/15 13:01:00
Diffstat (limited to 'src/input/net_buf_ctrl.c')
-rw-r--r--src/input/net_buf_ctrl.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/input/net_buf_ctrl.c b/src/input/net_buf_ctrl.c
index cc8135dc0..967468fd3 100644
--- a/src/input/net_buf_ctrl.c
+++ b/src/input/net_buf_ctrl.c
@@ -154,10 +154,10 @@ static void nbc_compute_fifo_length(nbc_t *this,
int64_t video_br, audio_br;
int has_video, has_audio;
- has_video = this->stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO];
- has_audio = this->stream->stream_info[XINE_STREAM_INFO_HAS_AUDIO];
- video_br = this->stream->stream_info[XINE_STREAM_INFO_VIDEO_BITRATE];
- audio_br = this->stream->stream_info[XINE_STREAM_INFO_AUDIO_BITRATE];
+ has_video = xine_get_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO);
+ has_audio = xine_get_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO);
+ video_br = xine_get_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_BITRATE);
+ audio_br = xine_get_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITRATE);
fifo_free = fifo->buffer_pool_num_free;
fifo_fill = fifo->fifo_size;
@@ -277,8 +277,8 @@ static void nbc_put_cb (fifo_buffer_t *fifo,
if (this->buffering) {
- has_video = this->stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO];
- has_audio = this->stream->stream_info[XINE_STREAM_INFO_HAS_AUDIO];
+ has_video = xine_get_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO);
+ has_audio = xine_get_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO);
/* restart playing if high_water_mark is reached by all fifos
* do not restart if has_video and has_audio are false to avoid
* a yoyo effect at the beginning of the stream when these values
@@ -399,8 +399,8 @@ static void nbc_get_cb (fifo_buffer_t *fifo,
if (!this->buffering) {
/* start buffering if one fifo is empty
*/
- int has_video = this->stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO];
- int has_audio = this->stream->stream_info[XINE_STREAM_INFO_HAS_AUDIO];
+ int has_video = xine_get_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO);
+ int has_audio = xine_get_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO);
if (fifo->fifo_size == 0 &&
(((fifo == this->video_fifo) && has_video) ||
((fifo == this->audio_fifo) && has_audio))) {