* This file is part of DisOrder.
* Copyright (C) 2004-2008 Richard Kettlewell
*
- * This program is free software; you can redistribute it and/or modify
+ * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file lib/client.c
* @brief Simple C client
return (r[0] * 10 + r[1]) * 10 + r[2] - 111 * '0';
} else {
c->last = "invalid reply format";
- error(0, "invalid reply format from %s", c->ident);
+ disorder_error(0, "invalid reply format from %s", c->ident);
return -1;
}
}
return 0;
} else {
if(c->verbose)
- error(0, "from %s: %s", c->ident, utf82mb(r));
+ disorder_error(0, "from %s: %s", c->ident, utf82mb(r));
return rc;
}
}
if(!c->fpout) {
c->last = "not connected";
- error(0, "not connected to server");
+ disorder_error(0, "not connected to server");
return -1;
}
if(cmd) {
return check_response(c, rp);
write_error:
byte_xasprintf((char **)&c->last, "write error: %s", strerror(errno));
- error(errno, "error writing to %s", c->ident);
+ disorder_error(errno, "error writing to %s", c->ident);
return -1;
}
*rp = *rr;
return 0;
}
- error(0, "invalid reply: %s", *rp);
+ disorder_error(0, "invalid reply: %s", *rp);
}
return rc;
}
c->fpin = c->fpout = 0;
if((fd = socket(sa->sa_family, SOCK_STREAM, 0)) < 0) {
byte_xasprintf((char **)&c->last, "socket: %s", strerror(errno));
- error(errno, "error calling socket");
+ disorder_error(errno, "error calling socket");
return -1;
}
if(connect(fd, sa, salen) < 0) {
byte_xasprintf((char **)&c->last, "connect: %s", strerror(errno));
- error(errno, "error calling connect");
+ disorder_error(errno, "error calling connect");
goto error;
}
if((fd2 = dup(fd)) < 0) {
byte_xasprintf((char **)&c->last, "dup: %s", strerror(errno));
- error(errno, "error calling dup");
+ disorder_error(errno, "error calling dup");
goto error;
}
if(!(c->fpin = fdopen(fd, "rb"))) {
byte_xasprintf((char **)&c->last, "fdopen: %s", strerror(errno));
- error(errno, "error calling fdopen");
+ disorder_error(errno, "error calling fdopen");
goto error;
}
fd = -1;
if(!(c->fpout = fdopen(fd2, "wb"))) {
byte_xasprintf((char **)&c->last, "fdopen: %s", strerror(errno));
- error(errno, "error calling fdopen");
+ disorder_error(errno, "error calling fdopen");
goto error;
}
fd2 = -1;
goto error;
if(nrvec != 3) {
c->last = "cannot parse server greeting";
- error(0, "cannot parse server greeting %s", r);
+ disorder_error(0, "cannot parse server greeting %s", r);
goto error;
}
protocol = *rvec++;
if(strcmp(protocol, "2")) {
c->last = "unknown protocol version";
- error(0, "unknown protocol version: %s", protocol);
+ disorder_error(0, "unknown protocol version: %s", protocol);
goto error;
}
algorithm = *rvec++;
return 0; /* success */
if(!username) {
c->last = "cookie failed and no username";
- error(0, "cookie did not work and no username available");
+ disorder_error(0, "cookie did not work and no username available");
goto error;
}
}
if(!(username = config->username)) {
c->last = "no username";
- error(0, "no username configured");
+ disorder_error(0, "no username configured");
return -1;
}
password = config->password;
if(!password) {
/* Oh well */
c->last = "no password";
- error(0, "no password configured");
+ disorder_error(0, "no password configured for user '%s'", username);
return -1;
}
return disorder_connect_generic(config,
if(c->fpin) {
if(fclose(c->fpin) < 0) {
byte_xasprintf((char **)&c->last, "fclose: %s", strerror(errno));
- error(errno, "error calling fclose");
+ disorder_error(errno, "error calling fclose");
ret = -1;
}
c->fpin = 0;
if(c->fpout) {
if(fclose(c->fpout) < 0) {
byte_xasprintf((char **)&c->last, "fclose: %s", strerror(errno));
- error(errno, "error calling fclose");
+ disorder_error(errno, "error calling fclose");
ret = -1;
}
c->fpout = 0;
}
c->ident = 0;
c->user = 0;
- return 0;
+ return ret;
}
/** @brief Play a track
static void client_error(const char *msg,
void attribute((unused)) *u) {
- error(0, "error parsing reply: %s", msg);
+ disorder_error(0, "error parsing reply: %s", msg);
}
/** @brief Get currently playing track
}
if(ferror(c->fpin)) {
byte_xasprintf((char **)&c->last, "input error: %s", strerror(errno));
- error(errno, "error reading %s", c->ident);
+ disorder_error(errno, "error reading %s", c->ident);
} else {
c->last = "input error: unexpxected EOF";
- error(0, "error reading %s: unexpected EOF", c->ident);
+ disorder_error(0, "error reading %s: unexpected EOF", c->ident);
}
return -1;
}
}
if(ferror(c->fpin)) {
byte_xasprintf((char **)&c->last, "input error: %s", strerror(errno));
- error(errno, "error reading %s", c->ident);
+ disorder_error(errno, "error reading %s", c->ident);
} else {
c->last = "input error: unexpxected EOF";
- error(0, "error reading %s: unexpected EOF", c->ident);
+ disorder_error(0, "error reading %s: unexpected EOF", c->ident);
}
return -1;
}
static void pref_error_handler(const char *msg,
void attribute((unused)) *u) {
- error(0, "error handling 'prefs' reply: %s", msg);
+ disorder_error(0, "error handling 'prefs' reply: %s", msg);
}
/** @brief Get all preferences for a trcak
if(!strcmp(value, "yes")) *flagp = 1;
else if(!strcmp(value, "no")) *flagp = 0;
else {
- error(0, "malformed response to '%s'", cmd);
+ disorder_error(0, "malformed response to '%s'", cmd);
return -1;
}
return 0;
return rc;
if(sscanf(r, "%d %d", left, right) != 2) {
c->last = "malformed volume response";
- error(0, "error parsing response to 'volume': '%s'", r);
+ disorder_error(0, "error parsing response to 'volume': '%s'", r);
return -1;
}
return 0;
vec = split(r, &n, SPLIT_QUOTES, 0, 0);
if(n != 2) {
c->last = "malformed RTP address";
- error(0, "malformed rtp-address reply");
+ disorder_error(0, "malformed rtp-address reply");
return -1;
}
*addressp = vec[0];
return rc;
while(*lines) {
if(!(bits = split(*lines++, &nbits, SPLIT_QUOTES, 0, 0))) {
- error(0, "invalid schedule-get reply: cannot split line");
+ disorder_error(0, "invalid schedule-get reply: cannot split line");
return -1;
}
if(nbits != 2) {
- error(0, "invalid schedule-get reply: wrong number of fields");
+ disorder_error(0, "invalid schedule-get reply: wrong number of fields");
return -1;
}
kvp_set(actiondatap, bits[0], bits[1]);
action, key, value,
(char *)0);
} else
- fatal(0, "unknown action '%s'", action);
+ disorder_fatal(0, "unknown action '%s'", action);
va_end(ap);
return rc;
}
+/** @brief Adopt a track
+ * @param c Client
+ * @param id Track ID to adopt
+ * @return 0 on success, non-0 on error
+ */
+int disorder_adopt(disorder_client *c, const char *id) {
+ return disorder_simple(c, 0, "adopt", id, (char *)0);
+}
+
/** @brief Delete a playlist
* @param c Client
* @param playlist Playlist to delete
~mdw / disorder / blobdiff