CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update track progress in MusicService. Fix #127

Browse Source
This commit is contained in:
Riku Isokoski
2022-03-28 17:00:23 +03:00
parent f82aa71eb0
commit 34858d0a6c
4 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/displayapp/screens/Music.cpp
View File

@@ -152,32 +152,27 @@ Music::~Music() {
void Music::Refresh() {
if (artist != musicService.getArtist()) {
artist = musicService.getArtist();
currentLength = 0;
currentPosition = 0;
lv_label_set_text(txtArtist, artist.data());
}
if (track != musicService.getTrack()) {
track = musicService.getTrack();
currentLength = 0;
currentPosition = 0;
lv_label_set_text(txtTrack, track.data());
}
if (album != musicService.getAlbum()) {
album = musicService.getAlbum();
currentLength = 0;
currentPosition = 0;
}
if (playing != musicService.isPlaying()) {
playing = musicService.isPlaying();
}
// Because we increment this ourselves,
// we can't compare with the old data directly
// have to update it when there's actually new data
// just to avoid unnecessary draws that make UI choppy
if (lastLength != musicService.getProgress()) {
currentLength = musicService.getProgress();
lastLength = currentLength;
if (currentPosition != musicService.getProgress()) {
currentPosition = musicService.getProgress();
UpdateLength();
}
@@ -186,7 +181,7 @@ void Music::Refresh() {
UpdateLength();
}
if (playing == Pinetime::Controllers::MusicService::MusicStatus::Playing) {
if (playing) {
lv_label_set_text_static(txtPlayPause, Symbols::pause);
if (xTaskGetTickCount() - 1024 >= lastIncrement) {
@@ -197,18 +192,12 @@ void Music::Refresh() {
}
frameB = !frameB;
if (currentLength < totalLength) {
currentLength +=
static_cast<int>((static_cast<float>(xTaskGetTickCount() - lastIncrement) / 1024.0f) * musicService.getPlaybackSpeed());
} else {
if (currentPosition >= totalLength) {
// Let's assume the getTrack finished, paused when the timer ends
// and there's no new getTrack being sent to us
// TODO: ideally this would be configurable
playing = false;
}
lastIncrement = xTaskGetTickCount();
UpdateLength();
}
} else {
lv_label_set_text_static(txtPlayPause, Symbols::play);
@@ -221,15 +210,15 @@ void Music::UpdateLength() {
} else if (totalLength > (99 * 60)) {
lv_label_set_text_fmt(txtTrackDuration,
"%02d:%02d/%02d:%02d",
(currentLength / (60 * 60)) % 100,
((currentLength % (60 * 60)) / 60) % 100,
(currentPosition / (60 * 60)) % 100,
((currentPosition % (60 * 60)) / 60) % 100,
(totalLength / (60 * 60)) % 100,
((totalLength % (60 * 60)) / 60) % 100);
} else {
lv_label_set_text_fmt(txtTrackDuration,
"%02d:%02d/%02d:%02d",
(currentLength / 60) % 100,
(currentLength % 60) % 100,
(currentPosition / 60) % 100,
(currentPosition % 60) % 100,
(totalLength / 60) % 100,
(totalLength % 60) % 100);
}

6
src/displayapp/screens/Music.h
View File

@@ -70,10 +70,8 @@ namespace Pinetime {
/** Total length in seconds */
int totalLength = 0;
/** Current length in seconds */
int currentLength;
/** Last length */
int lastLength;
/** Current position in seconds */
int currentPosition;
/** Last time an animation update or timer was incremented */
TickType_t lastIncrement = 0;