Merge config aliasing bug fix.

[disorder] / lib / eclient.h

diff --git a/lib/eclient.h b/lib/eclient.h
index 57d202ae77614b30a549a9424cf8d2537746684d..ce5c582cb5a02fd3c4ecf8830b66738ad27f5576 100644 (file)
--- a/lib/eclient.h
+++ b/lib/eclient.h
@@ -125,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 @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.
    */
    *
    * @p user might be 0.
    */


@@ -165,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 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 */
 } disorder_eclient_log_callbacks;
 
 /* State bits */


@@ -483,7 +486,10 @@ int disorder_eclient_adduser(disorder_eclient *c,
                              void *v);
 void disorder_eclient_enable_connect(disorder_eclient *c);
 void disorder_eclient_disable_connect(disorder_eclient *c);
                              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
 
 /*
 #endif
 
 /*