X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/33e95f039e696d2cfe6b673166a064e48ed1e341..7751df38d656c9cf06fa8b545420303e69e72528:/cgi/actions.c diff --git a/cgi/actions.c b/cgi/actions.c index 4d064e0..7634010 100644 --- a/cgi/actions.c +++ b/cgi/actions.c @@ -2,20 +2,18 @@ * This file is part of DisOrder. * Copyright (C) 2004-2008 Richard Kettlewell * - * This program is free software; you can redistribute it and/or modify + * 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 - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA + * along with this program. If not, see . */ /** @file server/actions.c * @brief DisOrder web actions @@ -240,7 +238,7 @@ static void act_play(void) { const char *track, *dir; char **tracks; int ntracks, n; - struct dcgi_entry *e; + struct tracksort_data *tsd; if(dcgi_client) { if((track = cgi_get("track"))) { @@ -248,16 +246,9 @@ static void act_play(void) { } else if((dir = cgi_get("dir"))) { if(disorder_files(dcgi_client, dir, 0, &tracks, &ntracks)) ntracks = 0; - /* TODO use tracksort_init */ - e = xmalloc(ntracks * sizeof (struct dcgi_entry)); - for(n = 0; n < ntracks; ++n) { - e[n].track = tracks[n]; - e[n].sort = trackname_transform("track", tracks[n], "sort"); - e[n].display = trackname_transform("track", tracks[n], "display"); - } - qsort(e, ntracks, sizeof (struct dcgi_entry), dcgi_compare_entry); + tsd = tracksort_init(ntracks, tracks, "track"); for(n = 0; n < ntracks; ++n) - disorder_play(dcgi_client, e[n].track); + disorder_play(dcgi_client, tsd[n].track); } } redirect(0);