X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/dab87ecc3bd6deafe058f7785093fd1c0b702eb5..16b0fea8ae1a581d568dbee2efa2932aa4e6fcce:/lib/client-stubs.c diff --git a/lib/client-stubs.c b/lib/client-stubs.c index b6bc8e2..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 . */ +/** @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); @@ -44,6 +47,8 @@ int disorder_confirm(disorder_client *c, const char *confirmation) { if(rc) return rc; c->user = v[0]; + v[0] = NULL; + free_strings(nv, v); return 0; } @@ -53,6 +58,8 @@ int disorder_cookie(disorder_client *c, const char *cookie) { if(rc) return rc; c->user = v[0]; + v[0] = NULL; + free_strings(nv, v); return 0; } @@ -88,6 +95,7 @@ int disorder_enabled(disorder_client *c, int *enabledp) { return rc; if(boolean("enabled", v[0], enabledp)) return -1; + free_strings(nv, v); return 0; } @@ -98,6 +106,7 @@ int disorder_exists(disorder_client *c, const char *track, int *existsp) { return rc; if(boolean("exists", v[0], existsp)) return -1; + free_strings(nv, v); return 0; } @@ -116,6 +125,8 @@ int disorder_get(disorder_client *c, const char *track, const char *pref, char * if(rc) return rc; *valuep = v[0]; + v[0] = NULL; + free_strings(nv, v); return 0; } @@ -125,6 +136,8 @@ int disorder_get_global(disorder_client *c, const char *pref, char **valuep) { if(rc) return rc; *valuep = v[0]; + v[0] = NULL; + free_strings(nv, v); return 0; } @@ -134,6 +147,7 @@ int disorder_length(disorder_client *c, const char *track, long *lengthp) { if(rc) return rc; *lengthp = atol(v[0]); + free_strings(nv, v); return 0; } @@ -143,23 +157,21 @@ int disorder_make_cookie(disorder_client *c, char **cookiep) { if(rc) return rc; *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)) @@ -177,6 +189,8 @@ int disorder_part(disorder_client *c, const char *track, const char *context, co if(rc) return rc; *partp = v[0]; + v[0] = NULL; + free_strings(nv, v); return 0; } @@ -189,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) { @@ -218,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) { @@ -266,6 +280,7 @@ int disorder_random_enabled(disorder_client *c, int *enabledp) { return rc; if(boolean("random-enabled", v[0], enabledp)) return -1; + free_strings(nv, v); return 0; } @@ -288,6 +303,8 @@ int disorder_register(disorder_client *c, const char *username, const char *pass if(rc) return rc; *confirmationp = v[0]; + v[0] = NULL; + free_strings(nv, v); return 0; } @@ -309,6 +326,8 @@ int disorder_resolve(disorder_client *c, const char *track, char **resolvedp) { if(rc) return rc; *resolvedp = v[0]; + v[0] = NULL; + free_strings(nv, v); return 0; } @@ -326,30 +345,35 @@ int disorder_rtp_address(disorder_client *c, char **addressp, char **portp) { if(rc) return rc; *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) { - char buf_when[16]; - byte_snprintf(buf_when, sizeof buf_when, "%lld", (long long)when); - return disorder_simple(c, NULL, "schedule-add", buf_when, priority, "play", track, (char *)NULL); + 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) { - char buf_when[16]; - byte_snprintf(buf_when, sizeof buf_when, "%lld", (long long)when); - return disorder_simple(c, NULL, "schedule-add", buf_when, priority, "set-global", pref, value, (char *)NULL); + 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) { - char buf_when[16]; - byte_snprintf(buf_when, sizeof buf_when, "%lld", (long long)when); - return disorder_simple(c, NULL, "schedule-add", buf_when, priority, "set-global", pref, (char *)NULL); + 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) { @@ -422,6 +446,8 @@ int disorder_userinfo(disorder_client *c, const char *username, const char *prop if(rc) return rc; *valuep = v[0]; + v[0] = NULL; + free_strings(nv, v); return 0; } @@ -440,15 +466,13 @@ int disorder_version(disorder_client *c, char **versionp) { if(rc) return rc; *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) { @@ -458,6 +482,7 @@ int disorder_get_volume(disorder_client *c, long *leftp, long *rightp) { return rc; *leftp = atol(v[0]); *rightp = atol(v[1]); + free_strings(nv, v); return 0; }