diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2003-11-16 23:33:42 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2003-11-16 23:33:42 +0000 |
| commit | 847f0e85e8b0c8135294258a9507fba03cc1cc30 (patch) | |
| tree | 0a74838023ea90c3bb53c7c4f737bab5dc84e427 /src/input/net_buf_ctrl.c | |
| parent | b88ff04361ced758928d2ad8b87cb8986d044a35 (diff) | |
| download | xine-lib-847f0e85e8b0c8135294258a9507fba03cc1cc30.tar.gz xine-lib-847f0e85e8b0c8135294258a9507fba03cc1cc30.tar.bz2 | |
New stream/meta info (safe) stuff.
BIG NOTE: use helpers to access to these informations (get/set/reset):
_x_{stream,meta}_info_{get,set,reset}()
are for internal use, don't use *_public() ones from inside the beast ;-)
Some wrongly names "xine_" fonction renaming.
CVS patchset: 5757
CVS date: 2003/11/16 23:33:42
Diffstat (limited to 'src/input/net_buf_ctrl.c')
| -rw-r--r-- | src/input/net_buf_ctrl.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/input/net_buf_ctrl.c b/src/input/net_buf_ctrl.c index 967468fd3..b34c3d164 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 = 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); + has_video = _x_stream_info_get(this->stream, XINE_STREAM_INFO_HAS_VIDEO); + has_audio = _x_stream_info_get(this->stream, XINE_STREAM_INFO_HAS_AUDIO); + video_br = _x_stream_info_get(this->stream, XINE_STREAM_INFO_VIDEO_BITRATE); + audio_br = _x_stream_info_get(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 = xine_get_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO); - has_audio = xine_get_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO); + has_video = _x_stream_info_get(this->stream, XINE_STREAM_INFO_HAS_VIDEO); + has_audio = _x_stream_info_get(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 = 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); + int has_video = _x_stream_info_get(this->stream, XINE_STREAM_INFO_HAS_VIDEO); + int has_audio = _x_stream_info_get(this->stream, XINE_STREAM_INFO_HAS_AUDIO); if (fifo->fifo_size == 0 && (((fifo == this->video_fifo) && has_video) || ((fifo == this->audio_fifo) && has_audio))) { |