mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-05-14 14:38:35 -07:00
Revert music player changes (see desc)
Many users have a big library of music files downloaded on their microSD, migration will stuck for unknown amount of times, so app will hang up for super long time, migration is acceptable for other apps, for this one it will be reverted and it will work as before the app data changes
This commit is contained in:
@@ -10,6 +10,7 @@
|
|||||||
|
|
||||||
#define TAG "MusicPlayer"
|
#define TAG "MusicPlayer"
|
||||||
|
|
||||||
|
#define MUSIC_PLAYER_APP_PATH_FOLDER ANY_PATH("music_player")
|
||||||
#define MUSIC_PLAYER_APP_EXTENSION "*"
|
#define MUSIC_PLAYER_APP_EXTENSION "*"
|
||||||
|
|
||||||
#define MUSIC_PLAYER_SEMITONE_HISTORY_SIZE 4
|
#define MUSIC_PLAYER_SEMITONE_HISTORY_SIZE 4
|
||||||
@@ -306,24 +307,18 @@ int32_t music_player_app(void* p) {
|
|||||||
if(p && strlen(p)) {
|
if(p && strlen(p)) {
|
||||||
furi_string_set(file_path, (const char*)p);
|
furi_string_set(file_path, (const char*)p);
|
||||||
} else {
|
} else {
|
||||||
Storage* storage = furi_record_open(RECORD_STORAGE);
|
furi_string_set(file_path, MUSIC_PLAYER_APP_PATH_FOLDER);
|
||||||
storage_common_migrate(
|
|
||||||
storage, EXT_PATH("music_player"), STORAGE_APP_DATA_PATH_PREFIX);
|
|
||||||
furi_record_close(RECORD_STORAGE);
|
|
||||||
|
|
||||||
furi_string_set(file_path, STORAGE_APP_DATA_PATH_PREFIX);
|
|
||||||
|
|
||||||
DialogsFileBrowserOptions browser_options;
|
DialogsFileBrowserOptions browser_options;
|
||||||
dialog_file_browser_set_basic_options(
|
dialog_file_browser_set_basic_options(
|
||||||
&browser_options, MUSIC_PLAYER_APP_EXTENSION, &I_music_10px);
|
&browser_options, MUSIC_PLAYER_APP_EXTENSION, &I_music_10px);
|
||||||
browser_options.hide_ext = false;
|
browser_options.hide_ext = false;
|
||||||
browser_options.base_path = STORAGE_APP_DATA_PATH_PREFIX;
|
browser_options.base_path = MUSIC_PLAYER_APP_PATH_FOLDER;
|
||||||
|
|
||||||
DialogsApp* dialogs = furi_record_open(RECORD_DIALOGS);
|
DialogsApp* dialogs = furi_record_open(RECORD_DIALOGS);
|
||||||
bool res = dialog_file_browser_show(dialogs, file_path, file_path, &browser_options);
|
bool res = dialog_file_browser_show(dialogs, file_path, file_path, &browser_options);
|
||||||
|
|
||||||
furi_record_close(RECORD_DIALOGS);
|
furi_record_close(RECORD_DIALOGS);
|
||||||
|
|
||||||
if(!res) {
|
if(!res) {
|
||||||
FURI_LOG_E(TAG, "No file selected");
|
FURI_LOG_E(TAG, "No file selected");
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user