1
0
mirror of https://github.com/SuperBFG7/ympd synced 2024-11-22 21:07:18 +00:00

add browse functionality

This commit is contained in:
Andrew Karpow 2013-11-07 10:09:40 +01:00
parent bc39214dc4
commit 931e975d4e
7 changed files with 278 additions and 82 deletions

View File

@ -20,3 +20,11 @@ body {
margin-top: 0px; margin-top: 0px;
margin-bottom: 0px; margin-bottom: 0px;
} }
#counter {
font-size: 24px;
margin-top: -6px;
margin-left: 10px;
min-width: 50px;
}

View File

@ -14,7 +14,7 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="css/slider.css" rel="stylesheet"> <link href="css/slider.css" rel="stylesheet">
<link href="css/starter-template.css" rel="stylesheet"> <link href="css/mpd.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries --> <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]> <!--[if lt IE 9]>
@ -36,10 +36,10 @@
</div> </div>
<div class="collapse navbar-collapse"> <div class="collapse navbar-collapse">
<ul class="nav navbar-nav"> <ul id="nav_links" class="nav navbar-nav">
<li class="active"><a href="#">Playlist</a></li> <li><a href="#">Playlist</a></li>
<li><a href="#about">Browse</a></li> <li><a href="#browse">Browse database</a></li>
<li><a href="#contact">About</a></li> <li><a href="#about">About</a></li>
</ul> </ul>
<form class="navbar-form navbar-right" role="search"> <form class="navbar-form navbar-right" role="search">
@ -64,11 +64,11 @@
</button> </button>
</div> </div>
<div class="btn-group"> <div class="btn-group">
<button type="button" class="btn btn-toolbar btn-default"> <div class="btn btn-toolbar btn-default">
<span id="volume-icon" class="glyphicon glyphicon-volume-up"></span> <span id="volume-icon" class="glyphicon glyphicon-volume-up"></span>
&nbsp;&nbsp; &nbsp;&nbsp;
<input type="text" class="span2" value="0" data-slider-min="0" data-slider-max="100" data-slider-step="5" id="volumeslider" data-slider-tooltip="hide"> <input type="text" class="span2" value="0" data-slider-min="0" data-slider-max="100" data-slider-step="5" id="volumeslider" data-slider-tooltip="hide">
</button> </div>
</div> </div>
</div> </div>
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->
@ -80,12 +80,13 @@
<div class="col-md-10"> <div class="col-md-10">
<div id="alert" class="alert hide"></div> <div id="alert" class="alert hide"></div>
<div class="panel panel-primary"> <div class="panel panel-primary">
<!-- Default panel contents --> <!-- Default panel contents -->
<div class="panel-heading">Playlist</div> <div id="panel-heading" class="panel-heading">Playlist</div>
<div class="panel-body"> <div class="panel-body">
<h2><span id="track-icon" class="glyphicon glyphicon-play"></span> Playing track xyz</h2> <h1><span id="track-icon" class="glyphicon glyphicon-play"></span><span id="currenttrack"></span></h1>
<p class="text pull-right">&nbsp;&nbsp;2:13/4:12</p> <p id="counter" class="text pull-right">&nbsp;&nbsp;</p>
<div class="progress progress-striped active"> <div class="progress progress-striped active">
<div id="progressbar" class="progress-bar navbar-left" role="progressbar" aria-valuenow="45" aria-valuemin="0" aria-valuemax="100"> <div id="progressbar" class="progress-bar navbar-left" role="progressbar" aria-valuenow="45" aria-valuemin="0" aria-valuemax="100">
@ -94,7 +95,7 @@
</div> </div>
<!-- Table --> <!-- Table -->
<table id="salamisandwich" class="table"> <table id="salamisandwich" class="table table-hover">
<thead> <thead>
<tr> <tr>
<th>#</th> <th>#</th>
@ -111,16 +112,16 @@
<div class="col-md-2" > <div class="col-md-2" >
<div data-spy="affix"> <div data-spy="affix">
<div class="btn-group-vertical btn-block btn-group-lg" data-toggle="buttons"> <div class="btn-group-vertical btn-block btn-group-lg" data-toggle="buttons">
<button id="btnrandom" type="button" class="btn btn-default" onclick="toggleButton(this.id)"> <button id="btnrandom" type="button" class="btn btn-default">
<span class="glyphicon glyphicon-random"></span> Random <span class="glyphicon glyphicon-random"></span> Random
</button> </button>
<button id="btnconsume" type="button" class="btn btn-default" onclick="toggleButton(this.id)"> <button id="btnconsume" type="button" class="btn btn-default">
<span class="glyphicon glyphicon-fire"></span> Consume <span class="glyphicon glyphicon-fire"></span> Consume
</button> </button>
<button id="btnsingle" type="button" class="btn btn-default" onclick="toggleButton(this.id)"> <button id="btnsingle" type="button" class="btn btn-default">
<span class="glyphicon glyphicon-star"></span> Single <span class="glyphicon glyphicon-star"></span> Single
</button> </button>
<button id="btnrepeat" type="button" class="btn btn-default" onclick="toggleButton(this.id)"> <button id="btnrepeat" type="button" class="btn btn-default">
<span class="glyphicon glyphicon-repeat"></span> Repeat <span class="glyphicon glyphicon-repeat"></span> Repeat
</button> </button>
</div> </div>

