mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-03-14 04:18:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

properly implement seeking

Browse Source
This commit is contained in:
Bruno Morais 2019-09-09 13:36:12 -04:00
parent 8824d01816
commit bbdade2514
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/mpris/dbus.cpp
View File

@ -50,6 +50,18 @@ static int seek_wrapper(sd_bus_message* m, void* data, sd_bus_error* err) {
return sd_bus_reply_method_return(m, "");
}
static int set_position_wrapper(sd_bus_message* m, void* data, sd_bus_error* err) {
MPRISRemote* remote = (MPRISRemote*)data;
const char buf[512] = "";
int64_t pos = 0;
int ret = sd_bus_message_read(m, "ox", &buf, &pos);
if (ret < 0) {
return ret;
}
remote->MPRISSeek(pos, false);
return sd_bus_reply_method_return(m, "");
}
static int get_playback_status(sd_bus* bus, const char* path, const char *iface,
const char* prop, sd_bus_message* reply,
void* data, sd_bus_error* err) {
@ -295,7 +307,7 @@ const sd_bus_vtable musikcube_mpp_table[] = {
SD_BUS_PROPERTY("MinimumRate", "d", sd_response_rate, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
SD_BUS_PROPERTY("MaximumRate", "d", sd_response_rate, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
SD_BUS_WRITABLE_PROPERTY("Rate", "d", sd_response_rate, sd_write_nop, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
SD_BUS_METHOD("SetPosition", "ox", "", sd_method_nop, 0), // TODO implement
SD_BUS_METHOD("SetPosition", "ox", "", set_position_wrapper, 0),
SD_BUS_METHOD("OpenUri", "s", "", sd_method_nop, 0),
SD_BUS_SIGNAL("Seeked", "x", 0),
SD_BUS_VTABLE_END

9
src/plugins/mpris/mpris.cpp
View File

@ -234,9 +234,16 @@ void MPRISRemote::MPRISPlay() {
}
}
void MPRISRemote::MPRISSeek(uint64_t position, bool relative) {
void MPRISRemote::MPRISSeek(int64_t position, bool relative) {
double _pos = ((double)position)/(1000*1000);
if (playback) {
if (!relative) {
playback->SetPosition(_pos);
}
else {
double curPos = playback->GetPosition();
playback->SetPosition(curPos+_pos);
}
}
}

2
src/plugins/mpris/mpris.h
View File

@ -76,7 +76,7 @@ class MPRISRemote : public IPlaybackRemote {
void MPRISPlayPause();
void MPRISStop();
void MPRISPlay();
void MPRISSeek(uint64_t position, bool relative=false);
void MPRISSeek(int64_t position, bool relative=false);
const char* MPRISGetPlaybackStatus();
const char* MPRISGetLoopStatus();
void MPRISSetLoopStatus(const char* state);