iot/yoradio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.9.174

Browse Source
This commit is contained in:
e2002
2023-04-28 10:36:53 +03:00
parent 629cdef31d
commit 9373e8d90b
12 changed files with 325 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
yoRadio/src/audioI2S/Audio.cpp
View File

@@ -724,11 +724,26 @@ cardLock(false);
afn[i] = toLowerCase(afn[i]);
}
if(endsWith(afn, ".mp3")) m_codec = CODEC_MP3; // m_codec is by default CODEC_NONE
if(endsWith(afn, ".m4a")) m_codec = CODEC_M4A;
if(endsWith(afn, ".aac")) m_codec = CODEC_AAC;
if(endsWith(afn, ".wav")) m_codec = CODEC_WAV;
if(endsWith(afn, ".flac")) m_codec = CODEC_FLAC;
if(endsWith(afn, ".mp3")) {
m_codec = CODEC_MP3; // m_codec is by default CODEC_NONE
if(audio_info) audio_info("format is mp3");
}
if(endsWith(afn, ".m4a")) {
m_codec = CODEC_M4A;
if(audio_info) audio_info("format is aac");
}
if(endsWith(afn, ".aac")) {
m_codec = CODEC_AAC;
if(audio_info) audio_info("format is aac");
}
if(endsWith(afn, ".wav")) {
m_codec = CODEC_WAV;
if(audio_info) audio_info("format is wav");
}
if(endsWith(afn, ".flac")) {
m_codec = CODEC_FLAC;
if(audio_info) audio_info("format is flac");
}
if(m_codec == CODEC_NONE) {
AUDIO_INFO("The %s format is not supported", afn + dotPos);

6
yoRadio/src/audioVS1053/audioVS1053Ex.cpp
View File

@@ -1966,17 +1966,20 @@ bool Audio::connecttoFS(fs::FS &fs, const char* path, uint32_t resumeFilePos) {
if(endsWith(afn, ".mp3")){ // MP3 section
m_codec = CODEC_MP3;
m_f_running = true;
if(audio_info) audio_info("format is mp3");
return true;
} // end MP3 section
if(endsWith(afn, ".m4a")){ // M4A section, iTunes
m_codec = CODEC_M4A;
m_f_running = true;
if(audio_info) audio_info("format is aac");
return true;
} // end M4A section
if(endsWith(afn, ".aac")){ // AAC section, without FileHeader
m_codec = CODEC_AAC;
if(audio_info) audio_info("format is aac");
m_f_running = true;
return true;
} // end AAC section
@@ -1984,18 +1987,21 @@ bool Audio::connecttoFS(fs::FS &fs, const char* path, uint32_t resumeFilePos) {
if(endsWith(afn, ".wav")){ // WAVE section
m_codec = CODEC_WAV;
m_f_running = true;
if(audio_info) audio_info("format is wav");
return true;
} // end WAVE section
if(endsWith(afn, ".flac")) { // FLAC section
m_codec = CODEC_FLAC;
m_f_running = true;
if(audio_info) audio_info("format is flac");
return true;
} // end FLAC section
if(endsWith(afn, ".ogg")) { // FLAC section
m_codec = CODEC_OGG;
m_f_running = true;
if(audio_info) audio_info("format is ogg");
return true;
} // end FLAC section

1
yoRadio/src/core/audiohandlers.h
View File

@@ -39,6 +39,7 @@ void audio_bitrate(const char *info)
}
bool printable(const char *info) {
if(L10N_LANGUAGE!=RU) return true;
bool p = true;
for (int c = 0; c < strlen(info); c++)
{

2
yoRadio/src/core/options.h
View File

@@ -1,7 +1,7 @@
#ifndef options_h
#define options_h
#define YOVERSION "0.9.161"
#define YOVERSION "0.9.174"
/*******************************************************
DO NOT EDIT THIS FILE.

1
yoRadio/src/core/player.cpp
View File

@@ -181,6 +181,7 @@ void Player::_play(uint16_t stationId) {
netserver.requestOnChange(STATION, 0);
netserver.loop();
netserver.loop();
config.setSmartStart(0);
if (config.store.play_mode==PM_WEB?connecttohost(config.station.url):connecttoFS(SD,config.station.url,config.sdResumePos==0?_resumeFilePos:config.sdResumePos-player.sd_min)) {
_status = PLAYING;
if(config.store.play_mode==PM_SDCARD) config.sdResumePos = 0;

1
yoRadio/src/displays/tools/utf8RusGFX.h
View File

@@ -40,6 +40,7 @@ char* DspCore::utf8Rus(const char* str, bool uppercase) {
*iter = toupper(*iter);
}
}
if(L10N_LANGUAGE==EN) return strn;
while (strn[index])
{
if (strn[index] >= 0xBF)