View File

@ -5,7 +5,34 @@ $('#volumeslider').slider().on('slide', function(event) {
socket.send("MPD_API_SET_VOLUME,"+event.value); socket.send("MPD_API_SET_VOLUME,"+event.value);
}); });
$(window).bind('hashchange', function(e) {
$('#nav_links > li').each(function(value) {
if(window.location.hash === $(this).children().attr('href'))
$(this).addClass('active');
else
$(this).removeClass('active');
});
switch(window.location.hash) {
case "#browse":
$('#panel-heading').text("Browse database");
socket.send('MPD_API_GET_BROWSE,/');
break;
case "#about":
$('#panel-heading').text("About");
break;
default:
$('#panel-heading').text("Playlist");
$('#nav_links > li:first-child').addClass('active');
socket.send("MPD_API_GET_PLAYLIST");
}
socket.send("MPD_API_GET_TRACK_INFO");
});
$(document).ready(function(){
webSocketConnect(); webSocketConnect();
});
function webSocketConnect() { function webSocketConnect() {
@ -18,18 +45,19 @@ function webSocketConnect() {
try { try {
socket.onopen = function() { socket.onopen = function() {
console.log("Connected"); console.log("Connected");
socket.send("MPD_API_GET_PLAYLIST"); $(window).trigger( 'hashchange' );
socket.send("MPD_API_GET_STATE");
} }
socket.onmessage =function got_packet(msg) { socket.onmessage =function got_packet(msg) {
console.log(msg.data);
if(msg.data === last_state) if(msg.data === last_state)
return; return;
var obj = JSON.parse(msg.data); var obj = JSON.parse(msg.data);
switch (obj.type) { switch (obj.type) {
case "playlist": case "playlist":
if(window.location.hash)
break;
$('#salamisandwich').find("tr:gt(0)").remove(); $('#salamisandwich').find("tr:gt(0)").remove();
for (var song in obj.data) { for (var song in obj.data) {
var minutes = Math.floor(obj.data[song].duration / 60); var minutes = Math.floor(obj.data[song].duration / 60);
@ -38,17 +66,65 @@ function webSocketConnect() {
$('#salamisandwich tr:last').after( $('#salamisandwich tr:last').after(
"<tr id=\"playlist_" + obj.data[song].id + "\"><td>" + obj.data[song].pos + "</td>" + "<tr id=\"playlist_" + obj.data[song].id + "\"><td>" + obj.data[song].pos + "</td>" +
"<td>"+ obj.data[song].title +"</td>" + "<td>"+ obj.data[song].title +"</td>" +
"<td>"+ minutes + ":" + (seconds < 10 ? '0' : '') + seconds +"</td></tr>"); "<td>"+ minutes + ":" + (seconds < 10 ? '0' : '') + seconds +
"<span class=\"glyphicon glyphicon-trash pull-right hoverhidden\"></span> </td></tr>");
} }
break;
case "browse":
if(window.location.hash !== '#browse')
break;
$('#salamisandwich').find("tr:gt(0)").remove();
for (var item in obj.data) {
switch(obj.data[item].type) {
case "directory":
$('#salamisandwich tr:last').after(
"<tr><td><span class=\"glyphicon glyphicon-folder-open\"></span></td>" +
"<td><a href=\"#browse\">" + obj.data[item].dir +"</a></td>" +
"<td></td></tr>");
break;
case "song":
var minutes = Math.floor(obj.data[item].duration / 60);
var seconds = obj.data[item].duration - minutes * 60;
$('#salamisandwich tr:last').after(
"<tr><td><span class=\"glyphicon glyphicon-music\"></span></td>" +
"<td><a href=\"#browse\">" + obj.data[item].title +"</a></td>" +
"<td>"+ minutes + ":" + (seconds < 10 ? '0' : '') + seconds +"</td></tr>");
break;
case "playlist":
break;
}
}
$('#salamisandwich td:eq(1)').click(function(){
socket.send('MPD_API_GET_BROWSE,'+$(this).text());
});
break; break;
case "state": case "state":
if(JSON.stringify(obj) === JSON.stringify(last_state)) if(JSON.stringify(obj) === JSON.stringify(last_state))
break; break;
var total_minutes = Math.floor(obj.data.totalTime / 60);
var total_seconds = obj.data.totalTime - total_minutes * 60;
var elapsed_minutes = Math.floor(obj.data.elapsedTime / 60);
var elapsed_seconds = obj.data.elapsedTime - elapsed_minutes * 60;
$('#volumeslider').slider('setValue', obj.data.volume); $('#volumeslider').slider('setValue', obj.data.volume);
var progress = Math.floor(100*obj.data.elapsedTime/obj.data.totalTime) + "%"; var progress = Math.floor(100*obj.data.elapsedTime/obj.data.totalTime) + "%";
$('#progressbar').width(progress); $('#progressbar').width(progress);
$('#counter')
.text(elapsed_minutes + ":" +
(elapsed_seconds < 10 ? '0' : '') + elapsed_seconds + " / " +
total_minutes + ":" + (total_seconds < 10 ? '0' : '') + total_seconds);
$('#salamisandwich > thead > tr').each(function(value) {
$(this).removeClass('success');
});
$('#playlist_'+obj.data.currentsongid).addClass('success'); $('#playlist_'+obj.data.currentsongid).addClass('success');
if(obj.data.random) if(obj.data.random)
$('#btnrandom').addClass("active") $('#btnrandom').addClass("active")
else else
@ -73,12 +149,21 @@ function webSocketConnect() {
updatePlayIcon(obj.data.state); updatePlayIcon(obj.data.state);
if(last_state && (obj.data.volume !== last_state.data.volume)) if(last_state && (obj.data.volume !== last_state.data.volume))
updateVolumeIcon(obj.data.volume); updateVolumeIcon(obj.data.volume);
if(obj.data.elapsedTime <= 1)
socket.send("MPD_API_GET_TRACK_INFO");
break; break;
case "disconnected": case "disconnected":
$('#alert').text("Error: Connection to MPD failed."); $('#alert')
$('#alert').removeClass("hide alert-info").addclass("alert-danger"); .text("Server lost connection to MPD Host.")
.removeClass("hide alert-info")
.addClass("alert-danger");
break; break;
case "current_song":
$('#currenttrack').text(" " + obj.data.title);
default: default:
break; break;
} }
@ -188,21 +273,18 @@ function updateDB()
}, 5000); }, 5000);
} }
function toggleButton(id) {
switch (obj.type) { $('#btnrandom').on('click', function (e) {
case "btnrandom": socket.send("MPD_API_TOGGLE_RANDOM," + ($(this).hasClass('active') ? 0 : 1));
socket.send("MPD_API_TOGGLE_RANDOM");
break; });
case "btnconsume": $('#btnconsume').on('click', function (e) {
socket.send("MPD_API_TOGGLE_CONSUME"); socket.send("MPD_API_TOGGLE_CONSUME," + ($(this).hasClass('active') ? 0 : 1));
break;
case "btnsingle": });
socket.send("MPD_API_TOGGLE_SINGLE"); $('#btnsingle').on('click', function (e) {
break; socket.send("MPD_API_TOGGLE_SINGLE," + ($(this).hasClass('active') ? 0 : 1));
case "btnrepeat": });
socket.send("MPD_API_TOGGLE_REPEAT"); $('#btnrepeat').on('click', function (e) {
break; socket.send("MPD_API_TOGGLE_REPEAT," + ($(this).hasClass('active') ? 0 : 1));
default: });
break;
}
}

View File

@ -14,8 +14,8 @@ struct serveable {
static const struct serveable whitelist[] = { static const struct serveable whitelist[] = {
{ "/css/bootstrap.css", "text/css" }, { "/css/bootstrap.css", "text/css" },
{ "/css/starter-template.css", "text/css" },
{ "/css/slider.css", "text/css" }, { "/css/slider.css", "text/css" },
{ "/css/mpd.css", "text/css" },
{ "/js/bootstrap.min.js", "text/javascript" }, { "/js/bootstrap.min.js", "text/javascript" },
{ "/js/mpd.js", "text/javascript" }, { "/js/mpd.js", "text/javascript" },

View File

@ -19,7 +19,7 @@ struct libwebsocket_protocols protocols[] = {
"ympd-client", "ympd-client",
callback_ympd, callback_ympd,
sizeof(struct per_session_data__ympd), sizeof(struct per_session_data__ympd),
10, 255,
}, },
{ NULL, NULL, 0, 0 } /* terminator */ { NULL, NULL, 0, 0 } /* terminator */

View File

@ -10,6 +10,7 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include <libgen.h>
#include "mpd_client.h" #include "mpd_client.h"
@ -47,20 +48,20 @@ int callback_ympd(struct libwebsocket_context *context,
if(mpd_conn_state != MPD_CONNECTED) { if(mpd_conn_state != MPD_CONNECTED) {
n = snprintf(p, MAX_SIZE, "{\"type\":\"disconnected\"}"); n = snprintf(p, MAX_SIZE, "{\"type\":\"disconnected\"}");
} }
else if(pss->queue_version != queue_version) { else if((pss->queue_version != queue_version) || (pss->do_send & DO_SEND_PLAYLIST)) {
n = mpd_put_playlist(p); n = mpd_put_playlist(p);
pss->queue_version = queue_version; pss->queue_version = queue_version;
}
else if(pss->do_send & DO_SEND_STATE) {
n = mpd_put_state(p);
pss->do_send &= ~DO_SEND_STATE;
}
else if(pss->do_send & DO_SEND_PLAYLIST) {
n = mpd_put_playlist(p);
pss->do_send &= ~DO_SEND_PLAYLIST; pss->do_send &= ~DO_SEND_PLAYLIST;
} }
else if(pss->do_send & DO_SEND_TRACK_INFO) else if(pss->do_send & DO_SEND_TRACK_INFO) {
n = mpd_put_current_song(p); n = mpd_put_current_song(p);
pss->do_send &= ~DO_SEND_TRACK_INFO;
}
else if(pss->do_send & DO_SEND_BROWSE) {
n = mpd_put_browse(p, pss->browse_path);
pss->do_send &= ~DO_SEND_BROWSE;
free(pss->browse_path);
}
else { else {
n = mpd_put_state(p); n = mpd_put_state(p);
} }
@ -68,6 +69,9 @@ int callback_ympd(struct libwebsocket_context *context,
if(n > 0) if(n > 0)
m = libwebsocket_write(wsi, (unsigned char *)p, n, LWS_WRITE_TEXT); m = libwebsocket_write(wsi, (unsigned char *)p, n, LWS_WRITE_TEXT);
if(p != NULL)
printf("Sending out: %s\n", p);
if (m < n) { if (m < n) {
lwsl_err("ERROR %d writing to socket\n", n, m); lwsl_err("ERROR %d writing to socket\n", n, m);
free(buf); free(buf);
@ -79,9 +83,7 @@ int callback_ympd(struct libwebsocket_context *context,
case LWS_CALLBACK_RECEIVE: case LWS_CALLBACK_RECEIVE:
printf("Got %s\n", (char *)in); printf("Got %s\n", (char *)in);
if(!strcmp((const char *)in, MPD_API_GET_STATE)) if(!strcmp((const char *)in, MPD_API_GET_PLAYLIST))
pss->do_send |= DO_SEND_STATE;
else if(!strcmp((const char *)in, MPD_API_GET_PLAYLIST))
pss->do_send |= DO_SEND_PLAYLIST; pss->do_send |= DO_SEND_PLAYLIST;
else if(!strcmp((const char *)in, MPD_API_GET_TRACK_INFO)) else if(!strcmp((const char *)in, MPD_API_GET_TRACK_INFO))
pss->do_send |= DO_SEND_TRACK_INFO; pss->do_send |= DO_SEND_TRACK_INFO;
@ -101,11 +103,40 @@ int callback_ympd(struct libwebsocket_context *context,
mpd_send_next(conn); mpd_send_next(conn);
mpd_response_finish(conn); mpd_response_finish(conn);
} }
else if(!strncmp((const char *)in, MPD_API_TOGGLE_RANDOM, sizeof(MPD_API_TOGGLE_RANDOM)-1)) {
unsigned random;
if(sscanf(in, "MPD_API_TOGGLE_RANDOM,%d", &random))
mpd_run_random(conn, random);
}
else if(!strncmp((const char *)in, MPD_API_TOGGLE_REPEAT, sizeof(MPD_API_TOGGLE_REPEAT)-1)) {
unsigned repeat;
if(sscanf(in, "MPD_API_TOGGLE_REPEAT,%d", &repeat))
mpd_run_repeat(conn, repeat);
}
else if(!strncmp((const char *)in, MPD_API_TOGGLE_CONSUME, sizeof(MPD_API_TOGGLE_CONSUME)-1)) {
unsigned consume;
if(sscanf(in, "MPD_API_TOGGLE_CONSUME,%d", &consume))
mpd_run_consume(conn, consume);
}
else if(!strncmp((const char *)in, MPD_API_TOGGLE_SINGLE, sizeof(MPD_API_TOGGLE_SINGLE)-1)) {
unsigned single;
if(sscanf(in, "MPD_API_TOGGLE_SINGLE,%d", &single))
mpd_run_single(conn, single);
}
else if(!strncmp((const char *)in, MPD_API_SET_VOLUME, sizeof(MPD_API_SET_VOLUME)-1)) { else if(!strncmp((const char *)in, MPD_API_SET_VOLUME, sizeof(MPD_API_SET_VOLUME)-1)) {
unsigned int volume; unsigned int volume;
if(sscanf(in, "MPD_API_SET_VOLUME,%ud", &volume) && volume < 100) if(sscanf(in, "MPD_API_SET_VOLUME,%ud", &volume) && volume < 100)
mpd_run_set_volume(conn, volume); mpd_run_set_volume(conn, volume);
} }
else if(!strncmp((const char *)in, MPD_API_GET_BROWSE, sizeof(MPD_API_GET_BROWSE)-1)) {
char *dir;
if(sscanf(in, "MPD_API_GET_BROWSE,%m[^\t\n]", &dir) && dir != NULL) {
printf("sending '%s'\n", dir);
pss->do_send |= DO_SEND_BROWSE;
pss->browse_path = dir;
}
}
break; break;
default: default:
@ -166,9 +197,9 @@ char* mpd_get_title(struct mpd_song const *song)
ptr = str; ptr = str;
while(*ptr++ != '\0') while(*ptr++ != '\0')
if(*ptr=='"') if(*ptr=='"')
*ptr=' '; *ptr='\'';
return str; return basename(str);
} }
int mpd_put_state(char *buffer) int mpd_put_state(char *buffer)
@ -178,7 +209,7 @@ int mpd_put_state(char* buffer)
status = mpd_run_status(conn); status = mpd_run_status(conn);
if (!status) { if (!status) {
lwsl_err("MPD status: %s\n", mpd_connection_get_error_message(conn)); lwsl_err("MPD mpd_run_status: %s\n", mpd_connection_get_error_message(conn));
mpd_conn_state = MPD_FAILURE; mpd_conn_state = MPD_FAILURE;
return 0; return 0;
} }
@ -202,7 +233,6 @@ int mpd_put_state(char* buffer)
mpd_status_get_song_id(status)); mpd_status_get_song_id(status));
queue_version = mpd_status_get_queue_version(status); queue_version = mpd_status_get_queue_version(status);
printf("buffer: %s\n", buffer);
mpd_status_free(status); mpd_status_free(status);
return len; return len;
} }
@ -213,15 +243,17 @@ int mpd_put_current_song(char* buffer)
int len; int len;
song = mpd_run_current_song(conn); song = mpd_run_current_song(conn);
if (song != NULL) { if(song == NULL)
len = snprintf(buffer, MAX_SIZE, "{\"type\": \"current_song\", \"data\": {" return 0;
"{\"id\":%d, \"duration\":%d, \"title\":\"%s\"},",
len = snprintf(buffer, MAX_SIZE, "{\"type\": \"current_song\", \"data\":"
"{\"id\":%d, \"pos\":%d, \"duration\":%d, \"title\":\"%s\"}}",
mpd_song_get_id(song), mpd_song_get_id(song),
mpd_song_get_pos(song),
mpd_song_get_duration(song), mpd_song_get_duration(song),
mpd_get_title(song) mpd_get_title(song)
); );
mpd_song_free(song); mpd_song_free(song);
}
mpd_response_finish(conn); mpd_response_finish(conn);
return len; return len;
@ -232,13 +264,17 @@ int mpd_put_playlist(char* buffer)
char *cur = buffer; char *cur = buffer;
const char *end = buffer + MAX_SIZE; const char *end = buffer + MAX_SIZE;
struct mpd_entity *entity; struct mpd_entity *entity;
struct mpd_song const *song;
mpd_send_list_queue_meta(conn); if (!mpd_send_list_queue_meta(conn)) {
lwsl_err("MPD mpd_send_list_queue_meta: %s\n", mpd_connection_get_error_message(conn));
mpd_conn_state = MPD_FAILURE;
return 0;
}
cur += snprintf(cur, end - cur, "{\"type\": \"playlist\", \"data\": [ "); cur += snprintf(cur, end - cur, "{\"type\": \"playlist\", \"data\": [ ");
for(entity = mpd_recv_entity(conn); entity; entity = mpd_recv_entity(conn)) { while((entity = mpd_recv_entity(conn)) != NULL) {
const struct mpd_song *song;
if(mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_SONG) { if(mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_SONG) {
song = mpd_entity_get_song(entity); song = mpd_entity_get_song(entity);
@ -250,13 +286,74 @@ int mpd_put_playlist(char* buffer)
mpd_get_title(song) mpd_get_title(song)
); );
} }
mpd_entity_free(entity); mpd_entity_free(entity);
} }
/* remove last ',' */ /* remove last ',' */
cur--; cur--;
cur += snprintf(cur, end - cur, "] }"); cur += snprintf(cur, end - cur, "] }");
printf("buffer: %s\n", buffer); return cur - buffer;
}
int mpd_put_browse(char *buffer, char *path)
{
char *cur = buffer;
const char *end = buffer + MAX_SIZE;
struct mpd_entity *entity;
if (!mpd_send_list_meta(conn, path)) {
lwsl_err("MPD mpd_send_list_meta: %s\n", mpd_connection_get_error_message(conn));
mpd_conn_state = MPD_FAILURE;
return 0;
}
cur += snprintf(cur, end - cur, "{\"type\":\"browse\",\"data\":[ ");
while((entity = mpd_recv_entity(conn)) != NULL) {
const struct mpd_song *song;
const struct mpd_directory *dir;
const struct mpd_playlist *pl;
switch (mpd_entity_get_type(entity)) {
case MPD_ENTITY_TYPE_UNKNOWN:
break;
case MPD_ENTITY_TYPE_SONG:
song = mpd_entity_get_song(entity);
cur += snprintf(cur, end - cur,
"{\"type\":\"song\",\"uri\":\"%s\",\"duration\":%d,\"title\":\"%s\"},",
mpd_song_get_uri(song),
mpd_song_get_duration(song),
mpd_get_title(song)
);
break;
case MPD_ENTITY_TYPE_DIRECTORY:
dir = mpd_entity_get_directory(entity);
cur += snprintf(cur, end - cur,
"{\"type\":\"directory\",\"dir\":\"%s\"},",
mpd_directory_get_path(dir)
);
break;
case MPD_ENTITY_TYPE_PLAYLIST:
pl = mpd_entity_get_playlist(entity);
cur += snprintf(cur, end - cur,
"{\"type\":\"playlist\",\"plist\":\"%s\"},",
mpd_playlist_get_path(pl)
);
break;
}
mpd_entity_free(entity);
}
if (mpd_connection_get_error(conn) != MPD_ERROR_SUCCESS || !mpd_response_finish(conn)) {
lwsl_err("MPD mpd_send_list_meta: %s\n", mpd_connection_get_error_message(conn));
mpd_conn_state = MPD_FAILURE;
return 0;
}
/* remove last ',' */
cur--;
cur += snprintf(cur, end - cur, "] }");
return cur - buffer; return cur - buffer;
} }

