diff options
author | Avamander <avamander@gmail.com> | 2021-04-18 20:28:14 +0300 |
---|---|---|
committer | Avamander <avamander@gmail.com> | 2021-04-24 11:39:53 +0300 |
commit | 40d45d923b033363ff1304b47eac238dd4495a57 (patch) | |
tree | 9e7b668fdf23a7be892b8e2bf8b4d62b884cee06 /src/displayapp/screens/Music.h | |
parent | e56ebb8bd621cc8838e86fa032d680a6e7a35ffc (diff) |
Reformatted all the files according to clang-format style
Diffstat (limited to 'src/displayapp/screens/Music.h')
-rw-r--r-- | src/displayapp/screens/Music.h | 61 |
1 files changed, 29 insertions, 32 deletions
diff --git a/src/displayapp/screens/Music.h b/src/displayapp/screens/Music.h index 55859811..c7da233e 100644 --- a/src/displayapp/screens/Music.h +++ b/src/displayapp/screens/Music.h @@ -30,45 +30,43 @@ namespace Pinetime { namespace Applications { namespace Screens { class Music : public Screen { - public: - Music(DisplayApp *app, Pinetime::Controllers::MusicService &music); - + public: + Music(DisplayApp* app, Pinetime::Controllers::MusicService& music); + ~Music() override; - + bool Refresh() override; - - - - void OnObjectEvent(lv_obj_t *obj, lv_event_t event); - - private: + + 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_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; + /** For the spinning disc animation */ bool frameB; - + bool displayVolumeButtons = false; - Pinetime::Controllers::MusicService &musicService; - + Pinetime::Controllers::MusicService& musicService; + std::string artist; std::string album; std::string track; - + /** Total length in seconds */ int totalLength; /** Current length in seconds */ @@ -77,11 +75,10 @@ namespace Pinetime { int lastLength; /** Last time an animation update or timer was incremented */ TickType_t lastIncrement = 0; - + bool playing; - + /** Watchapp */ - }; } } |