Merge branch 'ew/directory'

* ew/directory:
  songvec: remove songvec_prune
  directory: update do its work inside a thread
  directory: use enum update_return for return values

1 files changed, 0 insertions, 23 deletions

diff --git a/src/songvec.c b/src/songvec.c
index ac84e7f8e..d416573ce 100644
--- a/src/songvec.c
+++ b/src/songvec.c
@@ -96,26 +96,3 @@ int songvec_write(struct songvec *sv, int fd, int extra)
 
 	return 0;
 }
-
-/*
- * Removes missing songs from a songvec. This function is only temporary
- * as updating will be moved into a thread and updating shared memory...
- */
-#include "path.h"
-#include "ls.h"
-void songvec_prune(struct songvec *sv)
-{
-	int i;
-	char tmp[MPD_PATH_MAX];
-	struct stat sb;
-
-	for (i = sv->nr; --i >= 0; ) {
-		Song *song = sv->base[i];
-		assert(song);
-		if (!myStat(get_song_url(tmp, song), &sb))
-			continue;
-		songvec_delete(sv, song);
-		freeSong(song);
-		i = sv->nr;
-	}
-}