View File

@ -3,12 +3,15 @@
#define DO_SEND_STATE (1 << 0) #define DO_SEND_STATE (1 << 0)
#define DO_SEND_PLAYLIST (1 << 1) #define DO_SEND_PLAYLIST (1 << 1)
#define DO_SEND_TRACK_INFO (1 << 2) #define DO_SEND_TRACK_INFO (1 << 2)
#define DO_SEND_BROWSE (1 << 3)
struct libwebsocket_protocols *protocol_array; struct libwebsocket_protocols *protocol_array;
struct per_session_data__ympd { struct per_session_data__ympd {
int do_send; int do_send;
unsigned queue_version; unsigned queue_version;
char *browse_path;
}; };
enum mpd_conn_states { enum mpd_conn_states {
@ -17,11 +20,11 @@ enum mpd_conn_states {
MPD_CONNECTED MPD_CONNECTED
}; };
#define MPD_API_GET_STATE "MPD_API_GET_STATE"
#define MPD_API_GET_SEEK "MPD_API_GET_SEEK" #define MPD_API_GET_SEEK "MPD_API_GET_SEEK"
#define MPD_API_GET_PLAYLIST "MPD_API_GET_PLAYLIST" #define MPD_API_GET_PLAYLIST "MPD_API_GET_PLAYLIST"
#define MPD_API_GET_TRACK_INFO "MPD_API_GET_TRACK_INFO" #define MPD_API_GET_TRACK_INFO "MPD_API_GET_TRACK_INFO"
#define MPD_API_ADD_TRACK "MPD_API_GET_STATE" #define MPD_API_GET_BROWSE "MPD_API_GET_BROWSE"
#define MPD_API_ADD_TRACK "MPD_API_ADD_TRACK"
#define MPD_API_SET_VOLUME "MPD_API_SET_VOLUME" #define MPD_API_SET_VOLUME "MPD_API_SET_VOLUME"
#define MPD_API_SET_PAUSE "MPD_API_SET_PAUSE" #define MPD_API_SET_PAUSE "MPD_API_SET_PAUSE"
#define MPD_API_SET_PLAY "MPD_API_SET_PLAY" #define MPD_API_SET_PLAY "MPD_API_SET_PLAY"
@ -30,6 +33,10 @@ enum mpd_conn_states {
#define MPD_API_SET_NEXT "MPD_API_SET_PREV" #define MPD_API_SET_NEXT "MPD_API_SET_PREV"
#define MPD_API_SET_PREV "MPD_API_SET_NEXT" #define MPD_API_SET_PREV "MPD_API_SET_NEXT"
#define MPD_API_UPDATE_DB "MPD_API_UPDATE_DB" #define MPD_API_UPDATE_DB "MPD_API_UPDATE_DB"
#define MPD_API_TOGGLE_RANDOM "MPD_API_TOGGLE_RANDOM"
#define MPD_API_TOGGLE_CONSUME "MPD_API_TOGGLE_CONSUME"
#define MPD_API_TOGGLE_SINGLE "MPD_API_TOGGLE_SINGLE"
#define MPD_API_TOGGLE_REPEAT "MPD_API_TOGGLE_REPEAT"
@ -42,3 +49,4 @@ void mpd_loop();
int mpd_put_state(char *buffer); int mpd_put_state(char *buffer);
int mpd_put_current_song(char *buffer); int mpd_put_current_song(char *buffer);
int mpd_put_playlist(char *buffer); int mpd_put_playlist(char *buffer);
int mpd_put_browse(char *buffer, char *path);