X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/c12575c6cea802f894df6ca8b04c1b3656496592..16b0fea8ae1a581d568dbee2efa2932aa4e6fcce:/lib/client-stubs.c

diff --git a/lib/client-stubs.c b/lib/client-stubs.c
index 310505a..1d2d0aa 100644
--- a/lib/client-stubs.c
+++ b/lib/client-stubs.c
@@ -20,6 +20,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+/** @file lib/client-stubs.c
+ * @brief Generated client API implementation
+ */
 
 int disorder_adopt(disorder_client *c, const char *id) {
   return disorder_simple(c, NULL, "adopt", id, (char *)NULL);
@@ -39,32 +42,24 @@ int disorder_allfiles(disorder_client *c, const char *dir, const char *re, char
 }
 
 int disorder_confirm(disorder_client *c, const char *confirmation) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "confirm", confirmation, (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 1, "confirm", confirmation, (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 1) {
-    disorder_error(0, "malformed reply to %s", "confirm");
-    return -1;
-  }
   c->user = v[0];
+  v[0] = NULL;
+  free_strings(nv, v);
   return 0;
 }
 
 int disorder_cookie(disorder_client *c, const char *cookie) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "cookie", cookie, (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 1, "cookie", cookie, (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 1) {
-    disorder_error(0, "malformed reply to %s", "cookie");
-    return -1;
-  }
   c->user = v[0];
+  v[0] = NULL;
+  free_strings(nv, v);
   return 0;
 }
 
@@ -94,34 +89,24 @@ int disorder_enable(disorder_client *c) {
 }
 
 int disorder_enabled(disorder_client *c, int *enabledp) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "enabled", (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 1, "enabled", (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 1) {
-    disorder_error(0, "malformed reply to %s", "enabled");
-    return -1;
-  }
   if(boolean("enabled", v[0], enabledp))
     return -1;
+  free_strings(nv, v);
   return 0;
 }
 
 int disorder_exists(disorder_client *c, const char *track, int *existsp) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "exists", track, (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 1, "exists", track, (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 1) {
-    disorder_error(0, "malformed reply to %s", "exists");
-    return -1;
-  }
   if(boolean("exists", v[0], existsp))
     return -1;
+  free_strings(nv, v);
   return 0;
 }
 
@@ -135,79 +120,58 @@ int disorder_files(disorder_client *c, const char *dir, const char *re, char ***
 }
 
 int disorder_get(disorder_client *c, const char *track, const char *pref, char **valuep) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "get", track, pref, (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 1, "get", track, pref, (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 1) {
-    disorder_error(0, "malformed reply to %s", "get");
-    return -1;
-  }
   *valuep = v[0];
+  v[0] = NULL;
+  free_strings(nv, v);
   return 0;
 }
 
 int disorder_get_global(disorder_client *c, const char *pref, char **valuep) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "get-global", pref, (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 1, "get-global", pref, (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 1) {
-    disorder_error(0, "malformed reply to %s", "get-global");
-    return -1;
-  }
   *valuep = v[0];
+  v[0] = NULL;
+  free_strings(nv, v);
   return 0;
 }
 
 int disorder_length(disorder_client *c, const char *track, long *lengthp) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "length", track, (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 1, "length", track, (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 1) {
-    disorder_error(0, "malformed reply to %s", "length");
-    return -1;
-  }
   *lengthp = atol(v[0]);
+  free_strings(nv, v);
   return 0;
 }
 
 int disorder_make_cookie(disorder_client *c, char **cookiep) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "make-cookie", (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 1, "make-cookie", (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 1) {
-    disorder_error(0, "malformed reply to %s", "make-cookie");
-    return -1;
-  }
   *cookiep = v[0];
+  v[0] = NULL;
+  free_strings(nv, v);
   return 0;
 }
 
 int disorder_move(disorder_client *c, const char *track, long delta) {
-  char buf_delta[16];
-  byte_snprintf(buf_delta, sizeof buf_delta, "%ld", delta);
-  return disorder_simple(c, NULL, "move", track, buf_delta, (char *)NULL);
+  return disorder_simple(c, NULL, "move", track, disorder__integer, delta, (char *)NULL);
 }
 
 int disorder_moveafter(disorder_client *c, const char *target, char **ids, int nids) {
-  return disorder_simple(c, NULL, "moveafter", target, disorder_list, ids, nids, (char *)NULL);
+  return disorder_simple(c, NULL, "moveafter", target, disorder__list, ids, nids, (char *)NULL);
 }
 
 int disorder_new_tracks(disorder_client *c, long max, char ***tracksp, int *ntracksp) {
-  char buf_max[16];
-  byte_snprintf(buf_max, sizeof buf_max, "%ld", max);
-  int rc = disorder_simple(c, NULL, "new", buf_max, (char *)NULL);
+  int rc = disorder_simple(c, NULL, "new", disorder__integer, max, (char *)NULL);
   if(rc)
     return rc;
   if(readlist(c, tracksp, ntracksp))
@@ -220,17 +184,13 @@ int disorder_nop(disorder_client *c) {
 }
 
 int disorder_part(disorder_client *c, const char *track, const char *context, const char *part, char **partp) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "part", track, context, part, (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 1, "part", track, context, part, (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 1) {
-    disorder_error(0, "malformed reply to %s", "part");
-    return -1;
-  }
   *partp = v[0];
+  v[0] = NULL;
+  free_strings(nv, v);
   return 0;
 }
 
@@ -243,7 +203,7 @@ int disorder_play(disorder_client *c, const char *track, char **idp) {
 }
 
 int disorder_playafter(disorder_client *c, const char *target, char **tracks, int ntracks) {
-  return disorder_simple(c, NULL, "playafter", target, disorder_list, tracks, ntracks, (char *)NULL);
+  return disorder_simple(c, NULL, "playafter", target, disorder__list, tracks, ntracks, (char *)NULL);
 }
 
 int disorder_playing(disorder_client *c, struct queue_entry **playingp) {
@@ -272,7 +232,7 @@ int disorder_playlist_lock(disorder_client *c, const char *playlist) {
 }
 
 int disorder_playlist_set(disorder_client *c, const char *playlist, char **tracks, int ntracks) {
-  return disorder_simple(c, NULL, "playlist-set", playlist, disorder_body, tracks, ntracks, (char *)NULL);
+  return disorder_simple(c, NULL, "playlist-set", playlist, disorder__body, tracks, ntracks, (char *)NULL);
 }
 
 int disorder_playlist_set_share(disorder_client *c, const char *playlist, const char *share) {
@@ -314,18 +274,13 @@ int disorder_random_enable(disorder_client *c) {
 }
 
 int disorder_random_enabled(disorder_client *c, int *enabledp) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "random-enabled", (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 1, "random-enabled", (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 1) {
-    disorder_error(0, "malformed reply to %s", "random-enabled");
-    return -1;
-  }
   if(boolean("random-enabled", v[0], enabledp))
     return -1;
+  free_strings(nv, v);
   return 0;
 }
 
@@ -343,17 +298,13 @@ int disorder_reconfigure(disorder_client *c) {
 }
 
 int disorder_register(disorder_client *c, const char *username, const char *password, const char *email, char **confirmationp) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "register", username, password, email, (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 1, "register", username, password, email, (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 1) {
-    disorder_error(0, "malformed reply to %s", "register");
-    return -1;
-  }
   *confirmationp = v[0];
+  v[0] = NULL;
+  free_strings(nv, v);
   return 0;
 }
 
@@ -370,17 +321,13 @@ int disorder_rescan(disorder_client *c) {
 }
 
 int disorder_resolve(disorder_client *c, const char *track, char **resolvedp) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "resolve", track, (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 1, "resolve", track, (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 1) {
-    disorder_error(0, "malformed reply to %s", "resolve");
-    return -1;
-  }
   *resolvedp = v[0];
+  v[0] = NULL;
+  free_strings(nv, v);
   return 0;
 }
 
@@ -393,25 +340,42 @@ int disorder_revoke(disorder_client *c) {
 }
 
 int disorder_rtp_address(disorder_client *c, char **addressp, char **portp) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "rtp-address", (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 2, "rtp-address", (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 2) {
-    disorder_error(0, "malformed reply to %s", "rtp-address");
-    return -1;
-  }
   *addressp = v[0];
+  v[0] = NULL;
   *portp = v[1];
+  v[1] = NULL;
+  free_strings(nv, v);
   return 0;
 }
 
+int disorder_rtp_cancel(disorder_client *c) {
+  return disorder_simple(c, NULL, "rtp-cancel", (char *)NULL);
+}
+
+int disorder_rtp_request(disorder_client *c, const char *address, const char *port) {
+  return disorder_simple(c, NULL, "rtp-request", address, port, (char *)NULL);
+}
+
 int disorder_scratch(disorder_client *c, const char *id) {
   return disorder_simple(c, NULL, "scratch", id, (char *)NULL);
 }
 
+int disorder_schedule_add_play(disorder_client *c, time_t when, const char *priority, const char *track) {
+  return disorder_simple(c, NULL, "schedule-add", disorder__time, when, priority, "play", track, (char *)NULL);
+}
+
+int disorder_schedule_add_set_global(disorder_client *c, time_t when, const char *priority, const char *pref, const char *value) {
+  return disorder_simple(c, NULL, "schedule-add", disorder__time, when, priority, "set-global", pref, value, (char *)NULL);
+}
+
+int disorder_schedule_add_unset_global(disorder_client *c, time_t when, const char *priority, const char *pref) {
+  return disorder_simple(c, NULL, "schedule-add", disorder__time, when, priority, "set-global", pref, (char *)NULL);
+}
+
 int disorder_schedule_del(disorder_client *c, const char *event) {
   return disorder_simple(c, NULL, "schedule-del", event, (char *)NULL);
 }
@@ -477,17 +441,13 @@ int disorder_unset_global(disorder_client *c, const char *pref) {
 }
 
 int disorder_userinfo(disorder_client *c, const char *username, const char *property, char **valuep) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "userinfo", username, property, (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 1, "userinfo", username, property, (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 1) {
-    disorder_error(0, "malformed reply to %s", "userinfo");
-    return -1;
-  }
   *valuep = v[0];
+  v[0] = NULL;
+  free_strings(nv, v);
   return 0;
 }
 
@@ -501,41 +461,28 @@ int disorder_users(disorder_client *c, char ***usersp, int *nusersp) {
 }
 
 int disorder_version(disorder_client *c, char **versionp) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "version", (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 1, "version", (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 1) {
-    disorder_error(0, "malformed reply to %s", "version");
-    return -1;
-  }
   *versionp = v[0];
+  v[0] = NULL;
+  free_strings(nv, v);
   return 0;
 }
 
 int disorder_set_volume(disorder_client *c, long left, long right) {
-  char buf_left[16];
-  byte_snprintf(buf_left, sizeof buf_left, "%ld", left);
-  char buf_right[16];
-  byte_snprintf(buf_right, sizeof buf_right, "%ld", right);
-  return disorder_simple(c, NULL, "volume", buf_left, buf_right, (char *)NULL);
+  return disorder_simple(c, NULL, "volume", disorder__integer, left, disorder__integer, right, (char *)NULL);
 }
 
 int disorder_get_volume(disorder_client *c, long *leftp, long *rightp) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "volume", (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 2, "volume", (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 2) {
-    disorder_error(0, "malformed reply to %s", "volume");
-    return -1;
-  }
   *leftp = atol(v[0]);
   *rightp = atol(v[1]);
+  free_strings(nv, v);
   return 0;
 }