mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-01-29 03:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Intermediate commit -- make sure server supports resuming playback from

Browse Source 
an optionally specified time.
This commit is contained in:
casey langen 2018-01-21 21:16:16 -08:00
parent 486bc9c96d
commit 933709be4e
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/server/Constants.h
View File

@ -135,6 +135,7 @@ namespace key {
static const std::string device_id = "device_id";
static const std::string replaygain_mode = "replaygain_mode";
static const std::string preamp_gain = "preamp_gain";
static const std::string time = "time";
}
namespace value {

24
src/plugins/server/WebSocketServer.cpp
View File

@ -821,7 +821,15 @@ void WebSocketServer::RespondWithPlayTracks(connection_hdl connection, json& req
editor->Release();
if (count > 0) {
context.playback->Play(0);
size_t index = request[message::options].value(key::index, 0);
double time = request[message::options].value(key::time, 0.0);
context.playback->Play(count > index ? index : 0);
if (time > 0.0) {
context.playback->SetPosition(time);
}
this->RespondWithSuccess(connection, request);
return;
}
@ -956,16 +964,23 @@ void WebSocketServer::RespondWithQueryCategory(connection_hdl connection, json&
void WebSocketServer::RespondWithPlayAllTracks(connection_hdl connection, json& request) {
size_t index = 0;
std::string filter;
double time = 0.0;
if (request.find(message::options) != request.end()) {
index = request[message::options].value(key::index, 0);
filter = request[message::options].value(key::filter, "");
time = request[message::options].value(key::time, 0.0);
}
ITrackList* tracks = context.dataProvider->QueryTracks(filter.c_str());
if (tracks) {
context.playback->Play(tracks, index);
if (time > 0.0) {
context.playback->SetPosition(time);
}
tracks->Release();
}
@ -978,7 +993,14 @@ void WebSocketServer::RespondWithPlayTracksByCategory(connection_hdl connection,
if (tracks) {
size_t index = request[message::options].value(key::index, 0);
double time = request[message::options].value(key::time, 0.0);
context.playback->Play(tracks, index);
if (time > 0.0) {
context.playback->SetPosition(time);
}
tracks->Release();
}