diff options
| -rw-r--r-- | lib/libtags/tags.c | 8 | ||||
| -rw-r--r-- | lua/settings.lua | 1 | ||||
| -rw-r--r-- | src/tangara/audio/audio_fsm.cpp | 8 | ||||
| -rw-r--r-- | src/tangara/audio/playlist.cpp | 3 | ||||
| -rw-r--r-- | tools/cmake/common.cmake | 2 |
5 files changed, 14 insertions, 8 deletions
diff --git a/lib/libtags/tags.c b/lib/libtags/tags.c index d3c577dd..b1442e69 100644 --- a/lib/libtags/tags.c +++ b/lib/libtags/tags.c @@ -31,10 +31,10 @@ static const Getter g[] = {tagm4a, Fm4a}, {tagopus, Fopus}, {tagwav, Fwav}, - {tagit, Fit}, - {tagxm, Fxm}, - {tags3m, Fs3m}, - {tagmod, Fmod}, + // {tagit, Fit}, + // {tagxm, Fxm}, + // {tags3m, Fs3m}, + // {tagmod, Fmod}, }; void diff --git a/lua/settings.lua b/lua/settings.lua index bd5be2ee..0c99953f 100644 --- a/lua/settings.lua +++ b/lua/settings.lua @@ -416,6 +416,7 @@ settings.ThemeSettings = SettingsScreen:new { align_content = "flex-start", }, pad_row = 4, + pad_top = 1, } theme_container:add_style(styles.list_item) local theme_chooser = theme_container:Dropdown { diff --git a/src/tangara/audio/audio_fsm.cpp b/src/tangara/audio/audio_fsm.cpp index 7c1b010d..a52d8427 100644 --- a/src/tangara/audio/audio_fsm.cpp +++ b/src/tangara/audio/audio_fsm.cpp @@ -287,9 +287,11 @@ void AudioState::react(const system_fsm::BluetoothEvent& ev) { if (bt.connectionState() != drivers::Bluetooth::ConnectionState::kConnected) { // If BT Disconnected, move to standby state - events::Audio().Dispatch(audio::OutputModeChanged{ - .set_to = drivers::NvsStorage::Output::kHeadphones}); - transit<states::Standby>(); + if (sOutput == sBtOutput) { + events::Audio().Dispatch(audio::OutputModeChanged{ + .set_to = drivers::NvsStorage::Output::kHeadphones}); + transit<states::Standby>(); + } return; } auto dev = sServices->bluetooth().pairedDevice(); diff --git a/src/tangara/audio/playlist.cpp b/src/tangara/audio/playlist.cpp index f0876d4e..6ed5f162 100644 --- a/src/tangara/audio/playlist.cpp +++ b/src/tangara/audio/playlist.cpp @@ -305,6 +305,9 @@ auto Playlist::nextItem(std::span<TCHAR> buf) if (line.ends_with('\n')) { line = line.substr(0, line.size() - 1); } + if (line.ends_with('\r')) { + line = line.substr(0, line.size() - 1); + } return line; } diff --git a/tools/cmake/common.cmake b/tools/cmake/common.cmake index af437ffb..4e7555cc 100644 --- a/tools/cmake/common.cmake +++ b/tools/cmake/common.cmake @@ -5,7 +5,7 @@ # For more information about build system see # https://docs.espressif.com/projects/esp-idf/en/latest/api-guides/build-system.html -set(PROJECT_VER "1.3.1") +set(PROJECT_VER "1.3.2") # esp-idf sets the C++ standard weird. Set cmake vars to match. set(CMAKE_CXX_STANDARD 23) |