merge changes from metadata-rewrite branch

git-svn-id: https://svn.musicpd.org/mpd/trunk@2589 09075e82-0dd4-0310-85a5-a0d7c8717e4f

1 files changed, 4 insertions, 3 deletions

diff --git a/src/stats.c b/src/stats.c
index b114e1764..6efa8cb8f 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -18,10 +18,11 @@
 
 #include "stats.h"
 
-#include "tables.h"
 #include "directory.h"
 #include "myfprintf.h"
 #include "player.h"
+#include "tag.h"
+#include "tagTracker.h"
 
 #include <time.h>
 
@@ -35,8 +36,8 @@ void initStats() {
 }
 
 int printStats(FILE * fp) {
-	myfprintf(fp,"artists: %li\n",numberOfArtists());
-	myfprintf(fp,"albums: %li\n",numberOfAlbums());
+	myfprintf(fp,"artists: %li\n", getNumberOfTagItems(TAG_ITEM_ARTIST));
+	myfprintf(fp,"albums: %li\n", getNumberOfTagItems(TAG_ITEM_ALBUM));
 	myfprintf(fp,"songs: %i\n",stats.numberOfSongs);
 	myfprintf(fp,"uptime: %li\n",time(NULL)-stats.daemonStart);
 	myfprintf(fp,"playtime: %li\n",(long)(getPlayerTotalPlayTime()+0.5));