22645abc10
Commit 0bfe7802 broke update for new files in the root directory,
because music_root->path was an empty string and not NULL. There were
some NULL tests missing. Change them to !isRootDirectory(path)
instead of path!=NULL.
59 lines
1.7 KiB
C
59 lines
1.7 KiB
C
/* the Music Player Daemon (MPD)
|
|
* Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
|
|
* This project's homepage is: http://www.musicpd.org
|
|
*
|
|
* 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
|
|
* (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.
|
|
* 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
|
|
*/
|
|
|
|
#include "song_print.h"
|
|
#include "song.h"
|
|
#include "songvec.h"
|
|
#include "directory.h"
|
|
#include "tag_print.h"
|
|
#include "client.h"
|
|
|
|
void
|
|
song_print_url(struct client *client, struct song *song)
|
|
{
|
|
if (song->parent && !isRootDirectory(song->parent->path)) {
|
|
client_printf(client, "%s%s/%s\n", SONG_FILE,
|
|
directory_get_path(song->parent), song->url);
|
|
} else {
|
|
client_printf(client, "%s%s\n", SONG_FILE, song->url);
|
|
}
|
|
}
|
|
|
|
int
|
|
song_print_info(struct client *client, struct song *song)
|
|
{
|
|
song_print_url(client, song);
|
|
|
|
if (song->tag)
|
|
tag_print(client, song->tag);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
song_print_info_x(struct song *song, void *data)
|
|
{
|
|
struct client *client = data;
|
|
return song_print_info(client, song);
|
|
}
|
|
|
|
int songvec_print(struct client *client, const struct songvec *sv)
|
|
{
|
|
return songvec_for_each(sv, song_print_info_x, client);
|
|
}
|