From 7750dfea5bc80cdb784a6cb086a08df3fdcf5de5 Mon Sep 17 00:00:00 2001 From: e2002 Date: Fri, 16 Dec 2022 17:45:09 +0300 Subject: [PATCH] sd_i2s+sd_vs_v5 --- yoRadio/data/www/index.html | 2 +- yoRadio/data/www/script.js.gz | Bin 5415 -> 5415 bytes yoRadio/data/www/style.css.gz | Bin 7157 -> 7168 bytes yoRadio/src/audioVS1053/audioVS1053Ex.cpp | 6 ++++++ yoRadio/src/audioVS1053/audioVS1053Ex.h | 2 ++ yoRadio/src/core/config.cpp | 1 + yoRadio/src/core/config.h | 1 + yoRadio/src/core/netserver.cpp | 5 ++--- yoRadio/src/core/options.h | 2 +- yoRadio/src/core/player.cpp | 3 ++- 10 files changed, 16 insertions(+), 6 deletions(-) diff --git a/yoRadio/data/www/index.html b/yoRadio/data/www/index.html index 94bb9f1..115130f 100644 --- a/yoRadio/data/www/index.html +++ b/yoRadio/data/www/index.html @@ -65,7 +65,7 @@
0:00
- +
volume: 0
diff --git a/yoRadio/data/www/script.js.gz b/yoRadio/data/www/script.js.gz index 275eb6d46f061634a8586e8f61f8ec368a6f8463..3909b63de90af541e71f0d46cf5dd7758993ebd6 100644 GIT binary patch delta 15 WcmZ3kwOor$zMF%?sd*!tq9_0)vIG?X delta 15 WcmZ3kwOor$zMF$1C2u2}q9_0*6$Byx diff --git a/yoRadio/data/www/style.css.gz b/yoRadio/data/www/style.css.gz index a88366a013edb9baa95ef4d2d604ed4e5264b2f2..b3237b2f9a1a75dafe9c1eb8c6f9aaa9a33e1017 100644 GIT binary patch delta 7129 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 ", config.station.title); } break; case VOLUME: sprintf (buf, "{\"vol\": %d}", config.store.volume); break; case NRSSI: sprintf (buf, "{\"rssi\": %d}", rssi); rssi = 255; break; - case SDPOS: sprintf (buf, "{\"sdpos\": %d,\"sdend\": %d,\"sdtpos\": %d,\"sdtend\": %d}", player.getFilePos(), player.getFileSize(), 0, 0); break; + case SDPOS: if(player.getFilePos()>295903) sprintf (buf, "{\"sdpos\": %d,\"sdend\": %d,\"sdtpos\": %d,\"sdtend\": %d}", player.getFilePos(), player.getFileSize(), player.getAudioCurrentTime(), player.getAudioFileDuration()); break; case BITRATE: sprintf (buf, "{\"bitrate\": %d}", config.station.bitrate); break; case MODE: sprintf (buf, "{\"mode\": \"%s\"}", player.mode == PLAYING ? "playing" : "stopped"); break; case EQUALIZER: sprintf (buf, "{\"bass\": %d, \"middle\": %d, \"trebble\": %d}", config.store.bass, config.store.middle, config.store.trebble); break; diff --git a/yoRadio/src/core/options.h b/yoRadio/src/core/options.h index 5b103b0..45e6efc 100644 --- a/yoRadio/src/core/options.h +++ b/yoRadio/src/core/options.h @@ -1,7 +1,7 @@ #ifndef options_h #define options_h -#define YOVERSION "0.8.816" +#define YOVERSION "0.8.833" /******************************************************* DO NOT EDIT THIS FILE. diff --git a/yoRadio/src/core/player.cpp b/yoRadio/src/core/player.cpp index 6587655..6efbe78 100644 --- a/yoRadio/src/core/player.cpp +++ b/yoRadio/src/core/player.cpp @@ -64,6 +64,7 @@ void Player::stopInfo() { } void Player::stop(const char *nttl){ + if(config.store.play_mode==PM_SDCARD) config.sdResumePos = player.getFilePos(); mode = STOPPED; setOutputPins(false); if(nttl) config.setTitle(nttl); @@ -136,7 +137,7 @@ void Player::play(uint16_t stationId, uint32_t filePos) { display.putRequest(NEWSTATION); netserver.requestOnChange(STATION, 0); telnet.printf("##CLI.NAMESET#: %d %s\n", config.store.lastStation, config.station.name); - if (config.store.play_mode==PM_WEB?connecttohost(config.station.url):connecttoFS(SD,config.station.url,filePos)) { + if (config.store.play_mode==PM_WEB?connecttohost(config.station.url):connecttoFS(SD,config.station.url,config.sdResumePos==0?filePos:config.sdResumePos)) { mode = PLAYING; config.setTitle(""); netserver.requestOnChange(TITLE, 0);