|
@@ -475,6 +475,24 @@ char* mpd_get_title(struct mpd_song const *song)
|
|
|
return str;
|
|
|
}
|
|
|
|
|
|
+char* mpd_get_artist(struct mpd_song const *song)
|
|
|
+{
|
|
|
+ char *str;
|
|
|
+
|
|
|
+ str = (char *)mpd_song_get_tag(song, MPD_TAG_ARTIST, 0);
|
|
|
+
|
|
|
+ return str;
|
|
|
+}
|
|
|
+
|
|
|
+char* mpd_get_album(struct mpd_song const *song)
|
|
|
+{
|
|
|
+ char *str;
|
|
|
+
|
|
|
+ str = (char *)mpd_song_get_tag(song, MPD_TAG_ALBUM, 0);
|
|
|
+
|
|
|
+ return str;
|
|
|
+}
|
|
|
+
|
|
|
int mpd_put_state(char *buffer, int *current_song_id, unsigned *queue_version)
|
|
|
{
|
|
|
struct mpd_status *status;
|
|
@@ -559,18 +577,10 @@ int mpd_put_current_song(char *buffer)
|
|
|
cur += json_emit_int(cur, end - cur, mpd_song_get_pos(song));
|
|
|
cur += json_emit_raw_str(cur, end - cur, ",\"title\":");
|
|
|
cur += json_emit_quoted_str(cur, end - cur, mpd_get_title(song));
|
|
|
-
|
|
|
- if(mpd_song_get_tag(song, MPD_TAG_ARTIST, 0) != NULL)
|
|
|
- {
|
|
|
- cur += json_emit_raw_str(cur, end - cur, ",\"artist\":");
|
|
|
- cur += json_emit_quoted_str(cur, end - cur, mpd_song_get_tag(song, MPD_TAG_ARTIST, 0));
|
|
|
- }
|
|
|
-
|
|
|
- if(mpd_song_get_tag(song, MPD_TAG_ALBUM, 0) != NULL)
|
|
|
- {
|
|
|
- cur += json_emit_raw_str(cur, end - cur, ",\"album\":");
|
|
|
- cur += json_emit_quoted_str(cur, end - cur, mpd_song_get_tag(song, MPD_TAG_ALBUM, 0));
|
|
|
- }
|
|
|
+ cur += json_emit_raw_str(cur, end - cur, ",\"artist\":");
|
|
|
+ cur += json_emit_quoted_str(cur, end - cur, mpd_get_artist(song));
|
|
|
+ cur += json_emit_raw_str(cur, end - cur, ",\"album\":");
|
|
|
+ cur += json_emit_quoted_str(cur, end - cur, mpd_get_album(song));
|
|
|
|
|
|
cur += json_emit_raw_str(cur, end - cur, "}}");
|
|
|
mpd_song_free(song);
|
|
@@ -604,6 +614,10 @@ int mpd_put_queue(char *buffer, unsigned int offset)
|
|
|
cur += json_emit_int(cur, end - cur, mpd_song_get_duration(song));
|
|
|
cur += json_emit_raw_str(cur, end - cur, ",\"title\":");
|
|
|
cur += json_emit_quoted_str(cur, end - cur, mpd_get_title(song));
|
|
|
+ cur += json_emit_raw_str(cur, end - cur, ",\"artist\":");
|
|
|
+ cur += json_emit_quoted_str(cur, end - cur, mpd_get_artist(song));
|
|
|
+ cur += json_emit_raw_str(cur, end - cur, ",\"album\":");
|
|
|
+ cur += json_emit_quoted_str(cur, end - cur, mpd_get_album(song));
|
|
|
cur += json_emit_raw_str(cur, end - cur, "},");
|
|
|
}
|
|
|
mpd_entity_free(entity);
|
|
@@ -718,6 +732,10 @@ int mpd_search(char *buffer, char *searchstr)
|
|
|
cur += json_emit_int(cur, end - cur, mpd_song_get_duration(song));
|
|
|
cur += json_emit_raw_str(cur, end - cur, ",\"title\":");
|
|
|
cur += json_emit_quoted_str(cur, end - cur, mpd_get_title(song));
|
|
|
+ cur += json_emit_raw_str(cur, end - cur, ",\"artist\":");
|
|
|
+ cur += json_emit_quoted_str(cur, end - cur, mpd_get_artist(song));
|
|
|
+ cur += json_emit_raw_str(cur, end - cur, ",\"album\":");
|
|
|
+ cur += json_emit_quoted_str(cur, end - cur, mpd_get_album(song));
|
|
|
cur += json_emit_raw_str(cur, end - cur, "},");
|
|
|
mpd_song_free(song);
|
|
|
|