return;
var obj = JSON.parse(msg.data);
+
switch (obj.type) {
case "queue":
$('#salamisandwich > tbody').append(
"<tr trackid=\"" + obj.data[song].id + "\"><td>" + (obj.data[song].pos + 1) + "</td>" +
- "<td>"+ obj.data[song].title +"</td>" +
+ "<td>"+ obj.data[song].title +"</td>" +
+ "<td>"+ obj.data[song].album +"</td>" +
+ "<td>"+ obj.data[song].artist +"</td>" +
"<td>"+ minutes + ":" + (seconds < 10 ? '0' : '') + seconds +
"</td><td></td></tr>");
}
"<tr uri=\"" + obj.data[item].dir + "\" class=\"dir\">" +
"<td><span class=\"glyphicon glyphicon-folder-open\"></span></td>" +
"<td><a>" + basename(obj.data[item].dir) + "</a></td>" +
+ "<td></td><td></td>" +
"<td></td><td></td></tr>"
);
break;
$('#salamisandwich > tbody').append(
"<tr uri=\"" + obj.data[item].plist + "\" class=\"plist\">" +
"<td><span class=\"glyphicon glyphicon-list\"></span></td>" +
- "<td><a>" + basename(obj.data[item].plist) + "</a></td>" +
+ "<td><a>" + basename(obj.data[item].plist) + "</a></td>" +
+ "<td></td><td></td>" +
"<td></td><td></td></tr>"
);
break;
$('#salamisandwich > tbody').append(
"<tr uri=\"" + obj.data[item].uri + "\" class=\"song\">" +
"<td><span class=\"glyphicon glyphicon-music\"></span></td>" +
- "<td>" + obj.data[item].title +"</td>" +
- "<td>"+ minutes + ":" + (seconds < 10 ? '0' : '') + seconds +
+ "<td>" + obj.data[item].title + "</td>" +
+ "<td>" + obj.data[item].album + "</td>" +
+ "<td>" + obj.data[item].artist + "</td>" +
+ "<td>" + minutes + ":" + (seconds < 10 ? '0' : '') + seconds +
"</td><td></td></tr>"
);
break;
return str;
}
+char* mpd_get_album(struct mpd_song const *song)
+{
+ char *str;
+
+ str = (char *)mpd_song_get_tag(song, MPD_TAG_ALBUM, 0);
+ if(str == NULL){
+ str = basename((char *)mpd_song_get_uri(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);
+ if(str == NULL){
+ str = basename((char *)mpd_song_get_uri(song));
+ }
+
+ return str;
+}
+
int mpd_put_state(char *buffer, int *current_song_id, unsigned *queue_version)
{
struct mpd_status *status;
cur += json_emit_int(cur, end - cur, mpd_song_get_pos(song));
cur += json_emit_raw_str(cur, end - cur, ",\"duration\":");
cur += json_emit_int(cur, end - cur, mpd_song_get_duration(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, ",\"title\":");
cur += json_emit_quoted_str(cur, end - cur, mpd_get_title(song));
cur += json_emit_raw_str(cur, end - cur, "},");
cur += json_emit_quoted_str(cur, end - cur, mpd_song_get_uri(song));
cur += json_emit_raw_str(cur, end - cur, ",\"duration\":");
cur += json_emit_int(cur, end - cur, mpd_song_get_duration(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, ",\"title\":");
cur += json_emit_quoted_str(cur, end - cur, mpd_get_title(song));
cur += json_emit_raw_str(cur, end - cur, "},");