From: <fla...@gm...> - 2008-01-16 18:48:16
|
# HG changeset patch # User Diego 'Flameeyes' Pettenò <fla...@gm...> # Date 1200509126 -3600 # Node ID b83c2ca230aba7b6f29b662da439e0fe90275f06 # Parent 69d1c100b3fa91d3057b9219efec92f4ec5b535b Remove deprecated unused functions. diff -r b83c2ca230aba7b6f29b662da439e0fe90275f06 -r 69d1c100b3fa91d3057b9219efec92f4ec5b535b src/input/input_dvb.c --- a/src/input/input_dvb.c Wed Jan 16 19:45:26 2008 +0100 +++ b/src/input/input_dvb.c Tue Jan 15 17:09:22 2008 +0100 @@ -2496,9 +2496,6 @@ static off_t dvb_plugin_read (input_plug "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 -r b83c2ca230aba7b6f29b662da439e0fe90275f06 -r 69d1c100b3fa91d3057b9219efec92f4ec5b535b src/input/input_pnm.c --- a/src/input/input_pnm.c Wed Jan 16 19:45:26 2008 +0100 +++ b/src/input/input_pnm.c Tue Jan 15 17:09:22 2008 +0100 @@ -82,8 +82,6 @@ static off_t pnm_plugin_read (input_plug off_t n; lprintf ("pnm_plugin_read: %"PRId64" bytes ...\n", len); - - nbc_check_buffers (this->nbc); n = pnm_read (this->pnm, buf, len); this->curpos += n; diff -r b83c2ca230aba7b6f29b662da439e0fe90275f06 -r 69d1c100b3fa91d3057b9219efec92f4ec5b535b src/input/input_rtsp.c --- a/src/input/input_rtsp.c Wed Jan 16 19:45:26 2008 +0100 +++ b/src/input/input_rtsp.c Tue Jan 15 17:09:22 2008 +0100 @@ -82,8 +82,6 @@ static off_t rtsp_plugin_read (input_plu off_t n; 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 -r b83c2ca230aba7b6f29b662da439e0fe90275f06 -r 69d1c100b3fa91d3057b9219efec92f4ec5b535b src/input/net_buf_ctrl.c --- a/src/input/net_buf_ctrl.c Wed Jan 16 19:45:26 2008 +0100 +++ b/src/input/net_buf_ctrl.c Tue Jan 15 17:09:22 2008 +0100 @@ -111,10 +111,6 @@ static void nbc_set_speed_normal (nbc_t xprintf(stream->xine, XINE_VERBOSITY_DEBUG, "\nnet_buf_ctrl: nbc_set_speed_normal\n"); _x_set_speed (stream, XINE_SPEED_NORMAL); stream->xine->clock->set_option (stream->xine->clock, CLOCK_SCR_ADJUSTABLE, 1); -} - -void nbc_check_buffers (nbc_t *this) { - /* Deprecated */ } static void display_stats (nbc_t *this) { @@ -564,22 +560,3 @@ void nbc_close (nbc_t *this) { free (this); xprintf(xine, XINE_VERBOSITY_DEBUG, "\nnet_buf_ctrl: nbc_close: done\n"); } - - -void nbc_set_high_water_mark(nbc_t *this, int value) { -/* - Deprecated - this->high_water_mark = value; -*/ - xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, - "\nnet_buf_ctrl: this method is deprecated, please fix the input plugin\n"); -} - -void nbc_set_low_water_mark(nbc_t *this, int value) { -/* - Deprecated - this->low_water_mark = value; -*/ - xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, - "\nnet_buf_ctrl: this method is deprecated, please fix the input plugin\n"); -} diff -r b83c2ca230aba7b6f29b662da439e0fe90275f06 -r 69d1c100b3fa91d3057b9219efec92f4ec5b535b src/input/net_buf_ctrl.h --- a/src/input/net_buf_ctrl.h Wed Jan 16 19:45:26 2008 +0100 +++ b/src/input/net_buf_ctrl.h Tue Jan 15 17:09:22 2008 +0100 @@ -29,12 +29,6 @@ typedef struct nbc_s nbc_t; nbc_t *nbc_init (xine_stream_t *xine); -void nbc_check_buffers (nbc_t *this); - void nbc_close (nbc_t *this); -void nbc_set_high_water_mark(nbc_t *this, int value); - -void nbc_set_low_water_mark(nbc_t *this, int value); - #endif |