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

queue: duplicate all song objects

Browse Source 
Make sure the queue "owns" all song objects, so nobody else can free
them.
This commit is contained in:
Max Kellermann
2012-08-15 19:52:32 +02:00
parent e96779de48
commit 2bd344549b
3 changed files with 40 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/queue.c
View File

@@ -103,7 +103,7 @@ queue_append(struct queue *queue, struct song *song)
assert(!queue_is_full(queue));
queue->items[queue->length] = (struct queue_item){
.song = song,
.song = song_dup_detached(song),
.id = id,
.version = queue->version,
.priority = 0,
@@ -256,8 +256,8 @@ queue_delete(struct queue *queue, unsigned position)
assert(position < queue->length);
song = queue_get(queue, position);
if (!song_in_database(song))
song_free(song);
assert(!song_in_database(song) || song_is_detached(song));
song_free(song);
id = queue_position_to_id(queue, position);
order = queue_position_to_order(queue, position);
@@ -291,8 +291,9 @@ queue_clear(struct queue *queue)
for (unsigned i = 0; i < queue->length; i++) {
struct queue_item *item = &queue->items[i];
if (!song_in_database(item->song))
song_free(item->song);
assert(!song_in_database(item->song) ||
song_is_detached(item->song));
song_free(item->song);
queue->id_to_position[item->id] = -1;
}