/*
* This file is part of DisOrder.
- * Copyright (C) 2004-2009 Richard Kettlewell
+ * Copyright (C) 2004-2010 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
/** @brief Marker for a command body */
static const char disorder_body[1];
+/** @brief Marker for a list of args */
+static const char disorder_list[1];
+
/** @brief Issue a command and parse a simple response
* @param c Client
* @param rp Where to store result, or NULL
*
* Put @ref disorder_body in the argument list followed by a char **
* and int giving the body to follow the command. If the int is @c -1
- * then the list is assumed to be NULL-terminated.
+ * then the list is assumed to be NULL-terminated. This may be used
+ * only once.
+ *
+ * Put @ref disorder_list in the argument list followed by a char **
+ * and int giving a list of arguments to include. If the int is @c -1
+ * then the list is assumed to be NULL-terminated. This may be used
+ * any number of times.
*
* Usually you would call this via one of the following interfaces:
* - disorder_simple()
body = va_arg(ap, char **);
nbody = va_arg(ap, int);
has_body = 1;
+ } else if(arg == disorder_list) {
+ char **list = va_arg(ap, char **);
+ int nlist = va_arg(ap, int);
+ if(nlist < 0) {
+ for(nlist = 0; list[nlist]; ++nlist)
+ ;
+ }
+ for(int n = 0; n < nlist; ++n) {
+ dynstr_append(&d, ' ');
+ dynstr_append_string(&d, quoteutf8(arg));
+ }
} else {
dynstr_append(&d, ' ');
dynstr_append_string(&d, quoteutf8(arg));
return ret;
}
-/** @brief Move a track
- * @param c Client
- * @param track Track to move (UTF-8)
- * @param delta Distance to move by
- * @return 0 on success, non-0 on error
- */
-int disorder_move(disorder_client *c, const char *track, int delta) {
- char d[16];
-
- byte_snprintf(d, sizeof d, "%d", delta);
- return disorder_simple(c, 0, "move", track, d, (char *)0);
-}
-
static void client_error(const char *msg,
void attribute((unused)) *u) {
disorder_error(0, "error parsing reply: %s", msg);
}
-/** @brief Get currently playing track
+/** @brief Get a single queue entry
* @param c Client
+ * @param cmd Command
* @param qp Where to store track information
* @return 0 on success, non-0 on error
- *
- * @p qp gets NULL if no track is playing.
*/
-int disorder_playing(disorder_client *c, struct queue_entry **qp) {
+static int onequeue(disorder_client *c, const char *cmd,
+ struct queue_entry **qp) {
char *r;
struct queue_entry *q;
int rc;
- if((rc = disorder_simple(c, &r, "playing", (char *)0)))
+ if((rc = disorder_simple(c, &r, cmd, (char *)0)))
return rc;
if(r) {
q = xmalloc(sizeof *q);
}
/** @brief Fetch the queue, recent list, etc */
-static int disorder_somequeue(disorder_client *c,
- const char *cmd, struct queue_entry **qp) {
+static int somequeue(disorder_client *c,
+ const char *cmd, struct queue_entry **qp) {
struct queue_entry *qh, **qt = &qh, *q;
char *l;
int rc;
return c->user;
}
-static void pref_error_handler(const char *msg,
+static void pairlist_error_handler(const char *msg,
void attribute((unused)) *u) {
- disorder_error(0, "error handling 'prefs' reply: %s", msg);
+ disorder_error(0, "error handling key-value pair reply: %s", msg);
}
-/** @brief Get all preferences for a trcak
+/** @brief Get a list of key-value pairs
* @param c Client
- * @param track Track name
* @param kp Where to store linked list of preferences
+ * @param cmd Command
+ * @param ... Arguments
* @return 0 on success, non-0 on error
*/
-int disorder_prefs(disorder_client *c, const char *track, struct kvp **kp) {
+static int pairlist(disorder_client *c, struct kvp **kp, const char *cmd, ...) {
char **vec, **pvec;
int nvec, npvec, n, rc;
struct kvp *k;
+ va_list ap;
- if((rc = disorder_simple_list(c, &vec, &nvec, "prefs", track, (char *)0)))
+ va_start(ap, cmd);
+ rc = disorder_simple_v(c, 0, cmd, ap);
+ va_end(ap);
+ if(rc)
return rc;
+ if((rc = readlist(c, &vec, &nvec)))
+ return rc;
for(n = 0; n < nvec; ++n) {
- if(!(pvec = split(vec[n], &npvec, SPLIT_QUOTES, pref_error_handler, 0)))
+ if(!(pvec = split(vec[n], &npvec, SPLIT_QUOTES, pairlist_error_handler, 0)))
return -1;
if(npvec != 2) {
- pref_error_handler("malformed response", 0);
+ pairlist_error_handler("malformed response", 0);
return -1;
}
*kp = k = xmalloc(sizeof *k);
return 0;
}
-/** @brief Get recently added tracks
- * @param c Client
- * @param vecp Where to store pointer to list (UTF-8)
- * @param nvecp Where to store count
- * @param max Maximum tracks to fetch, or 0 for all available
- * @return 0 on success, non-0 on error
- */
-int disorder_new_tracks(disorder_client *c,
- char ***vecp, int *nvecp,
- int max) {
- char limit[32];
-
- sprintf(limit, "%d", max);
- return disorder_simple_list(c, vecp, nvecp, "new", limit, (char *)0);
-}
-
/** @brief Get server's RTP address information
* @param c Client
* @param addressp Where to store address (UTF-8)
return 0;
}
-/** @brief Get details of a scheduled event
- * @param c Client
- * @param id Event ID
- * @param actiondatap Where to put details
- * @return 0 on success, non-0 on error
- */
-int disorder_schedule_get(disorder_client *c, const char *id,
- struct kvp **actiondatap) {
- char **lines, **bits;
- int rc, nbits;
-
- *actiondatap = 0;
- if((rc = disorder_simple_list(c, &lines, NULL,
- "schedule-get", id, (char *)0)))
- return rc;
- while(*lines) {
- if(!(bits = split(*lines++, &nbits, SPLIT_QUOTES, 0, 0))) {
- disorder_error(0, "invalid schedule-get reply: cannot split line");
- return -1;
- }
- if(nbits != 2) {
- disorder_error(0, "invalid schedule-get reply: wrong number of fields");
- return -1;
- }
- kvp_set(actiondatap, bits[0], bits[1]);
- }
- return 0;
-}
-
/** @brief Add a scheduled event
* @param c Client
* @param when When to trigger the event
~mdw / disorder / blobdiff