lib/configuration.c, etc.: Replace `config_userconf()' by a variable.

[disorder] / server / queue-ops.c

diff --git a/server/queue-ops.c b/server/queue-ops.c
index f2b3457a6f23001d7fff10fc86a2a682d01037b7..2bfe589f75b6299943fe9abb2d8283c098868b02 100644 (file)
--- a/server/queue-ops.c
+++ b/server/queue-ops.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
 /*
  * This file is part of DisOrder.

- * Copyright (C) 2004-2008 Richard Kettlewell
+ * Copyright (C) 2004-2009 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
  *
  * 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


@@ -104,6 +104,8 @@ struct queue_entry *queue_add(const char *track, const char *submitter,
     }
     queue_insert_entry(afterme, q);
     break;
     }
     queue_insert_entry(afterme, q);
     break;

+  case WHERE_NOWHERE:
+    return q;

   }
   /* submitter will be a null pointer for a scratch */
   if(submitter)
   }
   /* submitter will be a null pointer for a scratch */
   if(submitter)


@@ -154,7 +156,7 @@ int queue_move(struct queue_entry *q, int delta, const char *who) {
   }
 
   if(moved) {
   }
 
   if(moved) {

-    info("user %s moved %s", who, q->id);
+    disorder_info("user %s moved %s", who, q->id);

     notify_queue_move(q->track, who);
     sprintf(buffer, "%d", moved);
     eventlog("moved", who, (char *)0);
     notify_queue_move(q->track, who);
     sprintf(buffer, "%d", moved);
     eventlog("moved", who, (char *)0);


@@ -182,7 +184,7 @@ void queue_moveafter(struct queue_entry *target,
     queue_insert_entry(target, q);
     target = q;
     /* Log the individual tracks */
     queue_insert_entry(target, q);
     target = q;
     /* Log the individual tracks */

-    info("user %s moved %s", who, q->id);
+    disorder_info("user %s moved %s", who, q->id);

     notify_queue_move(q->track, who);
   }
   /* Report that the queue changed to the event log */
     notify_queue_move(q->track, who);
   }
   /* Report that the queue changed to the event log */


@@ -191,7 +193,7 @@ void queue_moveafter(struct queue_entry *target,
 
 void queue_remove(struct queue_entry *which, const char *who) {
   if(who) {
 
 void queue_remove(struct queue_entry *which, const char *who) {
   if(who) {

-    info("user %s removed %s", who, which->id);
+    disorder_info("user %s removed %s", who, which->id);

     notify_queue_move(which->track, who);
   }
   eventlog("removed", which->id, who, (const char *)0);
     notify_queue_move(which->track, who);
   }
   eventlog("removed", which->id, who, (const char *)0);