#include "mem.h"
#include "configuration.h"
#include "queue.h"
+#include "server-queue.h"
+#include "rights.h"
#include "trackdb.h"
#include "play.h"
#include "plugin.h"
D(("SM_FINISHED %s", sm.id));
finished(ev);
break;
+ case SM_UNKNOWN:
+ /* we asked for an unknown track to be cancelled */
+ if(playing && !strcmp(sm.id, playing->id))
+ finished(ev);
+ break;
case SM_PLAYING:
/* track ID is playing, DATA seconds played */
D(("SM_PLAYING %s %ld", sm.id, sm.data));
}
void speaker_setup(ev_source *ev) {
- int sp[2], lfd;
+ int sp[2];
pid_t pid;
+ struct speaker_message sm;
if(socketpair(PF_UNIX, SOCK_DGRAM, 0, sp) < 0)
fatal(errno, "error calling socketpair");
- if(!isatty(2))
- lfd = logfd(ev, SPEAKER);
- else
- lfd = -1;
if(!(pid = xfork())) {
exitfn = _exit;
ev_signal_atfork(ev);
xdup2(sp[0], 1);
xclose(sp[0]);
xclose(sp[1]);
- if(lfd != -1) {
- xdup2(lfd, 2);
- xclose(lfd);
- }
signal(SIGPIPE, SIG_DFL);
#if 0
execlp("valgrind", "valgrind", SPEAKER, "--config", configfile,
- debugging ? "--debug" : "--no-debug", (char *)0);
+ debugging ? "--debug" : "--no-debug",
+ log_default == &log_syslog ? "--syslog" : "--no-syslog",
+ (char *)0);
#else
execlp(SPEAKER, SPEAKER, "--config", configfile,
- debugging ? "--debug" : "--no-debug", (char *)0);
+ debugging ? "--debug" : "--no-debug",
+ log_default == &log_syslog ? "--syslog" : "--no-syslog",
+ (char *)0);
#endif
fatal(errno, "error invoking %s", SPEAKER);
}
speaker_fd = sp[1];
xclose(sp[0]);
cloexec(speaker_fd);
- /* Don't need to make speaker_fd nonblocking because speaker_recv() uses
- * MSG_DONTWAIT. */
- ev_fd(ev, ev_read, speaker_fd, speaker_readable, 0);
+ /* Wait for the speaker to be ready */
+ speaker_recv(speaker_fd, &sm);
+ nonblock(speaker_fd);
+ ev_fd(ev, ev_read, speaker_fd, speaker_readable, 0, "speaker read");
}
void speaker_reload(void) {
}
/* Return values from start() */
-#define START_OK 0 /* Succeeded. */
-#define START_HARDFAIL 1 /* Track is broken. */
-#define START_SOFTFAIL 2 /* Track OK, system (temporarily?) broken */
+#define START_OK 0 /**< @brief Succeeded. */
+#define START_HARDFAIL 1 /**< @brief Track is broken. */
+#define START_SOFTFAIL 2 /**< @brief Track OK, system (temporarily?) broken */
/** @brief Play or prepare @p q
* @param ev Event loop
* @param q Track to play/prepare
* @param prepare_only If true, only prepares track
- * @return @ref START_OK, @ref START_HARDFAIL or @ref START_SOFTFTAIL
+ * @return @ref START_OK, @ref START_HARDFAIL or @ref START_SOFTFAIL
*/
static int start(ev_source *ev,
struct queue_entry *q,
memset(&sm, 0, sizeof sm);
D(("start %s %d", q->id, prepare_only));
- if(find_player_pid(q->id) > 0) {
- if(prepare_only) return START_OK;
- /* We have already prepared this track so we just need to tell the speaker
- * process to start actually playing the queued up audio data */
- strcpy(sm.id, q->id);
- sm.type = SM_PLAY;
- speaker_send(speaker_fd, &sm);
- D(("sent SM_PLAY for %s", sm.id));
+ if(q->prepared) {
+ /* The track is alraedy prepared */
+ if(!prepare_only) {
+ /* We want to run it, since it's prepared the answer is to tell the
+ * speaker to set it off */
+ strcpy(sm.id, q->id);
+ sm.type = SM_PLAY;
+ speaker_send(speaker_fd, &sm);
+ D(("sent SM_PLAY for %s", sm.id));
+ }
return START_OK;
}
/* Find the player plugin. */
}
/* Use the second arg as the tag if available (it's probably a command name),
* otherwise the module name. */
- lfd = logfd(ev, (config->player.s[n].s[2]
- ? config->player.s[n].s[2] : config->player.s[n].s[1]));
+ if(!isatty(2))
+ lfd = logfd(ev, (config->player.s[n].s[2]
+ ? config->player.s[n].s[2] : config->player.s[n].s[1]));
+ else
+ lfd = -1;
optc = config->player.s[n].n - 2;
optv = (void *)&config->player.s[n].s[2];
while(optc > 0 && optv[0][0] == '-') {
exitfn = _exit;
ev_signal_atfork(ev);
signal(SIGPIPE, SIG_DFL);
- xdup2(lfd, 1);
- xdup2(lfd, 2);
- xclose(lfd); /* tidy up */
+ if(lfd != -1) {
+ xdup2(lfd, 1);
+ xdup2(lfd, 2);
+ xclose(lfd); /* tidy up */
+ }
setpgid(0, 0);
if((q->type & DISORDER_PLAYER_TYPEMASK) == DISORDER_PLAYER_RAW) {
/* "Raw" format players always have their output send down a pipe
fatal(errno, "error calling socketpair");
xshutdown(np[0], SHUT_WR); /* normalize reads from np[0] */
xshutdown(np[1], SHUT_RD); /* decoder writes to np[1] */
+ blocking(np[0]);
+ blocking(np[1]);
/* Start disorder-normalize */
if(!(npid = xfork())) {
if(!xfork()) {
memset(&addr, 0, sizeof addr);
addr.sun_family = AF_UNIX;
snprintf(addr.sun_path, sizeof addr.sun_path,
- "%s/speaker", config->home);
+ "%s/speaker/socket", config->home);
sfd = xsocket(PF_UNIX, SOCK_STREAM, 0);
- if(connect(sfd, &addr, sizeof addr) < 0)
+ if(connect(sfd, (const struct sockaddr *)&addr, sizeof addr) < 0)
fatal(errno, "connecting to %s", addr.sun_path);
l = strlen(q->id);
if(write(sfd, &l, sizeof l) < 0
speaker_send(speaker_fd, &sm);
D(("sent SM_PLAY for %s", sm.id));
}
- execlp("disorder-normalize", "disorder-normalize", (char *)0);
+ /* TODO stderr shouldn't be redirected for disorder-normalize
+ * (but it should be for play_track() */
+ execlp("disorder-normalize", "disorder-normalize",
+ log_default == &log_syslog ? "--syslog" : "--no-syslog",
+ "--config", configfile,
+ (char *)0);
fatal(errno, "executing disorder-normalize");
/* end of the innermost fork */
}
error(errno, "error calling fork");
if(q->type & DISORDER_PLAYER_PREFORK)
play_cleanup(q->pl, q->data); /* else would leak */
- xclose(lfd);
+ if(lfd != -1)
+ xclose(lfd);
return START_SOFTFAIL;
}
store_player_pid(q->id, pid);
- xclose(lfd);
+ q->prepared = 1;
+ if(lfd != -1)
+ xclose(lfd);
setpgid(pid, pid);
ev_child(ev, pid, 0, player_finished, q);
D(("player subprocess ID %lu", (unsigned long)pid));
~mdw / disorder / blobdiff