Browse Source

Making some bools better readable

master
Torsten Stauder 4 years ago
parent
commit
97e5f7820f
  1. 18
      src/AudioPlayer.cpp

18
src/AudioPlayer.cpp

@ -287,7 +287,7 @@ void AudioPlayer_Task(void *parameter) {
if (trackQStatus == pdPASS || gPlayProperties.trackFinished || trackCommand != 0) { if (trackQStatus == pdPASS || gPlayProperties.trackFinished || trackCommand != 0) {
if (trackQStatus == pdPASS) { if (trackQStatus == pdPASS) {
if (gPlayProperties.pausePlay) { if (gPlayProperties.pausePlay) {
gPlayProperties.pausePlay = !gPlayProperties.pausePlay;
gPlayProperties.pausePlay = false;
} }
audio->stopSong(); audio->stopSong();
#if (LANGUAGE == DE) #if (LANGUAGE == DE)
@ -321,8 +321,8 @@ void AudioPlayer_Task(void *parameter) {
if (gPlayProperties.sleepAfterCurrentTrack) { // Go to sleep if "sleep after track" was requested if (gPlayProperties.sleepAfterCurrentTrack) { // Go to sleep if "sleep after track" was requested
System_RequestSleep(); System_RequestSleep();
break; break;
} if (!gPlayProperties.repeatCurrentTrack)
{ // If endless-loop requested, track-number will not be incremented
}
if (!gPlayProperties.repeatCurrentTrack) { // If endless-loop requested, track-number will not be incremented
gPlayProperties.currentTrackNumber++; gPlayProperties.currentTrackNumber++;
} else { } else {
Log_Println((char *) FPSTR(repeatTrackDueToPlaymode), LOGLEVEL_INFO); Log_Println((char *) FPSTR(repeatTrackDueToPlaymode), LOGLEVEL_INFO);
@ -363,10 +363,10 @@ void AudioPlayer_Task(void *parameter) {
case NEXTTRACK: case NEXTTRACK:
if (gPlayProperties.pausePlay) { if (gPlayProperties.pausePlay) {
audio->pauseResume(); audio->pauseResume();
gPlayProperties.pausePlay = !gPlayProperties.pausePlay;
gPlayProperties.pausePlay = false;
} }
if (gPlayProperties.repeatCurrentTrack) { // End loop if button was pressed if (gPlayProperties.repeatCurrentTrack) { // End loop if button was pressed
gPlayProperties.repeatCurrentTrack = !gPlayProperties.repeatCurrentTrack;
gPlayProperties.repeatCurrentTrack = false;
char rBuf[2]; char rBuf[2];
snprintf(rBuf, 2, "%u", AudioPlayer_GetRepeatMode()); snprintf(rBuf, 2, "%u", AudioPlayer_GetRepeatMode());
#ifdef MQTT_ENABLE #ifdef MQTT_ENABLE
@ -395,10 +395,10 @@ void AudioPlayer_Task(void *parameter) {
case PREVIOUSTRACK: case PREVIOUSTRACK:
if (gPlayProperties.pausePlay) { if (gPlayProperties.pausePlay) {
audio->pauseResume(); audio->pauseResume();
gPlayProperties.pausePlay = !gPlayProperties.pausePlay;
gPlayProperties.pausePlay = false;
} }
if (gPlayProperties.repeatCurrentTrack) { // End loop if button was pressed if (gPlayProperties.repeatCurrentTrack) { // End loop if button was pressed
gPlayProperties.repeatCurrentTrack = !gPlayProperties.repeatCurrentTrack;
gPlayProperties.repeatCurrentTrack = false;
char rBuf[2]; char rBuf[2];
snprintf(rBuf, 2, "%u", AudioPlayer_GetRepeatMode()); snprintf(rBuf, 2, "%u", AudioPlayer_GetRepeatMode());
#ifdef MQTT_ENABLE #ifdef MQTT_ENABLE
@ -448,7 +448,7 @@ void AudioPlayer_Task(void *parameter) {
case FIRSTTRACK: case FIRSTTRACK:
if (gPlayProperties.pausePlay) { if (gPlayProperties.pausePlay) {
audio->pauseResume(); audio->pauseResume();
gPlayProperties.pausePlay = !gPlayProperties.pausePlay;
gPlayProperties.pausePlay = false;
} }
if (gPlayProperties.currentTrackNumber > 0) { if (gPlayProperties.currentTrackNumber > 0) {
gPlayProperties.currentTrackNumber = 0; gPlayProperties.currentTrackNumber = 0;
@ -472,7 +472,7 @@ void AudioPlayer_Task(void *parameter) {
case LASTTRACK: case LASTTRACK:
if (gPlayProperties.pausePlay) { if (gPlayProperties.pausePlay) {
audio->pauseResume(); audio->pauseResume();
gPlayProperties.pausePlay = !gPlayProperties.pausePlay;
gPlayProperties.pausePlay = false;
} }
if (gPlayProperties.currentTrackNumber + 1 < gPlayProperties.numberOfTracks) { if (gPlayProperties.currentTrackNumber + 1 < gPlayProperties.numberOfTracks) {
gPlayProperties.currentTrackNumber = gPlayProperties.numberOfTracks - 1; gPlayProperties.currentTrackNumber = gPlayProperties.numberOfTracks - 1;

Loading…
Cancel
Save