314c02194a
In the first `Music::Refresh` call the lastLength and totalLength are not initialized. The `lastLength` value is read first from the musicService. Naturally in the first itereation that is changed and `UpdateLength()` is called. There the variable `totalLength` is used as well, but that variable isn't initialed to a sensible value yet. This leads to sometimes the `Music.h` screen segfaulting (depending on the random uninitialized data in the `lastLength` variable)
89 lines
2.3 KiB
C++
89 lines
2.3 KiB
C++
/* Copyright (C) 2020 JF, Adam Pigg, Avamander
|
|
|
|
This file is part of InfiniTime.
|
|
|
|
InfiniTime is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published
|
|
by the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
InfiniTime is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
*/
|
|
#pragma once
|
|
|
|
#include <FreeRTOS.h>
|
|
#include <lvgl/src/lv_core/lv_obj.h>
|
|
#include <string>
|
|
#include "displayapp/screens/Screen.h"
|
|
|
|
namespace Pinetime {
|
|
namespace Controllers {
|
|
class MusicService;
|
|
}
|
|
|
|
namespace Applications {
|
|
namespace Screens {
|
|
class Music : public Screen {
|
|
public:
|
|
Music(DisplayApp* app, Pinetime::Controllers::MusicService& music);
|
|
|
|
~Music() override;
|
|
|
|
void Refresh() override;
|
|
|
|
void OnObjectEvent(lv_obj_t* obj, lv_event_t event);
|
|
|
|
private:
|
|
bool OnTouchEvent(TouchEvents event);
|
|
|
|
void UpdateLength();
|
|
|
|
lv_obj_t* btnPrev;
|
|
lv_obj_t* btnPlayPause;
|
|
lv_obj_t* btnNext;
|
|
lv_obj_t* btnVolDown;
|
|
lv_obj_t* btnVolUp;
|
|
lv_obj_t* txtArtist;
|
|
lv_obj_t* txtTrack;
|
|
lv_obj_t* txtPlayPause;
|
|
|
|
lv_obj_t* imgDisc;
|
|
lv_obj_t* imgDiscAnim;
|
|
lv_obj_t* txtTrackDuration;
|
|
|
|
lv_style_t btn_style;
|
|
|
|
/** For the spinning disc animation */
|
|
bool frameB;
|
|
|
|
Pinetime::Controllers::MusicService& musicService;
|
|
|
|
std::string artist;
|
|
std::string album;
|
|
std::string track;
|
|
|
|
/** Total length in seconds */
|
|
int totalLength = 0;
|
|
/** Current length in seconds */
|
|
int currentLength;
|
|
/** Last length */
|
|
int lastLength;
|
|
/** Last time an animation update or timer was incremented */
|
|
TickType_t lastIncrement = 0;
|
|
|
|
bool playing;
|
|
|
|
lv_task_t* taskRefresh;
|
|
|
|
/** Watchapp */
|
|
};
|
|
}
|
|
}
|
|
}
|