summaryrefslogtreecommitdiff
path: root/src/xine-engine/buffer.c
diff options
context:
space:
mode:
authorDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2003-01-26 23:31:13 +0000
committerDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2003-01-26 23:31:13 +0000
commit29a4f937b0177135cf24496034756457b1be5113 (patch)
tree5799d8a433bb4c97c4501d44ea60ce7ee9192f3a /src/xine-engine/buffer.c
parentc261558eafea79fd2e7727c2bcd7c80b02a04ff0 (diff)
downloadxine-lib-29a4f937b0177135cf24496034756457b1be5113.tar.gz
xine-lib-29a4f937b0177135cf24496034756457b1be5113.tar.bz2
fix automake warning. NOTE: nvtv user, can you check if i didn't break compilation of this stuff??
CVS patchset: 4016 CVS date: 2003/01/26 23:31:13
Diffstat (limited to 'src/xine-engine/buffer.c')
-rw-r--r--src/xine-engine/buffer.c20
1 files changed, 18 insertions, 2 deletions
diff --git a/src/xine-engine/buffer.c b/src/xine-engine/buffer.c
index 2e93009a1..e3db4a75c 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.20 2002/12/22 15:02:06 miguelfreitas Exp $
+ * $Id: buffer.c,v 1.21 2003/01/26 23:31:13 f1rmb Exp $
*
*
* contents:
@@ -163,9 +163,10 @@ 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);
@@ -186,6 +187,7 @@ 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);
@@ -213,6 +215,7 @@ 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);
@@ -273,6 +276,19 @@ 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) {