chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
play now returns the new track's ID, and disorder.play() returns it.
[disorder]
/
server
/
server.c
diff --git
a/server/server.c
b/server/server.c
index c8b4a622d0238e6d5d255d088209d86e28b1677d..413b43e875273a05a0d6602569ea0634e0eec78a 100644
(file)
--- a/
server/server.c
+++ b/
server/server.c
@@
-225,7
+225,7
@@
static int c_play(struct conn *c, char **vec,
* anything. */
if(q == qhead.next && playing)
prepare(c->ev, q);
* anything. */
if(q == qhead.next && playing)
prepare(c->ev, q);
- sink_
writes(ev_writer_sink(c->w), "250 queued\n"
);
+ sink_
printf(ev_writer_sink(c->w), "252 %s\n", q->id
);
/* If the queue was empty but we are for some reason paused then
* unpause. */
if(!playing) resume_playing(0);
/* If the queue was empty but we are for some reason paused then
* unpause. */
if(!playing) resume_playing(0);
@@
-580,7
+580,7
@@
static int c_get(struct conn *c,
if(vec[1][0] != '_' && (v = trackdb_get(vec[0], vec[1])))
sink_printf(ev_writer_sink(c->w), "252 %s\n", v);
else
if(vec[1][0] != '_' && (v = trackdb_get(vec[0], vec[1])))
sink_printf(ev_writer_sink(c->w), "252 %s\n", v);
else
- sink_writes(ev_writer_sink(c->w), "55
0
not found\n");
+ sink_writes(ev_writer_sink(c->w), "55
5
not found\n");
return 1;
}
return 1;
}
@@
-924,7
+924,7
@@
static int c_get_global(struct conn *c,
if(s)
sink_printf(ev_writer_sink(c->w), "252 %s\n", s);
else
if(s)
sink_printf(ev_writer_sink(c->w), "252 %s\n", s);
else
- sink_writes(ev_writer_sink(c->w), "55
0
not found\n");
+ sink_writes(ev_writer_sink(c->w), "55
5
not found\n");
return 1;
}
return 1;
}