X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/5bac5b78c1046bd08a39d3d18c756bbf0566c629..375d9478a5b6b14bfb5f6e1a054e900a18e40717:/server/background.c diff --git a/server/background.c b/server/background.c index be5a309..4901047 100644 --- a/server/background.c +++ b/server/background.c @@ -21,7 +21,8 @@ #include "disorder-server.h" -/** @brief Fork the player or decoder for @p q +/** @brief Fork the player or decoder for @p q + * @param ev Event loop * @param player Pointer to player information * @param q Track to play or decode * @param child Function to run inside fork @@ -49,7 +50,7 @@ int play_background(ev_source *ev, * modules use this so it's not well tested, unfortunately. */ if(q->type & DISORDER_PLAYER_PREFORK) if(!(q->data = play_prefork(q->pl, q->track))) { - error(0, "prefork function for %s failed", q->track); + disorder_error(0, "prefork function for %s failed", q->track); return START_HARDFAIL; } /* Capture the player/decoder's stderr and feed it into our logs. @@ -79,7 +80,7 @@ int play_background(ev_source *ev, ++optv; --optc; } else { - error(0, "unknown option %s", optv[0]); + disorder_error(0, "unknown option %s", optv[0]); return START_HARDFAIL; } } @@ -104,7 +105,7 @@ int play_background(ev_source *ev, _exit(child(q, params, bgdata)); case -1: /* Back in disorderd (child could not be created) */ - error(errno, "error calling fork"); + disorder_error(errno, "error calling fork"); if(q->type & DISORDER_PLAYER_PREFORK) play_cleanup(q->pl, q->data); /* else would leak */ if(lfd != -1)