merge changes from metadata-rewrite branch
git-svn-id: https://svn.musicpd.org/mpd/trunk@2589 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
@@ -25,7 +25,6 @@
|
||||
#include "listen.h"
|
||||
#include "log.h"
|
||||
#include "utils.h"
|
||||
#include "tables.h"
|
||||
#include "directory.h"
|
||||
#include "volume.h"
|
||||
#include "playerData.h"
|
||||
@@ -116,7 +115,6 @@ int playerInit() {
|
||||
freeAllInterfaces();
|
||||
closeMp3Directory();
|
||||
finishPlaylist();
|
||||
closeTables();
|
||||
finishPermissions();
|
||||
finishCommands();
|
||||
finishVolume();
|
||||
@@ -480,7 +478,6 @@ Song * playerCurrentDecodeSong() {
|
||||
song = newNullSong();
|
||||
song->utf8url = strdup(pc->currentUrl);
|
||||
song->tag = metadataChunkToMpdTagDup(prev);
|
||||
validateUtf8Tag(song->tag);
|
||||
ret = song;
|
||||
resetPlayerMetadata();
|
||||
}
|
||||
|
Reference in New Issue
Block a user