aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-09-26 09:54:25 +0200
committerMax Kellermann <max@duempel.org>2008-09-26 09:54:25 +0200
commit323e86489fb9544b3a2faa9e9004ac0b72bf01ca (patch)
tree37bcd31c5c977d1e59959ea86b47a15eae6e6a34
parente2a12deead431f86c24d71579c954e00e73ed447 (diff)
downloadmpd-323e86489fb9544b3a2faa9e9004ac0b72bf01ca.tar.gz
mpd-323e86489fb9544b3a2faa9e9004ac0b72bf01ca.tar.xz
mpd-323e86489fb9544b3a2faa9e9004ac0b72bf01ca.zip
song: removed type SongList
SongList has been superseded by struct songvec.
Diffstat (limited to '')
-rw-r--r--src/directory.h1
-rw-r--r--src/ls.c1
-rw-r--r--src/song.c36
-rw-r--r--src/song.h10
4 files changed, 2 insertions, 46 deletions
diff --git a/src/directory.h b/src/directory.h
index 6a8ca733f..320a93a7f 100644
--- a/src/directory.h
+++ b/src/directory.h
@@ -21,6 +21,7 @@
#include "song.h"
#include "songvec.h"
+#include "list.h"
typedef List DirectoryList;
diff --git a/src/ls.c b/src/ls.c
index c123ddc02..de42e3f8c 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -23,6 +23,7 @@
#include "log.h"
#include "utf8.h"
#include "utils.h"
+#include "list.h"
#include "os_compat.h"
static const char *remoteUrlPrefixes[] = {
diff --git a/src/song.c b/src/song.c
index 230388805..789e1cf1a 100644
--- a/src/song.c
+++ b/src/song.c
@@ -92,42 +92,6 @@ void freeJustSong(Song * song)
free(song);
}
-SongList *newSongList(void)
-{
- return makeList((ListFreeDataFunc *) freeSong, 0);
-}
-
-Song *addSongToList(SongList * list, const char *url, const char *utf8path,
- int songType, Directory * parentDirectory)
-{
- Song *song = NULL;
-
- switch (songType) {
- case SONG_TYPE_FILE:
- if (isMusic(utf8path, NULL, 0)) {
- song = newSong(url, songType, parentDirectory);
- }
- break;
- case SONG_TYPE_URL:
- song = newSong(url, songType, parentDirectory);
- break;
- default:
- DEBUG("addSongToList: Trying to add an invalid song type\n");
- }
-
- if (song == NULL)
- return NULL;
-
- insertInList(list, song->url, (void *)song);
-
- return song;
-}
-
-void freeSongList(SongList * list)
-{
- freeList(list);
-}
-
int updateSongInfo(Song * song)
{
if (song->type == SONG_TYPE_FILE) {
diff --git a/src/song.h b/src/song.h
index 59d372c21..3e7f8666d 100644
--- a/src/song.h
+++ b/src/song.h
@@ -19,7 +19,6 @@
#ifndef SONG_H
#define SONG_H
-#include "list.h"
#include "os_compat.h"
#include "mpd_types.h"
@@ -42,8 +41,6 @@ typedef struct _Song {
time_t mtime;
} Song;
-typedef List SongList;
-
Song *newNullSong(void);
Song *newSong(const char *url, int songType, struct _Directory *parentDir);
@@ -52,13 +49,6 @@ void freeSong(Song *);
void freeJustSong(Song *);
-SongList *newSongList(void);
-
-void freeSongList(SongList * list);
-
-Song *addSongToList(SongList * list, const char *url, const char *utf8path,
- int songType, struct _Directory *parentDir);
-
int updateSongInfo(Song * song);
/*