chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More comments.
[disorder]
/
server
/
schedule.c
diff --git
a/server/schedule.c
b/server/schedule.c
index 2e5887d24ccc808a4235c79ca9b59f45a997c83b..ec7eddce118d49b901055994372be1b13035f23a 100644
(file)
--- a/
server/schedule.c
+++ b/
server/schedule.c
@@
-95,6
+95,9
@@
static const char *const schedule_required[] = {"when", "who", "action"};
/** @brief Parse a scheduled event key and data
* @param k Pointer to key
/** @brief Parse a scheduled event key and data
* @param k Pointer to key
+ * @param d Pointer to data
+ * @param idp Where to store event ID
+ * @param actiondatap Where to store parsed data
* @param whenp Where to store timestamp
* @return 0 on success, non-0 on error
*
* @param whenp Where to store timestamp
* @return 0 on success, non-0 on error
*
@@
-225,8
+228,9
@@
void schedule_init(ev_source *ev) {
/******************************************************************************/
/** @brief Create a scheduled event
/******************************************************************************/
/** @brief Create a scheduled event
- * @param
ev Event loop
+ * @param
id Event ID
* @param actiondata Action data
* @param actiondata Action data
+ * @param tid Containing transaction
*/
static int schedule_add_tid(const char *id,
struct kvp *actiondata,
*/
static int schedule_add_tid(const char *id,
struct kvp *actiondata,
@@
-370,7
+374,7
@@
static void schedule_play(ev_source *ev,
return;
}
info("scheduled event %s: %s play %s", id, who, track);
return;
}
info("scheduled event %s: %s play %s", id, who, track);
- q = queue_add(track, who, WHERE_START);
+ q = queue_add(track, who, WHERE_START
, origin_scheduled
);
queue_write();
if(q == qhead.next && playing)
prepare(ev, q);
queue_write();
if(q == qhead.next && playing)
prepare(ev, q);
@@
-416,6
+420,7
@@
static struct {
};
/** @brief Look up a scheduled event
};
/** @brief Look up a scheduled event
+ * @param id Event ID
* @param actiondata Event description
* @return index in schedule_actions[] on success, -1 on error
*
* @param actiondata Event description
* @return index in schedule_actions[] on success, -1 on error
*