X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/0eaf64e8d26c08228401fa89741c63fc2ff064c3..4265e5d362914f3732b4035dcf67162e525e0142:/lib/eclient.h diff --git a/lib/eclient.h b/lib/eclient.h index be5730c..ce5c582 100644 --- a/lib/eclient.h +++ b/lib/eclient.h @@ -2,20 +2,18 @@ * This file is part of DisOrder. * Copyright (C) 2006, 2007 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 . */ /** @file lib/eclient.h * @brief Client code for event-driven programs @@ -127,7 +125,7 @@ typedef struct disorder_eclient_log_callbacks { /** @brief Called when @p id is removed from the recent list */ void (*recent_removed)(void *v, const char *id); - /** @brief Called when @id is removed from the queue + /** @brief Called when @p id is removed from the queue * * @p user might be 0. */ @@ -167,6 +165,9 @@ typedef struct disorder_eclient_log_callbacks { /** @brief Called when your rights change */ void (*rights_changed)(void *v, rights_type new_rights); + + /** @brief Called when a track is adopted */ + void (*adopted)(void *v, const char *id, const char *who); } disorder_eclient_log_callbacks; /* State bits */ @@ -209,14 +210,14 @@ struct sink; /** @brief Trivial completion callback * @param v User data - * @param error Error string or NULL on succes + * @param err Error string or NULL on succes */ typedef void disorder_eclient_no_response(void *v, - const char *error); + const char *err); /** @brief String result completion callback * @param v User data - * @param error Error string or NULL on succes + * @param err Error string or NULL on succes * @param value Result or NULL * * @p error will be NULL on success. In this case @p value will be the result @@ -226,12 +227,12 @@ typedef void disorder_eclient_no_response(void *v, * @p error will be non-NULL on failure. In this case @p value is always NULL. */ typedef void disorder_eclient_string_response(void *v, - const char *error, + const char *err, const char *value); /** @brief String result completion callback * @param v User data - * @param error Error string or NULL on succes + * @param err Error string or NULL on succes * @param value Result or 0 * * @p error will be NULL on success. In this case @p value will be the result. @@ -239,11 +240,11 @@ typedef void disorder_eclient_string_response(void *v, * @p error will be non-NULL on failure. In this case @p value is always 0. */ typedef void disorder_eclient_integer_response(void *v, - const char *error, + const char *err, long value); /** @brief Volume completion callback * @param v User data - * @param error Error string or NULL on success + * @param err Error string or NULL on success * @param l Left channel volume * @param r Right channel volume * @@ -254,12 +255,12 @@ typedef void disorder_eclient_integer_response(void *v, * 0. */ typedef void disorder_eclient_volume_response(void *v, - const char *error, + const char *err, int l, int r); /** @brief Queue request completion callback * @param v User data - * @param error Error string or NULL on success + * @param err Error string or NULL on success * @param q Head of queue data list * * @p error will be NULL on success. In this case @p q will be the (head of @@ -270,12 +271,12 @@ typedef void disorder_eclient_volume_response(void *v, * be ignored in the error case. */ typedef void disorder_eclient_queue_response(void *v, - const char *error, + const char *err, struct queue_entry *q); /** @brief List request completion callback * @param v User data - * @param error Error string or NULL on success + * @param err Error string or NULL on success * @param nvec Number of elements in response list * @param vec Pointer to response list * @@ -286,7 +287,7 @@ typedef void disorder_eclient_queue_response(void *v, * be 0 and NULL. */ typedef void disorder_eclient_list_response(void *v, - const char *error, + const char *err, int nvec, char **vec); disorder_eclient *disorder_eclient_new(const disorder_eclient_callbacks *cb, @@ -483,7 +484,12 @@ int disorder_eclient_adduser(disorder_eclient *c, const char *password, const char *rights, void *v); - +void disorder_eclient_enable_connect(disorder_eclient *c); +void disorder_eclient_disable_connect(disorder_eclient *c); +int disorder_eclient_adopt(disorder_eclient *c, + disorder_eclient_no_response *completed, + const char *id, + void *v); #endif /*