mount/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MusicPlayer: set default volume in worker thread to 1.0f and fix issue with leaking memory (#1224)

Browse Source
This commit is contained in:
あく 2022-05-12 16:59:38 +03:00 committed by GitHub
parent 5de72e75df
commit b72a094421
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
applications/music_player/music_player.c
View File

@ -298,7 +298,7 @@ int32_t music_player_app(void* p) {
if(p) { if(p) {
string_cat_str(file_path, p); string_cat_str(file_path, p);
} else { } else {
char* file_name = malloc(256); char file_name[256] = {0};
DialogsApp* dialogs = furi_record_open("dialogs"); DialogsApp* dialogs = furi_record_open("dialogs");
bool res = dialog_file_select_show( bool res = dialog_file_select_show(
dialogs, dialogs,
@ -315,7 +315,6 @@ int32_t music_player_app(void* p) {
string_cat_str(file_path, MUSIC_PLAYER_APP_PATH_FOLDER); string_cat_str(file_path, MUSIC_PLAYER_APP_PATH_FOLDER);
string_cat_str(file_path, "/"); string_cat_str(file_path, "/");
string_cat_str(file_path, file_name); string_cat_str(file_path, file_name);
free(file_name);
} }
if(!music_player_worker_load(music_player->worker, string_get_cstr(file_path))) { if(!music_player_worker_load(music_player->worker, string_get_cstr(file_path))) {

1
applications/music_player/music_player_cli.c
View File

@ -23,6 +23,7 @@ static void music_player_cli(Cli* cli, string_t args, void* context) {
} }
printf("Press CTRL+C to stop\r\n"); printf("Press CTRL+C to stop\r\n");
music_player_worker_set_volume(music_player_worker, 1.0f);
music_player_worker_start(music_player_worker); music_player_worker_start(music_player_worker);
while(!cli_cmd_interrupt_received(cli)) { while(!cli_cmd_interrupt_received(cli)) {
osDelay(50); osDelay(50);

2
applications/music_player/music_player_worker.c
View File

@ -102,6 +102,8 @@ MusicPlayerWorker* music_player_worker_alloc() {
furi_thread_set_context(instance->thread, instance); furi_thread_set_context(instance->thread, instance);
furi_thread_set_callback(instance->thread, music_player_worker_thread_callback); furi_thread_set_callback(instance->thread, music_player_worker_thread_callback);
instance->volume = 1.0f;
return instance; return instance;
} }