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

A couple bug fixes to PlaybackService and WebSocketServer.

Browse Source
This commit is contained in:
casey langen 2018-01-21 23:38:13 -08:00
parent 933709be4e
commit 38709f4e2f
2 changed files with 52 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/audio/PlaybackService.cpp
View File

@ -665,6 +665,8 @@ void PlaybackService::CopyFrom(const musik::core::sdk::ITrackList* source) {
}
void PlaybackService::Play(size_t index) {
index = std::min(this->Count(), index);
std::string uri = this->UriAtIndex(index);
if (uri.size()) {

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

@ -736,7 +736,11 @@ void WebSocketServer::RespondWithPlayQueueTracks(connection_hdl connection, json
ITrackListEditor* editor = context.playback->EditPlaylist();
int trackCount = (int)context.playback->Count();
int to = std::min(trackCount, offset + limit);
int to = trackCount;
if (offset >= 0 && limit >= 0) {
to = std::min(trackCount, offset + limit);
}
for (int i = offset; i < to; i++) {
tracks.push_back(std::shared_ptr<ITrack>(context.playback->GetTrack(i), deleter));
@ -748,8 +752,15 @@ void WebSocketServer::RespondWithPlayQueueTracks(connection_hdl connection, json
as soon as this scope ends. */
json data = json::array();
bool idsOnly = request[message::options].value(key::ids_only, false);
for (auto track : tracks) {
data.push_back(this->ReadTrackMetadata(track.get()));
if (idsOnly) {
data.push_back(GetMetadataString(track.get(), key::external_id));
}
else {
data.push_back(this->ReadTrackMetadata(track.get()));
}
}
this->RespondWithOptions(connection, request, {
@ -803,6 +814,8 @@ void WebSocketServer::RespondWithQueryAlbums(connection_hdl connection, json& re
}
void WebSocketServer::RespondWithPlayTracks(connection_hdl connection, json& request) {
bool success = false;
if (request.find(message::options) != request.end()) {
json& options = request[message::options];
@ -818,26 +831,51 @@ void WebSocketServer::RespondWithPlayTracks(connection_hdl connection, json& req
++count;
}
success = true;
editor->Release();
}
}
else if (options.find(key::external_ids) != options.end()) {
json& externalIds = options[key::ids];
if (externalIds.is_array()) {
auto externalIdArray = jsonToStringArray(externalIds);
if (count > 0) {
size_t index = request[message::options].value(key::index, 0);
double time = request[message::options].value(key::time, 0.0);
ITrackList* trackList = context.dataProvider
->QueryTracksByExternalId(
(const char**)externalIdArray.get(),
externalIds.size());
context.playback->Play(count > index ? index : 0);
if (trackList && trackList->Count()) {
ITrackListEditor* editor = context.playback->EditPlaylist();
editor->Clear();
if (time > 0.0) {
context.playback->SetPosition(time);
for (size_t i = 0; i < trackList->Count(); i++) {
editor->Add(trackList->GetId(i));
}
this->RespondWithSuccess(connection, request);
return;
editor->Release();
trackList->Release();
success = true;
}
}
}
}
this->RespondWithInvalidRequest(connection, request[message::name], value::invalid);
if (success) {
size_t index = request[message::options].value(key::index, 0);
double time = request[message::options].value(key::time, 0.0);
context.playback->Play(index);
if (time > 0.0) {
context.playback->SetPosition(time);
}
this->RespondWithSuccess(connection, request);
}
else {
this->RespondWithInvalidRequest(connection, request[message::name], value::invalid);
}
}
ITrackList* WebSocketServer::QueryTracksByCategory(json& request, int& limit, int& offset) {
@ -976,7 +1014,7 @@ void WebSocketServer::RespondWithPlayAllTracks(connection_hdl connection, json&
if (tracks) {
context.playback->Play(tracks, index);
if (time > 0.0) {
context.playback->SetPosition(time);
}