Просмотр исходного кода

Revert "WAV Player: Fix unresponsiveness"

This reverts commit 5864b3f1010951a9246381caa5769b4c96053f7b.
Willy-JL 1 год назад
Родитель
Сommit
912ec56c1f
3 измененных файлов с 10 добавлено и 9 удалено
  1. 2 2
      wav_player/wav_parser.h
  2. 7 6
      wav_player/wav_player.c
  3. 1 1
      wav_player/wav_player_view.h

+ 2 - 2
wav_player/wav_parser.h

@@ -8,7 +8,7 @@
 #include <stm32wbxx_ll_dma.h>
 #include <dialogs/dialogs.h>
 #include <notification/notification_messages.h>
-#include <gui/view_holder.h>
+#include <gui/view_dispatcher.h>
 #include <toolbox/stream/file_stream.h>
 
 #include "wav_player_view.h"
@@ -67,7 +67,7 @@ typedef struct {
     bool play;
 
     WavPlayerView* view;
-    ViewHolder* view_holder;
+    ViewDispatcher* view_dispatcher;
     Gui* gui;
     NotificationApp* notification;
 

+ 7 - 6
wav_player/wav_player.c

@@ -5,7 +5,7 @@
 #include <stm32wbxx_ll_dma.h>
 #include <dialogs/dialogs.h>
 #include <notification/notification_messages.h>
-#include <gui/view_holder.h>
+#include <gui/view_dispatcher.h>
 #include <toolbox/stream/file_stream.h>
 #include "wav_player_hal.h"
 #include "wav_parser.h"
@@ -99,13 +99,14 @@ static WavPlayerApp* app_alloc() {
     app->play = true;
 
     app->gui = furi_record_open(RECORD_GUI);
-    app->view_holder = view_holder_alloc();
+    app->view_dispatcher = view_dispatcher_alloc();
     app->view = wav_player_view_alloc();
 
     app->path = furi_string_alloc();
 
-    view_holder_attach_to_gui(app->view_holder, app->gui);
-    view_holder_set_view(app->view_holder, wav_player_view_get_view(app->view));
+    view_dispatcher_add_view(app->view_dispatcher, 0, wav_player_view_get_view(app->view));
+    view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
+    view_dispatcher_switch_to_view(app->view_dispatcher, 0);
 
     app->notification = furi_record_open(RECORD_NOTIFICATION);
     notification_message(app->notification, &sequence_display_backlight_enforce_on);
@@ -114,8 +115,8 @@ static WavPlayerApp* app_alloc() {
 }
 
 static void app_free(WavPlayerApp* app) {
-    view_holder_set_view(app->view_holder, NULL);
-    view_holder_free(app->view_holder);
+    view_dispatcher_remove_view(app->view_dispatcher, 0);
+    view_dispatcher_free(app->view_dispatcher);
     wav_player_view_free(app->view);
     furi_record_close(RECORD_GUI);
 

+ 1 - 1
wav_player/wav_player_view.h

@@ -8,7 +8,7 @@
 #include <stm32wbxx_ll_dma.h>
 #include <dialogs/dialogs.h>
 #include <notification/notification_messages.h>
-#include <gui/view_holder.h>
+#include <gui/view_dispatcher.h>
 #include <toolbox/stream/file_stream.h>
 
 #ifdef __cplusplus