mirror/TonUINO
1
0
Fork 0
mirror of https://github.com/xfjx/TonUINO.git synced 2025-08-22 01:22:49 +02:00
Code Issues Releases Wiki Activity

Fixed the fast forward issue wihtin the voice menu

Browse Source
This commit is contained in:
Thorsten Voß
2018-12-19 20:06:02 +01:00
parent 889a372885
commit 96e8b95bd1
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Tonuino.ino
View File

@@ -328,7 +328,9 @@ void waitForTrackToFinish() {
#define TIMEOUT 1000 #define TIMEOUT 1000
do { do {
} while (!isPlaying() && millis() < currentTime + TIMEOUT); } while (!isPlaying() && millis() < currentTime + TIMEOUT);
delay(1000);
do { do {
delay(50);
} while (isPlaying()); } while (isPlaying());
} }
@@ -647,21 +649,21 @@ int voiceMenu(int numberOfOptions, int startMessage, int messageOffset,
if (upButton.pressedFor(LONG_PRESS)) { if (upButton.pressedFor(LONG_PRESS)) {
returnValue = min(returnValue + 10, numberOfOptions); returnValue = min(returnValue + 10, numberOfOptions);
Serial.println(returnValue); Serial.println(returnValue);
mp3.pause(); //mp3.pause();
mp3.playMp3FolderTrack(messageOffset + returnValue); mp3.playMp3FolderTrack(messageOffset + returnValue);
waitForTrackToFinish(); waitForTrackToFinish();
if (preview) { /*if (preview) {
if (previewFromFolder == 0) if (previewFromFolder == 0)
mp3.playFolderTrack(returnValue, 1); mp3.playFolderTrack(returnValue, 1);
else else
mp3.playFolderTrack(previewFromFolder, returnValue); mp3.playFolderTrack(previewFromFolder, returnValue);
} }*/
ignoreUpButton = true; ignoreUpButton = true;
} else if (upButton.wasReleased()) { } else if (upButton.wasReleased()) {
if (!ignoreUpButton) { if (!ignoreUpButton) {
returnValue = min(returnValue + 1, numberOfOptions); returnValue = min(returnValue + 1, numberOfOptions);
Serial.println(returnValue); Serial.println(returnValue);
mp3.pause(); //mp3.pause();
mp3.playMp3FolderTrack(messageOffset + returnValue); mp3.playMp3FolderTrack(messageOffset + returnValue);
if (preview) { if (preview) {
waitForTrackToFinish(); waitForTrackToFinish();
@@ -677,24 +679,24 @@ int voiceMenu(int numberOfOptions, int startMessage, int messageOffset,
if (downButton.pressedFor(LONG_PRESS)) { if (downButton.pressedFor(LONG_PRESS)) {
returnValue = max(returnValue - 10, 1); returnValue = max(returnValue - 10, 1);
Serial.println(returnValue); Serial.println(returnValue);
mp3.pause(); //mp3.pause();
mp3.playMp3FolderTrack(messageOffset + returnValue); mp3.playMp3FolderTrack(messageOffset + returnValue);
waitForTrackToFinish(); waitForTrackToFinish();
if (preview) { /*if (preview) {
if (previewFromFolder == 0) if (previewFromFolder == 0)
mp3.playFolderTrack(returnValue, 1); mp3.playFolderTrack(returnValue, 1);
else else
mp3.playFolderTrack(previewFromFolder, returnValue); mp3.playFolderTrack(previewFromFolder, returnValue);
} }*/
ignoreDownButton = true; ignoreDownButton = true;
} else if (downButton.wasReleased()) { } else if (downButton.wasReleased()) {
if (!ignoreDownButton) { if (!ignoreDownButton) {
returnValue = max(returnValue - 1, 1); returnValue = max(returnValue - 1, 1);
Serial.println(returnValue); Serial.println(returnValue);
mp3.pause(); //mp3.pause();
mp3.playMp3FolderTrack(messageOffset + returnValue); mp3.playMp3FolderTrack(messageOffset + returnValue);
waitForTrackToFinish();
if (preview) { if (preview) {
waitForTrackToFinish();
if (previewFromFolder == 0) if (previewFromFolder == 0)
mp3.playFolderTrack(returnValue, 1); mp3.playFolderTrack(returnValue, 1);
else else
@@ -880,5 +882,3 @@ void dump_byte_array(byte * buffer, byte bufferSize) {
Serial.print(buffer[i], HEX); Serial.print(buffer[i], HEX);
} }
} }