5 files changed, 0 insertions, 36 deletions
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index b3a9d8e46..07aefc362 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -2496,9 +2496,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 3271a04c9..e11e3b361 100644
--- a/src/input/input_pnm.c
+++ b/src/input/input_pnm.c
@@ -83,8 +83,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 bee192c0d..e2b1bae99 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.c b/src/input/net_buf_ctrl.c
index aaf575e40..03a24d38f 100644
--- a/src/input/net_buf_ctrl.c
+++ b/src/input/net_buf_ctrl.c
@@ -113,10 +113,6 @@ static void nbc_set_speed_normal (nbc_t *this) {
   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) {
   static const char buffering[2][4] = {"   ", "buf"};
   static const char enabled[2][4]   = {"off", "on "};
@@ -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 --git a/src/input/net_buf_ctrl.h b/src/input/net_buf_ctrl.h
index c35187179..87d6d84a1 100644
--- a/src/input/net_buf_ctrl.h
+++ b/src/input/net_buf_ctrl.h
@@ -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