From decc482e2cd52b1ca099f1d1bd7453b4a8d7e390 Mon Sep 17 00:00:00 2001
From: chme <christian.meffert@googlemail.com>
Date: Sat, 9 May 2015 06:31:59 +0200
Subject: [PATCH] [mpd] only return "id" attribute if song information is
 requested for the current playlist

mpd does not expose a persistent song id, instead the id returned in
playlistinfo is a unique id for the song in the queue. The same song has
different ids if it occurs more than once in the queue.
---
 src/mpd.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/mpd.c b/src/mpd.c
index 0986c27b..b49832ad 100644
--- a/src/mpd.c
+++ b/src/mpd.c
@@ -397,11 +397,13 @@ mpd_add_mediainfo(struct evbuffer *evbuf, struct media_file_info *mfi, int pos_p
       ret = evbuffer_add_printf(evbuf,
 	"Pos: %d\n",
 	pos_pl);
+
+      //TODO mpd does not return the persistent id of a file but instead a unique id in the current playlist
+      ret = evbuffer_add_printf(evbuf,
+	"Id: %d\n",
+	mfi->id);
     }
 
-  ret = evbuffer_add_printf(evbuf,
-    "Id: %d\n",
-    mfi->id);
 
   return ret;
 }
@@ -454,7 +456,6 @@ mpd_add_mediainfo_byid(struct evbuffer *evbuf, int id, int pos_pl)
  *   MUSICBRAINZ_ARTISTID: c5c2ea1c-4bde-4f4d-bd0b-47b200bf99d6
  *   MUSICBRAINZ_ALBUMID: 812f4b87-8ad9-41bd-be79-38151f17a2b4
  *   MUSICBRAINZ_TRACKID: fde95c39-ee51-48f6-a7f9-b5631c2ed156
- *   Id: 1
  *
  * @param evbuf the response event buffer
  * @param mfi media information
@@ -495,8 +496,7 @@ mpd_add_db_media_file_info(struct evbuffer *evbuf, struct db_media_file_info *db
       "Track: %s\n"
       "Date: %s\n"
       "Genre: %s\n"
-      "Disc: %s\n"
-      "Id: %s\n",
+      "Disc: %s\n",
       (dbmfi->virtual_path + 1),
       modified,
       (songlength / 1000),
@@ -509,8 +509,7 @@ mpd_add_db_media_file_info(struct evbuffer *evbuf, struct db_media_file_info *db
       dbmfi->track,
       dbmfi->year,
       dbmfi->genre,
-      dbmfi->disc,
-      dbmfi->id);
+      dbmfi->disc);
 
   return ret;
 }