eclient integer callbacks now get errors instead of using generic

[disorder] / lib / eclient.h

diff --git a/lib/eclient.h b/lib/eclient.h
index 6fdb3869c35de665a835d1c19382799442085189..1b47dff9877efbe33a6b12bdd55da1e7ea8f153b 100644 (file)
--- a/lib/eclient.h
+++ b/lib/eclient.h
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2006 Richard Kettlewell
+ * Copyright (C) 2006, 2007 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
@@ -42,9 +42,13 @@ struct queue_entry;
  * These must all be valid.
  */
 typedef struct disorder_eclient_callbacks {
-  /** @brief Called when a communication error (e.g. connected refused) occurs.
+  /** @brief Called when a communication error occurs.
    * @param u from disorder_eclient_new()
    * @param msg error message
+   *
+   * This might be called at any time, and indicates a low-level error,
+   * e.g. connection refused by the server.  It does not mean that any requests
+   * made of the owning eclient will not be fulfilled at some point.
    */
   void (*comms_error)(void *u, const char *msg);
   
@@ -52,6 +56,11 @@ typedef struct disorder_eclient_callbacks {
    * @param u from disorder_eclient_new()
    * @param v from failed command, or NULL if during setup
    * @param msg error message
+   *
+   * This call is obsolete at least in its current form, in which it is used to
+   * report most errors from most requests.  Ultimately requests-specific
+   * errors will be reported in a request-specific way rather than via this
+   * generic callback.
    */
   void (*protocol_error)(void *u, void *v, int code, const char *msg);
 
@@ -96,6 +105,7 @@ typedef struct disorder_eclient_log_callbacks {
   void (*scratched)(void *v, const char *track, const char *user);
   void (*state)(void *v, unsigned long state);
   void (*volume)(void *v, int left, int right);
+  void (*rescanned)(void *v);
 } disorder_eclient_log_callbacks;
 
 /* State bits */
@@ -127,6 +137,8 @@ typedef struct disorder_eclient_log_callbacks {
  */
 #define DISORDER_CONNECTED        0x00000010
 
+char *disorder_eclient_interpret_state(unsigned long statebits);
+
 struct queue_entry;
 struct kvp;
 struct sink;
@@ -135,13 +147,40 @@ struct sink;
  * It is always allowed for these to be null pointers if you don't care about
  * the result. */
 
-typedef void disorder_eclient_no_response(void *v);
-/* completion callback with no data */
-
-typedef void disorder_eclient_string_response(void *v, const char *value);
-/* completion callback with a string result */
+/** @brief Trivial completion callback
+ * @param v User data
+ * @param error Error string or NULL on succes
+ */
+typedef void disorder_eclient_no_response(void *v,
+                                          const char *error);
 
-typedef void disorder_eclient_integer_response(void *v, long value);
+/** @brief String result completion callback
+ * @param v User data
+ * @param error 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
+ * (which might be NULL for disorder_eclient_get(),
+ * disorder_eclient_get_global() and disorder_eclient_userinfo()).
+ *
+ * @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 *value);
+
+/** @brief String result completion callback
+ * @param v User data
+ * @param error 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.
+ *
+ * @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,
+                                               long value);
 /* completion callback with a integer result */
 
 typedef void disorder_eclient_volume_response(void *v, int l, int r);
@@ -314,6 +353,40 @@ int disorder_eclient_nop(disorder_eclient *c,
                          disorder_eclient_no_response *completed,
                          void *v);
 
+int disorder_eclient_new_tracks(disorder_eclient *c,
+                                disorder_eclient_list_response *completed,
+                                int max,
+                                void *v);
+
+int disorder_eclient_rtp_address(disorder_eclient *c,
+                                 disorder_eclient_list_response *completed,
+                                 void *v);
+
+int disorder_eclient_users(disorder_eclient *c,
+                           disorder_eclient_list_response *completed,
+                           void *v);
+int disorder_eclient_deluser(disorder_eclient *c,
+                             disorder_eclient_no_response *completed,
+                             const char *user,
+                             void *v);
+int disorder_eclient_userinfo(disorder_eclient *c,
+                              disorder_eclient_string_response *completed,
+                              const char *user,
+                              const char *property,
+                              void *v);
+int disorder_eclient_edituser(disorder_eclient *c,
+                              disorder_eclient_no_response *completed,
+                              const char *user,
+                              const char *property,
+                              const char *value,
+                              void *v);
+int disorder_eclient_adduser(disorder_eclient *c,
+                             disorder_eclient_no_response *completed,
+                             const char *user,
+                             const char *password,
+                             const char *rights,
+                             void *v);
+
 #endif
 
 /*