/*
* This file is part of DisOrder.
- * Copyright (C) 2004, 2005, 2006 Richard Kettlewell
+ * Copyright (C) 2004-2008 Richard Kettlewell
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#ifndef QUEUE_H
#define QUEUE_H
+#include <time.h>
+
+
enum playing_state {
playing_failed, /* failed to play */
playing_isscratch, /* this is a scratch track */
const struct plugin *pl; /* plugin that's playing this track */
void *data; /* player data */
long sofar; /* how much played so far */
+ int prepared; /* true when connected to speaker */
/* For DISORDER_PLAYER_PAUSES only: */
time_t lastpaused, lastresumed; /* when last paused/resumed, or 0 */
long uptopause; /* how much played up to last pause */
struct queuelike *ql; /* owning queue */
};
-extern struct queue_entry qhead;
-/* queue of things yet to be played. the head will be played
- * soonest. */
-
-extern struct queue_entry phead;
-/* things that have been played in the past. the head is the oldest. */
-
-void queue_read(void);
-/* read the queue in. Calls @fatal@ on error. */
-
-void queue_write(void);
-/* write the queue out. Calls @fatal@ on error. */
-
-void recent_read(void);
-/* read the recently played list in. Calls @fatal@ on error. */
-
-void recent_write(void);
-/* write the recently played list out. Calls @fatal@ on error. */
-
-struct queue_entry *queue_add(const char *track, const char *submitter,
- int where);
-#define WHERE_START 0 /* Add to head of queue */
-#define WHERE_END 1 /* Add to end of queue */
-#define WHERE_BEFORE_RANDOM 2 /* End, or before random track */
-/* add an entry to the queue. Return a pointer to the new entry. */
-
-void queue_remove(struct queue_entry *q, const char *who);
-/* remove an from the queue */
-
-struct queue_entry *queue_find(const char *key);
-/* find a track in the queue by name or ID */
-
-void queue_played(struct queue_entry *q);
-/* add @q@ to the played list */
+void queue_insert_entry(struct queue_entry *b, struct queue_entry *n);
+void queue_delete_entry(struct queue_entry *node);
int queue_unmarshall(struct queue_entry *q, const char *s,
void (*error_handler)(const char *, void *),
char *queue_marshall(const struct queue_entry *q);
/* marshall @q@ into a UTF-8 string */
-void queue_id(struct queue_entry *q);
-/* give @q@ an ID */
-
-int queue_move(struct queue_entry *q, int delta, const char *who);
-/* move element @q@ in the queue towards the front (@delta@ > 0) or towards the
- * back (@delta@ < 0). The return value is the leftover delta once we've hit
- * the end in whichever direction we were going. */
-
-void queue_moveafter(struct queue_entry *target,
- int nqs, struct queue_entry **qs, const char *who);
-/* Move all the elements QS to just after TARGET, or to the head if
- * TARGET=0. */
-
-void queue_fix_sofar(struct queue_entry *q);
-/* Fix up the sofar field for standalone players */
-
#endif /* QUEUE_H */
/*