revert, commited by error, thibaut patch ;-)

CVS patchset: 4017
CVS date: 2003/01/26 23:36:46

1 files changed, 2 insertions, 18 deletions

diff --git a/src/xine-engine/buffer.c b/src/xine-engine/buffer.c
index e3db4a75c..05b94fdd7 100644
--- a/src/xine-engine/buffer.c
+++ b/src/xine-engine/buffer.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: buffer.c,v 1.21 2003/01/26 23:31:13 f1rmb Exp $
+ * $Id: buffer.c,v 1.22 2003/01/26 23:36:46 f1rmb Exp $
  *
  *
  * contents:
@@ -163,10 +163,9 @@ static void fifo_buffer_put (fifo_buffer_t *fifo, buf_element_t *element) {
   else 
     fifo->first = element;
 
-  fifo->last = element;
+  fifo->last  = element;
   element->next = NULL;
   fifo->fifo_size++;
-  fifo->data_size += element->size;
 
   pthread_cond_signal (&fifo->not_empty);
 
@@ -187,7 +186,6 @@ static void fifo_buffer_insert (fifo_buffer_t *fifo, buf_element_t *element) {
     fifo->last = element;
     
   fifo->fifo_size++;
-  fifo->data_size += element->size;
 
   pthread_cond_signal (&fifo->not_empty);
 
@@ -215,7 +213,6 @@ static buf_element_t *fifo_buffer_get (fifo_buffer_t *fifo) {
     fifo->last = NULL;
 
   fifo->fifo_size--;
-  fifo->data_size -= buf->size;
 
   pthread_mutex_unlock (&fifo->mutex);
 
@@ -276,19 +273,6 @@ static int fifo_buffer_size (fifo_buffer_t *this) {
 }
 
 /*
- * Return the amount of the data in the fifo buffer
- */
-static uint32_t fifo_buffer_data_size (fifo_buffer_t *this) {
-  int data_size;
-
-  pthread_mutex_lock(&this->mutex);
-  data_size = this->data_size;
-  pthread_mutex_unlock(&this->mutex);
-
-  return data_size;
-}
-
-/*
  * Destroy the buffer
  */
 static void fifo_buffer_dispose (fifo_buffer_t *this) {