diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-06-15 00:14:40 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-06-15 00:14:40 +0100 |
| commit | 53926f54e4dcf163afd397ed937c8b542535ee0b (patch) | |
| tree | 47e17954c287e90109efbbd64d3c332ffaada094 | |
| parent | 1dde20995e9c585955bf22c8e7240514bb989ac5 (diff) | |
| download | xine-lib-53926f54e4dcf163afd397ed937c8b542535ee0b.tar.gz xine-lib-53926f54e4dcf163afd397ed937c8b542535ee0b.tar.bz2 | |
Remove nbc_check_buffers calls; mark it & the low-water mark fns as deprecated.
| -rw-r--r-- | src/input/input_dvb.c | 3 | ||||
| -rw-r--r-- | src/input/input_pnm.c | 2 | ||||
| -rw-r--r-- | src/input/input_rtsp.c | 2 | ||||
| -rw-r--r-- | src/input/net_buf_ctrl.h | 6 |
4 files changed, 3 insertions, 10 deletions
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c index 795b843c5..957a7beb9 100644 --- a/src/input/input_dvb.c +++ b/src/input/input_dvb.c @@ -2505,9 +2505,6 @@ static off_t dvb_plugin_read (input_plugin_t *this_gen, "input_dvb: reading %" PRIdMAX " bytes...\n", (intmax_t)len); #endif -#ifndef DVB_NO_BUFFERING - nbc_check_buffers (this->nbc); -#endif /* protect against channel changes */ have_mutex = pthread_mutex_lock(&this->channel_change_mutex); total=0; diff --git a/src/input/input_pnm.c b/src/input/input_pnm.c index 680c5b1e8..f4bfa1395 100644 --- a/src/input/input_pnm.c +++ b/src/input/input_pnm.c @@ -82,8 +82,6 @@ static off_t pnm_plugin_read (input_plugin_t *this_gen, lprintf ("pnm_plugin_read: %"PRId64" bytes ...\n", len); - nbc_check_buffers (this->nbc); - n = pnm_read (this->pnm, buf, len); this->curpos += n; diff --git a/src/input/input_rtsp.c b/src/input/input_rtsp.c index 2895edf5d..42d24ed3a 100644 --- a/src/input/input_rtsp.c +++ b/src/input/input_rtsp.c @@ -83,8 +83,6 @@ static off_t rtsp_plugin_read (input_plugin_t *this_gen, lprintf ("rtsp_plugin_read: %"PRId64" bytes ...\n", len); - nbc_check_buffers (this->nbc); - n = rtsp_session_read (this->rtsp, buf, len); this->curpos += n; diff --git a/src/input/net_buf_ctrl.h b/src/input/net_buf_ctrl.h index 79f698008..9229144f8 100644 --- a/src/input/net_buf_ctrl.h +++ b/src/input/net_buf_ctrl.h @@ -29,12 +29,12 @@ typedef struct nbc_s nbc_t; nbc_t *nbc_init (xine_stream_t *xine); -void nbc_check_buffers (nbc_t *this); +void nbc_check_buffers (nbc_t *this) XINE_DEPRECATED; void nbc_close (nbc_t *this); -void nbc_set_high_water_mark(nbc_t *this, int value); +void nbc_set_high_water_mark(nbc_t *this, int value) XINE_DEPRECATED; -void nbc_set_low_water_mark(nbc_t *this, int value); +void nbc_set_low_water_mark(nbc_t *this, int value) XINE_DEPRECATED; #endif |