From 30414e864be63217f91fe5570cbebc81677838a4 Mon Sep 17 00:00:00 2001 From: Zachary Weiss Date: Wed, 17 Apr 2024 00:19:03 -0400 Subject: [PATCH 1/3] Impl basic favorite ability for WAVs Namely just for the sake of favorite-ing the cart lock/unlock. Requires changes to WAV player ext fap, as to be PR'd from the Momentum-Apps repo. --- applications/main/archive/helpers/archive_browser.h | 1 + applications/main/archive/helpers/archive_files.h | 1 + applications/main/archive/scenes/archive_scene_browser.c | 2 ++ applications/main/archive/views/archive_browser_view.c | 1 + 4 files changed, 5 insertions(+) diff --git a/applications/main/archive/helpers/archive_browser.h b/applications/main/archive/helpers/archive_browser.h index 6966dc8de5..be5c6a4d0e 100644 --- a/applications/main/archive/helpers/archive_browser.h +++ b/applications/main/archive/helpers/archive_browser.h @@ -33,6 +33,7 @@ static const char* known_ext[] = { [ArchiveFileTypeSubghzRemote] = ".txt", [ArchiveFileTypeInfraredRemote] = ".txt", [ArchiveFileTypeBadKb] = ".txt", + [ArchiveFileTypeWAV] = ".wav", [ArchiveFileTypeU2f] = "?", [ArchiveFileTypeApplication] = ".fap", [ArchiveFileTypeJS] = ".js", diff --git a/applications/main/archive/helpers/archive_files.h b/applications/main/archive/helpers/archive_files.h index 61232f9434..2872105ef7 100644 --- a/applications/main/archive/helpers/archive_files.h +++ b/applications/main/archive/helpers/archive_files.h @@ -19,6 +19,7 @@ typedef enum { ArchiveFileTypeSubghzRemote, ArchiveFileTypeInfraredRemote, ArchiveFileTypeBadKb, + ArchiveFileTypeWAV, ArchiveFileTypeU2f, ArchiveFileTypeApplication, ArchiveFileTypeJS, diff --git a/applications/main/archive/scenes/archive_scene_browser.c b/applications/main/archive/scenes/archive_scene_browser.c index 3f37990d11..6942144aa4 100644 --- a/applications/main/archive/scenes/archive_scene_browser.c +++ b/applications/main/archive/scenes/archive_scene_browser.c @@ -32,6 +32,8 @@ const char* archive_get_flipper_app_name(ArchiveFileTypeEnum file_type) { return EXT_PATH("apps/Infrared/ir_remote.fap"); case ArchiveFileTypeBadKb: return "Bad KB"; + case ArchiveFileTypeWAV: + return EXT_PATH("apps/Media/wav_player.fap"); case ArchiveFileTypeU2f: return "U2F"; case ArchiveFileTypeUpdateManifest: diff --git a/applications/main/archive/views/archive_browser_view.c b/applications/main/archive/views/archive_browser_view.c index c29dec9476..8894496e89 100644 --- a/applications/main/archive/views/archive_browser_view.c +++ b/applications/main/archive/views/archive_browser_view.c @@ -34,6 +34,7 @@ static const Icon* ArchiveItemIcons[] = { [ArchiveFileTypeSubghzRemote] = &I_subrem_10px, [ArchiveFileTypeInfraredRemote] = &I_ir_scope_10px, [ArchiveFileTypeBadKb] = &I_badkb_10px, + [ArchiveFileTypeWAV] = &I_music_10px, [ArchiveFileTypeU2f] = &I_u2f_10px, [ArchiveFileTypeApplication] = &I_Apps_10px, [ArchiveFileTypeJS] = &I_js_script_10px, From e4bba06e6e13754e6217f2ed2e2a5c40269cd029 Mon Sep 17 00:00:00 2001 From: Zachary Weiss Date: Wed, 17 Apr 2024 00:27:09 -0400 Subject: [PATCH 2/3] Update WAV fap for compatibility --- applications/external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/external b/applications/external index f6adf06956..f07702622b 160000 --- a/applications/external +++ b/applications/external @@ -1 +1 @@ -Subproject commit f6adf0695636a0c4d048eec8756f66284636c789 +Subproject commit f07702622b868ff1b1dddf49ed03c48f06bb3815 From 8c69bcf32078041b6693ccc0049d5e8695d7cf33 Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Wed, 17 Apr 2024 19:37:09 +0100 Subject: [PATCH 3/3] Sync WAV Player --- applications/external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/external b/applications/external index f07702622b..68b1a9af7c 160000 --- a/applications/external +++ b/applications/external @@ -1 +1 @@ -Subproject commit f07702622b868ff1b1dddf49ed03c48f06bb3815 +Subproject commit 68b1a9af7c8ff1cdb3b9bb269fab014810376f22