X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/59cf25c47fbda22f3f4e14399f0436cc6ed2c56f..1dc0cedaed875e010691b20a83d46447dc808cb5:/server/play.c diff --git a/server/play.c b/server/play.c index 2889e42..af42bd3 100644 --- a/server/play.c +++ b/server/play.c @@ -15,6 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ +/** @file server/play.c + * @brief Playing tracks + */ #include "disorder-server.h" #include @@ -488,8 +491,7 @@ static void chosen_random_track(ev_source *ev, if(!track) return; /* Add the track to the queue */ - q = queue_add(track, 0, WHERE_END); - q->state = playing_random; + q = queue_add(track, 0, WHERE_END, origin_random); D(("picked %p (%s) at random", (void *)q, q->track)); queue_write(); /* Maybe a track can now be played */ @@ -531,9 +533,10 @@ void play(ev_source *ev) { } /* There must be at least one track in the queue. */ q = qhead.next; - /* If random play is disabled but the track is a random one then don't play - * it. play() will be called again when random play is re-enabled. */ - if(!random_enabled && q->state == playing_random) + /* If random play is disabled but the track is a non-adopted random one + * then don't play it. play() will be called again when random play is + * re-enabled. */ + if(!random_enabled && q->origin == origin_random) return; D(("taken %p (%s) from queue", (void *)q, q->track)); /* Try to start playing. */ @@ -639,8 +642,7 @@ void scratch(const char *who, const char *id) { * bother if playing is disabled) */ if(playing_is_enabled() && config->scratch.n) { int r = rand() * (double)config->scratch.n / (RAND_MAX + 1.0); - q = queue_add(config->scratch.s[r], who, WHERE_START); - q->state = playing_isscratch; + q = queue_add(config->scratch.s[r], who, WHERE_START, origin_scratch); } notify_scratch(playing->track, playing->submitter, who, time(0) - playing->played);