#include "disorder-server.h"
/* the head of the queue is played next, so normally we add to the tail */
-struct queue_entry qhead = { &qhead, &qhead, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+struct queue_entry qhead = {
+ .next = &qhead,
+ .prev = &qhead
+};
/* the head of the recent list is the oldest thing, the tail the most recently
* played */
-struct queue_entry phead = { &phead, &phead, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+struct queue_entry phead = {
+ .next = &phead,
+ .prev = &phead
+};
long pcount;
char *buffer;
FILE *fp;
struct queue_entry *q;
+ int version = 0;
if(!(fp = fopen(path, "r"))) {
if(errno == ENOENT)
}
head->next = head->prev = head;
while(!inputline(path, fp, &buffer, '\n')) {
+ if(buffer[0] == '#') {
+ /* Version indicator */
+ version = atoi(buffer + 1);
+ continue;
+ }
q = xmalloc(sizeof *q);
queue_unmarshall(q, buffer, queue_read_error, (void *)path);
+ if(version < 1) {
+ /* Fix up origin field as best we can; will be wrong in some cases but
+ * hopefully not too horribly so. */
+ q->origin = q->submitter ? origin_picked : origin_random;
+ /* Eliminated obsolete states, since they are assumed elsewhere not to be
+ * set. */
+ switch(q->state) {
+ case playing_isscratch:
+ q->origin = origin_scratch;
+ q->state = playing_unplayed;
+ break;
+ case playing_random:
+ q->state = playing_unplayed;
+ break;
+ default:
+ break;
+ }
+ }
if(head == &qhead
&& (!q->track
|| !q->when))
byte_xasprintf(&tmp, "%s.new", path);
if(!(fp = fopen(tmp, "w"))) fatal(errno, "error opening %s", tmp);
+ /* Save version indicator */
+ if(fprintf(fp, "#1\n") < 0)
+ fatal(errno, "error writing %s", tmp);
for(q = head->next; q != head; q = q->next)
if(fprintf(fp, "%s\n", queue_marshall(q)) < 0)
fatal(errno, "error writing %s", tmp);