playlist: moved PlaylistInfo() to playlist_print.c
PlaylistInfo() (notice the capital 'P') sends a stored playlist to the client. Move it to a separate library, where all the code which glues the playlist and the MPD protocol together will live.
This commit is contained in:
parent
ed25bdf55a
commit
8afe24c1de
|
@ -91,6 +91,7 @@ mpd_headers = \
|
|||
player_thread.h \
|
||||
player_control.h \
|
||||
playlist.h \
|
||||
playlist_print.h \
|
||||
playlist_save.h \
|
||||
queue.h \
|
||||
queue_print.h \
|
||||
|
@ -176,6 +177,7 @@ mpd_SOURCES = \
|
|||
player_thread.c \
|
||||
player_control.c \
|
||||
playlist.c \
|
||||
playlist_print.c \
|
||||
playlist_save.c \
|
||||
queue.c \
|
||||
queue_print.c \
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
#include "command.h"
|
||||
#include "player_control.h"
|
||||
#include "playlist.h"
|
||||
#include "playlist_print.h"
|
||||
#include "ls.h"
|
||||
#include "directory.h"
|
||||
#include "directory_print.h"
|
||||
|
|
|
@ -24,8 +24,6 @@
|
|||
#include "ls.h"
|
||||
#include "tag.h"
|
||||
#include "song.h"
|
||||
#include "song_print.h"
|
||||
#include "client.h"
|
||||
#include "conf.h"
|
||||
#include "database.h"
|
||||
#include "mapper.h"
|
||||
|
@ -1217,34 +1215,6 @@ unsigned getPlaylistSongId(unsigned song)
|
|||
return queue_position_to_id(&playlist.queue, song);
|
||||
}
|
||||
|
||||
int PlaylistInfo(struct client *client, const char *utf8file, int detail)
|
||||
{
|
||||
GPtrArray *list;
|
||||
|
||||
if (!(list = spl_load(utf8file)))
|
||||
return -1;
|
||||
|
||||
for (unsigned i = 0; i < list->len; ++i) {
|
||||
const char *temp = g_ptr_array_index(list, i);
|
||||
int wrote = 0;
|
||||
|
||||
if (detail) {
|
||||
struct song *song = db_get_song(temp);
|
||||
if (song) {
|
||||
song_print_info(client, song);
|
||||
wrote = 1;
|
||||
}
|
||||
}
|
||||
|
||||
if (!wrote) {
|
||||
client_printf(client, SONG_FILE "%s\n", temp);
|
||||
}
|
||||
}
|
||||
|
||||
spl_free(list);
|
||||
return 0;
|
||||
}
|
||||
|
||||
enum playlist_result loadPlaylist(const char *utf8file)
|
||||
{
|
||||
GPtrArray *list;
|
||||
|
|
|
@ -174,8 +174,6 @@ int playlistChanges(struct client *client, uint32_t version);
|
|||
|
||||
int playlistChangesPosId(struct client *client, uint32_t version);
|
||||
|
||||
int PlaylistInfo(struct client *client, const char *utf8file, int detail);
|
||||
|
||||
void
|
||||
searchForSongsInPlaylist(struct client *client,
|
||||
unsigned numItems, const LocateTagItem *items);
|
||||
|
|
|
@ -0,0 +1,53 @@
|
|||
/*
|
||||
* Copyright (C) 2003-2009 The Music Player Daemon Project
|
||||
* 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 "playlist_print.h"
|
||||
#include "stored_playlist.h"
|
||||
#include "song_print.h"
|
||||
#include "song.h"
|
||||
#include "database.h"
|
||||
#include "client.h"
|
||||
|
||||
int
|
||||
PlaylistInfo(struct client *client, const char *utf8file, int detail)
|
||||
{
|
||||
GPtrArray *list;
|
||||
|
||||
if (!(list = spl_load(utf8file)))
|
||||
return -1;
|
||||
|
||||
for (unsigned i = 0; i < list->len; ++i) {
|
||||
const char *temp = g_ptr_array_index(list, i);
|
||||
int wrote = 0;
|
||||
|
||||
if (detail) {
|
||||
struct song *song = db_get_song(temp);
|
||||
if (song) {
|
||||
song_print_info(client, song);
|
||||
wrote = 1;
|
||||
}
|
||||
}
|
||||
|
||||
if (!wrote) {
|
||||
client_printf(client, SONG_FILE "%s\n", temp);
|
||||
}
|
||||
}
|
||||
|
||||
spl_free(list);
|
||||
return 0;
|
||||
}
|
|
@ -0,0 +1,30 @@
|
|||
/*
|
||||
* Copyright (C) 2003-2009 The Music Player Daemon Project
|
||||
* 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
|
||||
*/
|
||||
|
||||
#ifndef PLAYLIST_PRINT_H
|
||||
#define PLAYLIST_PRINT_H
|
||||
|
||||
#include "playlist_print.h"
|
||||
#include "stored_playlist.h"
|
||||
#include "song_print.h"
|
||||
#include "client.h"
|
||||
|
||||
int
|
||||
PlaylistInfo(struct client *client, const char *utf8file, int detail);
|
||||
|
||||
#endif
|
Loading…
Reference in New Issue