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

Merge doom from https://github.com/xMasterX/all-the-plugins

# Conflicts:
#	doom/doom.c
Willy-JL 1 год назад
Родитель
Сommit
5b6ef11052
2 измененных файлов с 3 добавлено и 3 удалено
  1. 2 2
      doom/doom.c
  2. 1 1
      doom/sound.h

+ 2 - 2
doom/doom.c

@@ -795,8 +795,8 @@ static void render_callback(Canvas* const canvas, void* ctx) {
 }
 
 static void input_callback(InputEvent* input_event, void* ctx) {
+    furi_assert(ctx);
     FuriMessageQueue* event_queue = ctx;
-    furi_assert(event_queue);
 
     PluginEvent event = {.type = EventTypeKey, .input = *input_event};
     furi_message_queue_put(event_queue, &event, 0);
@@ -846,8 +846,8 @@ static void doom_state_init(PluginState* const plugin_state) {
 }
 
 static void doom_game_update_timer_callback(void* ctx) {
+    furi_assert(ctx);
     FuriMessageQueue* event_queue = ctx;
-    furi_assert(event_queue);
 
     PluginEvent event = {.type = EventTypeTick};
     furi_message_queue_put(event_queue, &event, 0);

+ 1 - 1
doom/sound.h

@@ -28,7 +28,7 @@ typedef struct {
 typedef struct {
     MusicPlayerModel* model;
     MusicPlayerWorker* worker;
-    FuriMutex** model_mutex;
+    FuriMutex* model_mutex;
 } MusicPlayer;
 
 #endif