Fix type of shift in disorder-choose.

[disorder] / server / disorder-cgi.h

diff --git a/server/disorder-cgi.h b/server/disorder-cgi.h
index b3aa4aaebb180f2834ff5364f24d759e58416b07..beb858148a3488d99fbdd3e58e7236623ba0febf 100644 (file)
--- a/server/disorder-cgi.h
+++ b/server/disorder-cgi.h
@@ -55,12 +55,28 @@
 #include "inputline.h"
 #include "split.h"
 #include "mime.h"
+#include "sendmail.h"
+#include "charset.h"
 
 extern disorder_client *dcgi_client;
 extern char *dcgi_cookie;
-extern char *dcgi_error_string;
+extern const char *dcgi_error_string;
+extern const char *dcgi_status_string;
 
-void dcgi_expand(const char *name);
+/** @brief Entry in a list of tracks or directories */
+struct dcgi_entry {
+  /** @brief Track name */
+  const char *track;
+  /** @brief Sort key */
+  const char *sort;
+  /** @brief Display key */
+  const char *display;
+};
+
+/** @brief Compare two @ref entry objects */
+int dcgi_compare_entry(const void *a, const void *b);
+
+void dcgi_expand(const char *name, int header);
 void dcgi_action(const char *action);
 void dcgi_error(const char *key);
 void dcgi_login(void);
@@ -81,10 +97,6 @@ char **option_columns(const char *name, int *ncolumns);
 #define DCGI_PLAYING 0x0002
 #define DCGI_RECENT 0x0004
 #define DCGI_VOLUME 0x0008
-#if 0
-#define DCGI_DIRS 0x0010
-#define DCGI_FILES 0x0020
-#endif
 #define DCGI_NEW 0x0040
 #define DCGI_RIGHTS 0x0080
 #define DCGI_ENABLED 0x0100