Author: Avamander <avamander@gmail.com>
Unified MusicStatus enum constant capitalization with others
src/components/ble/MusicService.h | 4 ++-- src/displayapp/screens/Music.cpp | 14 +++++++-------
diff --git a/src/components/ble/MusicService.h b/src/components/ble/MusicService.h index 00cffb270137702e04f3c677c37faa3209b3ec3c..b365909b2bd852b84519b07147737c0b52595c76 100644 --- a/src/components/ble/MusicService.h +++ b/src/components/ble/MusicService.h @@ -66,8 +66,8 @@ static const char EVENT_MUSIC_VOLUP = 0x05; static const char EVENT_MUSIC_VOLDOWN = 0x06; enum MusicStatus { - NOT_PLAYING = 0x00, - PLAYING = 0x01 + NotPlaying = 0x00, + Playing = 0x01 }; private: static constexpr uint8_t msId[2] = {0x00, 0x01}; diff --git a/src/displayapp/screens/Music.cpp b/src/displayapp/screens/Music.cpp index 63e2e2768415c411e99c422402e9bdb2fdbc01ec..12c7e5adbe0585021fd349948af05d0c10ea82fe 100644 --- a/src/displayapp/screens/Music.cpp +++ b/src/displayapp/screens/Music.cpp @@ -174,10 +174,10 @@ totalLength = musicService.getTrackLength(); UpdateLength(); } - if (playing == Pinetime::Controllers::MusicService::MusicStatus::PLAYING) { + if (playing == Pinetime::Controllers::MusicService::MusicStatus::Playing) { lv_label_set_text(txtPlayPause, "||"); if (xTaskGetTickCount() - 1024 >= lastIncrement) { - + if (frameB) { lv_img_set_src(imgDiscAnim, &disc_f_1); } else { @@ -238,17 +238,17 @@ musicService.event(Controllers::MusicService::EVENT_MUSIC_VOLUP); } else if (obj == btnPrev) { musicService.event(Controllers::MusicService::EVENT_MUSIC_PREV); } else if (obj == btnPlayPause) { - if (playing == Pinetime::Controllers::MusicService::MusicStatus::PLAYING) { + if (playing == Pinetime::Controllers::MusicService::MusicStatus::Playing) { musicService.event(Controllers::MusicService::EVENT_MUSIC_PAUSE); - + // Let's assume it stops playing instantly - playing = Controllers::MusicService::NOT_PLAYING; + playing = Controllers::MusicService::NotPlaying; } else { musicService.event(Controllers::MusicService::EVENT_MUSIC_PLAY); - + // Let's assume it starts playing instantly // TODO: In the future should check for BT connection for better UX - playing = Controllers::MusicService::PLAYING; + playing = Controllers::MusicService::Playing; } } else if (obj == btnNext) { musicService.event(Controllers::MusicService::EVENT_MUSIC_NEXT);