X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/a2c4ad5fad89f91d11811288c7781fb75712b9a3..6d9dd8d922285bb78f6d5a77e428eedb8c1a5b3b:/server/lookup.c

diff --git a/server/lookup.c b/server/lookup.c
index 452cd53..6dc254c 100644
--- a/server/lookup.c
+++ b/server/lookup.c
@@ -57,9 +57,6 @@ static void queuemap_add(struct queue_entry *q) {
 void dcgi_lookup(unsigned want) {
   unsigned need = want ^ (flags & want);
   struct queue_entry *r, *rnext;
-#if 0
-  const char *dir, *re;
-#endif
   char *rs;
 
   if(!dcgi_client || !need)
@@ -88,22 +85,6 @@ void dcgi_lookup(unsigned want) {
   if(need & DCGI_VOLUME)
     disorder_get_volume(dcgi_client,
                         &dcgi_volume_left, &dcgi_volume_right);
-#if 0
-  /* DCGI_FILES and DCGI_DIRS are looking obsolete now */
-  if(need & (DCGI_FILES|DCGI_DIRS)) {
-    if(!(dir = cgi_get("directory")))
-      dir = "";
-    re = cgi_get("regexp");
-    if(need & DCGI_DIRS)
-      if(disorder_directories(dcgi_client, dir, re,
-                              &dirs, &ndirs))
-        ndirs = 0;
-    if(need & DCGI_FILES)
-      if(disorder_files(dcgi_client, dir, re,
-                        &files, &nfiles))
-        nfiles = 0;
-  }
-#endif
   if(need & DCGI_RIGHTS) {
     dcgi_rights = RIGHT_READ;	/* fail-safe */
     if(!disorder_userinfo(dcgi_client, disorder_user(dcgi_client),
@@ -119,19 +100,19 @@ void dcgi_lookup(unsigned want) {
 
 /** @brief Locate a track by ID */
 struct queue_entry *dcgi_findtrack(const char *id) {
-  struct queue_entry *q, **qq;
+  struct queue_entry **qq;
 
-  if(queuemap && (qq = hash_find(id)))
-    return *q;
+  if(queuemap && (qq = hash_find(queuemap, id)))
+    return *qq;
   dcgi_lookup(DCGI_PLAYING);
-  if(queuemap && (qq = hash_find(id)))
-    return *q;
+  if(queuemap && (qq = hash_find(queuemap, id)))
+    return *qq;
   dcgi_lookup(DCGI_QUEUE);
-  if(queuemap && (qq = hash_find(id)))
-    return *q;
+  if(queuemap && (qq = hash_find(queuemap, id)))
+    return *qq;
   dcgi_lookup(DCGI_RECENT);
-  if(queuemap && (qq = hash_find(id)))
-    return *q;
+  if(queuemap && (qq = hash_find(queuemap, id)))
+    return *qq;
   return NULL;
 }