5 files changed, 26 insertions, 10 deletions
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index 9f51da267..85246ea5c 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -2498,9 +2498,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 937b7c89b..669d24d28 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 db16c9bc6..110c4d4b6 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 4a39aadfb..e27ed99f3 100644
--- a/src/input/net_buf_ctrl.c
+++ b/src/input/net_buf_ctrl.c
@@ -113,6 +113,10 @@ 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) {
   const char buffering[2][4] = {"   ", "buf"};
   const char enabled[2][4]   = {"off", "on "};
@@ -560,3 +564,22 @@ 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 3f4b4b3bf..7dfb7b0d1 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) XINE_MALLOC;
 
-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