vss: need_audio_header(): Change return value to bool.

[paraslash.git] / chunk_queue.c

diff --git a/chunk_queue.c b/chunk_queue.c
index bb97c6902ae92379b04033990598c958a8dd76b4..468b1dc2dd4828796d53e5804d6f28611b88c462 100644 (file)
--- a/chunk_queue.c
+++ b/chunk_queue.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2007-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2010 Andre Noll <maan@systemlinux.org>

  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */


@@ -11,7 +11,6 @@
 #include "para.h"
 #include "list.h"
 #include "afh.h"
 #include "para.h"
 #include "list.h"
 #include "afh.h"

-#include "vss.h"

 #include "string.h"
 #include "error.h"
 
 #include "string.h"
 #include "error.h"
 


@@ -82,16 +81,46 @@ struct queued_chunk *cq_peek(struct chunk_queue *cq)
 /**
  * Remove the current chunk from the queue.
  *
 /**
  * Remove the current chunk from the queue.
  *

- * \param cq The chunk to remove.
+ * \param cq The queue to remove from.

  */
 void cq_dequeue(struct chunk_queue *cq)
 {
        struct queued_chunk *qc = cq_peek(cq);
        assert(qc);
  */
 void cq_dequeue(struct chunk_queue *cq)
 {
        struct queued_chunk *qc = cq_peek(cq);
        assert(qc);

+       assert(cq->num_pending >= qc->num_bytes);
+       cq->num_pending -= qc->num_bytes;

        list_del(&qc->node);
        free(qc);
 }
 
        list_del(&qc->node);
        free(qc);
 }
 

+/**
+ * Force to add a chunk to the given queue.
+ *
+ * \param cq See \ref cq_enqueue.
+ * \param buf See \ref cq_enqueue.
+ * \param num_bytes See \ref cq_enqueue.
+ *
+ * If queuing the given buffer would result in exceeding the maximal queue
+ * size, buffers are dropped from the beginning of the queue. Note that this
+ * function still might fail.
+ *
+ * \return Standard.
+ */
+int cq_force_enqueue(struct chunk_queue *cq, const char *buf, size_t num_bytes)
+{
+       int ret;
+
+       if (num_bytes > cq->max_pending)
+               return -E_QUEUE;
+       for (;;) {
+               ret = cq_enqueue(cq, buf, num_bytes);
+               if (ret >= 0)
+                       return ret;
+               cq_dequeue(cq);
+       }
+       /* never reached */
+}
+

 /**
  * Change the number of bytes sent for the current queued chunk.
  *
 /**
  * Change the number of bytes sent for the current queued chunk.
  *