oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Queue: use std::stable_sort() instead of g_qsort_with_data()

Browse Source
This commit is contained in:
Max Kellermann
2013-01-08 16:51:21 +01:00
parent 255ee646c2
commit affc446690
1 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Queue.cxx
View File

@@ -21,8 +21,6 @@
#include "Queue.hxx" #include "Queue.hxx"
#include "song.h" #include "song.h"
#include <glib.h>
#include <stdlib.h> #include <stdlib.h>
queue::queue(unsigned _max_length) queue::queue(unsigned _max_length)
@@ -280,26 +278,6 @@ queue::Clear()
length = 0; length = 0;
} }
static gint
queue_item_compare_order_priority(gconstpointer av, gconstpointer bv,
gpointer user_data)
{
const struct queue *queue = (const struct queue *)user_data;
const unsigned *const ap = (const unsigned *)av;
const unsigned *const bp = (const unsigned *)bv;
assert(ap >= queue->order && ap < queue->order + queue->length);
assert(bp >= queue->order && bp < queue->order + queue->length);
uint8_t a = queue->items[*ap].priority;
uint8_t b = queue->items[*bp].priority;
if (gcc_likely(a == b))
return 0;
else if (a > b)
return -1;
else
return 1;
}
static void static void
queue_sort_order_by_priority(struct queue *queue, unsigned start, unsigned end) queue_sort_order_by_priority(struct queue *queue, unsigned start, unsigned end)
{ {
@@ -308,10 +286,14 @@ queue_sort_order_by_priority(struct queue *queue, unsigned start, unsigned end)
assert(start <= end); assert(start <= end);
assert(end <= queue->length); assert(end <= queue->length);
g_qsort_with_data(&queue->order[start], end - start, auto cmp = [queue](unsigned a_pos, unsigned b_pos){
sizeof(queue->order[0]), const queue::Item &a = queue->items[a_pos];
queue_item_compare_order_priority, const queue::Item &b = queue->items[b_pos];
queue);
return a.priority > b.priority;
};
std::stable_sort(queue->order + start, queue->order + end, cmp);
} }
void void