Remove SpaQueue, use SpaList instead

spa/plugins/alsa/alsa-sink.c

@@ -33,7 +33,7 @@ typedef struct _SpaALSAState SpaALSASink;
 
 static const char default_device[] = "default";
 static const uint32_t default_buffer_time = 4000;
-static const uint32_t default_period_time = 1000;
+static const uint32_t default_period_time = 500;
 static const bool default_period_event = 0;
 
 static void
@@ -366,7 +366,7 @@ static SpaResult
 spa_alsa_clear_buffers (SpaALSASink *this)
 {
   if (this->n_buffers > 0) {
-    SPA_QUEUE_INIT (&this->ready);
+    spa_list_init (&this->ready);
     this->n_buffers = 0;
     this->ringbuffer = NULL;
   }
@@ -698,8 +698,7 @@ spa_alsa_sink_node_process_input (SpaNode *node)
     this->ringbuffer->outstanding = true;
     this->ringbuffer = b;
   } else {
-    b->next = NULL;
-    SPA_QUEUE_PUSH_TAIL (&this->ready, SpaALSABuffer, next, b);
+    spa_list_insert (this->ready.prev, &b->list);
   }
   b->outstanding = false;
   input->status = SPA_RESULT_OK;
@@ -808,6 +807,8 @@ alsa_sink_init (const SpaHandleFactory  *factory,
   this->stream = SND_PCM_STREAM_PLAYBACK;
   reset_alsa_sink_props (&this->props[1]);
 
+  spa_list_init (&this->ready);
+
   for (i = 0; info && i < info->n_items; i++) {
     if (!strcmp (info->items[i].key, "alsa.card")) {
       snprintf (this->props[1].device, 63, "hw:%s", info->items[i].value);

spa/plugins/alsa/alsa-source.c

@@ -22,7 +22,7 @@
 #include <asoundlib.h>
 
 #include <spa/node.h>
-#include <spa/queue.h>
+#include <spa/list.h>
 #include <spa/audio/format.h>
 #include <lib/props.h>
 
@@ -408,16 +408,15 @@ recycle_buffer (SpaALSASource *this, uint32_t buffer_id)
     return;
 
   b->outstanding = false;
-  b->next = NULL;
-  SPA_QUEUE_PUSH_TAIL (&this->free, SpaALSABuffer, next, b);
+  spa_list_insert (this->free.prev, &b->list);
 }
 
 static SpaResult
 spa_alsa_clear_buffers (SpaALSASource *this)
 {
   if (this->n_buffers > 0) {
-    SPA_QUEUE_INIT (&this->free);
-    SPA_QUEUE_INIT (&this->ready);
+    spa_list_init (&this->free);
+    spa_list_init (&this->ready);
     this->n_buffers = 0;
   }
   return SPA_RESULT_OK;
@@ -591,8 +590,7 @@ spa_alsa_source_node_port_use_buffers (SpaNode         *node,
       default:
         break;
     }
-    b->next = NULL;
-    SPA_QUEUE_PUSH_TAIL (&this->free, SpaALSABuffer, next, b);
+    spa_list_insert (this->free.prev, &b->list);
   }
   this->n_buffers = n_buffers;
 
@@ -749,11 +747,12 @@ spa_alsa_source_node_process_output (SpaNode *node)
     return SPA_RESULT_ERROR;
   }
 
-  SPA_QUEUE_POP_HEAD (&this->ready, SpaALSABuffer, next, b);
-  if (b == NULL) {
+  if (spa_list_is_empty (&this->ready)) {
     output->status = SPA_RESULT_UNEXPECTED;
     return SPA_RESULT_ERROR;
   }
+  b = spa_list_first (&this->ready, SpaALSABuffer, list);
+  spa_list_remove (&b->list);
   b->outstanding = true;
 
   output->buffer_id = b->outbuf->id;

spa/plugins/alsa/alsa-utils.c

@@ -280,13 +280,12 @@ pull_frames_queue (SpaALSAState *state,
                    snd_pcm_uframes_t offset,
                    snd_pcm_uframes_t frames)
 {
-  SpaALSABuffer *b;
-
-  SPA_QUEUE_PEEK_HEAD (&state->ready, SpaALSABuffer, b);
-
-  if (b) {
+  if (!spa_list_is_empty (&state->ready)) {
     uint8_t *src, *dst;
     size_t n_bytes;
+    SpaALSABuffer *b;
+
+    b = spa_list_first (&state->ready, SpaALSABuffer, list);
 
     src = SPA_MEMBER (b->outbuf->datas[0].data, b->outbuf->datas[0].offset + state->ready_offset, uint8_t);
     dst = SPA_MEMBER (my_areas[0].addr, offset * state->frame_size, uint8_t);
@@ -299,7 +298,7 @@ pull_frames_queue (SpaALSAState *state,
     if (state->ready_offset >= b->outbuf->datas[0].size) {
       SpaNodeEventReuseBuffer rb;
 
-      SPA_QUEUE_POP_HEAD (&state->ready, SpaALSABuffer, next, b);
+      spa_list_remove (&b->list);
       b->outstanding = true;
 
       rb.event.type = SPA_NODE_EVENT_TYPE_REUSE_BUFFER;
@@ -448,10 +447,13 @@ mmap_read (SpaALSAState *state)
   state->last_ticks = state->sample_count * SPA_USEC_PER_SEC / state->rate;
   state->last_monotonic = now;
 
-  SPA_QUEUE_POP_HEAD (&state->free, SpaALSABuffer, next, b);
-  if (b == NULL) {
+  if (spa_list_is_empty (&state->free)) {
+    b = NULL;
     spa_log_warn (state->log, "no more buffers");
   } else {
+    b = spa_list_first (&state->free, SpaALSABuffer, list);
+    spa_list_remove (&b->list);
+
     dest = SPA_MEMBER (b->outbuf->datas[0].data, b->outbuf->datas[0].offset, void);
     destsize = b->outbuf->datas[0].size;
 
@@ -496,8 +498,7 @@ mmap_read (SpaALSAState *state)
     d = b->outbuf->datas;
     d[0].size = avail * state->frame_size;
 
-    b->next = NULL;
-    SPA_QUEUE_PUSH_TAIL (&state->ready, SpaALSABuffer, next, b);
+    spa_list_insert (state->ready.prev, &b->list);
 
     ho.event.type = SPA_NODE_EVENT_TYPE_HAVE_OUTPUT;
     ho.event.size = sizeof (ho);

spa/plugins/alsa/alsa-utils.h

@@ -30,7 +30,7 @@ extern "C" {
 
 #include <spa/id-map.h>
 #include <spa/log.h>
-#include <spa/queue.h>
+#include <spa/list.h>
 #include <spa/node.h>
 #include <spa/ringbuffer.h>
 #include <spa/audio/format.h>
@@ -55,7 +55,7 @@ struct _SpaALSABuffer {
   SpaMetaHeader *h;
   SpaMetaRingbuffer *rb;
   bool outstanding;
-  SpaALSABuffer *next;
+  SpaList list;
 };
 
 typedef struct {
@@ -109,8 +109,8 @@ struct _SpaALSAState {
   bool use_ringbuffer;
   SpaALSABuffer *ringbuffer;
 
-  SpaQueue free;
-  SpaQueue ready;
+  SpaList free;
+  SpaList ready;
   size_t ready_offset;
 
   bool started;