/*
* This file is part of DisOrder.
- * Copyright (C) 2004-2009 Richard Kettlewell
+ * Copyright (C) 2004-2012 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
*/
#include "disorder-server.h"
-#include <ao/ao.h>
#define SPEAKER "disorder-speaker"
switch(sm.type) {
case SM_PAUSED:
/* track ID is paused, DATA seconds played */
- D(("SM_PAUSED %s %ld", sm.id, sm.data));
+ D(("SM_PAUSED %s %ld", sm.u.id, sm.data));
playing->sofar = sm.data;
break;
case SM_FINISHED: /* scratched the playing track */
case SM_STILLBORN: /* scratched too early */
case SM_UNKNOWN: /* scratched WAY too early */
- if(playing && !strcmp(sm.id, playing->id)) {
+ if(playing && !strcmp(sm.u.id, playing->id)) {
if((playing->state == playing_unplayed
|| playing->state == playing_started)
&& sm.type == SM_FINISHED)
break;
case SM_PLAYING:
/* track ID is playing, DATA seconds played */
- D(("SM_PLAYING %s %ld", sm.id, sm.data));
+ D(("SM_PLAYING %s %ld", sm.u.id, sm.data));
playing->sofar = sm.data;
break;
case SM_ARRIVED: {
/* track ID is now prepared */
struct queue_entry *q;
- for(q = qhead.next; q != &qhead && strcmp(q->id, sm.id); q = q->next)
+ for(q = qhead.next; q != &qhead && strcmp(q->id, sm.u.id); q = q->next)
;
if(q && q->preparing) {
q->preparing = 0;
q->state = playing_ok;
break;
}
- /* Regardless we always report and record the status and do cleanup for
- * prefork calls. */
- if(status)
- disorder_error(0, "player for %s %s", q->track, wstat(status));
+ /* Report the status unless we killed it */
+ if(status) {
+ if(!(q->killed && WIFSIGNALED(status) && WTERMSIG(status) == q->killed))
+ disorder_error(0, "player for %s %s", q->track, wstat(status));
+ }
+ /* Clean up any prefork calls */
if(q->type & DISORDER_PLAYER_PREFORK)
play_cleanup(q->pl, q->data);
q->wstat = status;
* a subprocess. See speaker.c for further discussion. */
struct speaker_message sm[1];
memset(sm, 0, sizeof sm);
- strcpy(sm->id, q->id);
+ strcpy(sm->u.id, q->id);
sm->type = SM_PLAY;
speaker_send(speaker_fd, sm);
- D(("sent SM_PLAY for %s", sm->id));
+ D(("sent SM_PLAY for %s", sm->u.id));
/* Our caller will set playing and playing->state = playing_started */
return START_OK;
} else {
static int start_child(struct queue_entry *q,
const struct pbgc_params *params,
void attribute((unused)) *bgdata) {
- int n;
-
- /* Wait for a device to clear. This ugliness is now deprecated and will
- * eventually be removed. */
- if(params->waitdevice) {
- ao_initialize();
- if(*params->waitdevice) {
- n = ao_driver_id(params->waitdevice);
- if(n == -1)
- disorder_fatal(0, "invalid libao driver: %s", params->waitdevice);
- } else
- n = ao_default_driver_id();
- /* Make up a format. */
- ao_sample_format format;
- memset(&format, 0, sizeof format);
- format.bits = 8;
- format.rate = 44100;
- format.channels = 1;
- format.byte_format = AO_FMT_NATIVE;
- int retries = 20;
- struct timespec ts;
- ts.tv_sec = 0;
- ts.tv_nsec = 100000000; /* 0.1s */
- ao_device *device;
- while((device = ao_open_live(n, &format, 0)) == 0 && retries-- > 0)
- nanosleep(&ts, 0);
- if(device)
- ao_close(device);
- }
/* Play the track */
play_track(q->pl,
params->argv, params->argc,
memset(&addr, 0, sizeof addr);
addr.sun_family = AF_UNIX;
snprintf(addr.sun_path, sizeof addr.sun_path,
- "%s/speaker/socket", config->home);
+ "%s/private/speaker", config->home);
int sfd = xsocket(PF_UNIX, SOCK_STREAM, 0);
if(connect(sfd, (const struct sockaddr *)&addr, sizeof addr) < 0)
disorder_fatal(errno, "connecting to %s", addr.sun_path);
return 0;
}
+/** @brief Kill a player
+ * @param q Queue entry corresponding to player
+ */
+static void kill_player(struct queue_entry *q) {
+ if(q->pid >= 0)
+ kill(-q->pid, config->signal);
+ q->killed = config->signal;
+}
+
/** @brief Abandon a queue entry
*
* Called from c_remove() (but NOT when scratching a track). Only does
if((q->type & DISORDER_PLAYER_TYPEMASK) != DISORDER_PLAYER_RAW)
return; /* Not a raw player. */
/* Terminate the player. */
- kill(-q->pid, config->signal);
+ kill_player(q);
/* Cancel the track. */
memset(&sm, 0, sizeof sm);
sm.type = SM_CANCEL;
- strcpy(sm.id, q->id);
+ strcpy(sm.u.id, q->id);
speaker_send(speaker_fd, &sm);
}
/* Miscelleneous ------------------------------------------------------------ */
+int flag_enabled(const char *s) {
+ return !s || !strcmp(s, "yes");
+}
+
/** @brief Return true if play is enabled */
int playing_is_enabled(void) {
- const char *s = trackdb_get_global("playing");
-
- return !s || !strcmp(s, "yes");
+ return flag_enabled(trackdb_get_global("playing"));
}
/** @brief Enable play */
}
/** @brief Disable play */
-void disable_playing(const char *who) {
+void disable_playing(const char *who, ev_source attribute((unused)) *ev) {
trackdb_set_global("playing", "no", who);
}
/** @brief Return true if random play is enabled */
int random_is_enabled(void) {
- const char *s = trackdb_get_global("random-play");
-
- return !s || !strcmp(s, "yes");
+ return flag_enabled(trackdb_get_global("random-play"));
}
/** @brief Enable random play */
}
/** @brief Disable random play */
-void disable_random(const char *who) {
+void disable_random(const char *who, ev_source attribute((unused)) *ev) {
trackdb_set_global("random-play", "no", who);
}
playing->state = playing_scratched;
playing->scratched = who ? xstrdup(who) : 0;
/* Find the player and kill the whole process group */
- if(playing->pid >= 0) {
- D(("kill -%d -%lu", config->signal, (unsigned long)playing->pid));
- kill(-playing->pid, config->signal);
- }
+ if(playing->pid >= 0)
+ kill_player(playing);
/* Tell the speaker, if we think it'll care */
if((playing->type & DISORDER_PLAYER_TYPEMASK) == DISORDER_PLAYER_RAW) {
memset(&sm, 0, sizeof sm);
sm.type = SM_CANCEL;
- strcpy(sm.id, playing->id);
+ strcpy(sm.u.id, playing->id);
speaker_send(speaker_fd, &sm);
D(("sending SM_CANCEL for %s", playing->id));
}
shutting_down = 1;
/* Shut down the current player */
if(playing) {
- if(playing->pid >= 0)
- kill(-playing->pid, config->signal);
+ kill_player(playing);
playing->state = playing_quitting;
finished(0);
}
/* Zap any background decoders that are going */
for(q = qhead.next; q != &qhead; q = q->next)
- if(q->pid >= 0) {
- D(("kill -%d %lu", config->signal, (unsigned long)q->pid));
- kill(-q->pid, config->signal);
- }
+ kill_player(q);
/* Don't need the speaker any more */
ev_fd_cancel(ev, ev_read, speaker_fd);
xclose(speaker_fd);
eventlog("state", "resume", (char *)0);
}
+/** @brief Request an RTP stream */
+void rtp_request(const struct sockaddr_storage *sa) {
+ struct speaker_message sm;
+ memset(&sm, 0, sizeof sm);
+ sm.type = SM_RTP_REQUEST;
+ sm.u.address = *sa;
+ speaker_send(speaker_fd, &sm);
+}
+
+/** @brief Cancel an RTP stream */
+void rtp_request_cancel(const struct sockaddr_storage *sa) {
+ struct speaker_message sm;
+ memset(&sm, 0, sizeof sm);
+ sm.type = SM_RTP_CANCEL;
+ sm.u.address = *sa;
+ speaker_send(speaker_fd, &sm);
+}
+
/*
Local Variables:
c-basic-offset:2