LTVA1 3 лет назад
Родитель
Сommit
0ba53d73bf
8 измененных файлов с 35 добавлено и 31 удалено
  1. 7 7
      flizzer_tracker.h
  2. 1 1
      input/pattern.c
  3. 17 13
      input_event.c
  4. 1 1
      input_event.h
  5. 1 1
      tracker_engine/tracker_engine.c
  6. 5 5
      util.c
  7. 2 2
      util.h
  8. 1 1
      view/pattern_editor.c

+ 7 - 7
flizzer_tracker.h

@@ -1,14 +1,14 @@
 #pragma once
 
 #include <cli/cli.h>
+#include <dialogs/dialogs.h>
 #include <furi.h>
 #include <gui/gui.h>
+#include <gui/modules/submenu.h>
 #include <input/input.h>
 #include <notification/notification_messages.h>
-#include <dialogs/dialogs.h>
-#include <gui/modules/submenu.h>
-#include <toolbox/stream/file_stream.h>
 #include <stdio.h>
+#include <toolbox/stream/file_stream.h>
 #include <u8g2_glue.h>
 
 #include <gui/modules/text_input.h>
@@ -150,10 +150,10 @@ typedef struct
     TrackerView *tracker_view;
     ViewDispatcher *view_dispatcher;
     TextInput *text_input;
-    Stream* stream;
-    DialogsApp* dialogs;
-    Submenu* pattern_submenu;
-    Submenu* instrument_submenu;
+    Stream *stream;
+    DialogsApp *dialogs;
+    Submenu *pattern_submenu;
+    Submenu *instrument_submenu;
     bool was_it_back_keypress;
     uint32_t current_time;
     uint32_t period;

+ 1 - 1
input/pattern.c

@@ -71,7 +71,7 @@ void edit_instrument(FlizzerTrackerApp *tracker, TrackerSongPatternStep *step, i
     }
 
     clamp(inst, delta, 0, MUS_NOTE_INSTRUMENT_NONE - 1);
-    tracker->current_instrument = inst; //remember last instrument
+    tracker->current_instrument = inst; // remember last instrument
     set_instrument(step, (uint8_t)inst);
 }
 

+ 17 - 13
input_event.c

@@ -1,27 +1,28 @@
 #include "input_event.h"
 
-void submenu_callback(void* context, uint32_t index)
+void submenu_callback(void *context, uint32_t index)
 {
-    FlizzerTrackerApp* tracker = (FlizzerTrackerApp*)context;
+    FlizzerTrackerApp *tracker = (FlizzerTrackerApp *)context;
 
-    switch(tracker->mode)
+    switch (tracker->mode)
     {
         case PATTERN_VIEW:
         {
-            switch(index)
+            switch (index)
             {
                 case SUBMENU_PATTERN_EXIT:
                 {
                     tracker->quit = true;
 
                     static InputEvent inevent = {.sequence = 0, .key = InputKeyLeft, .type = InputTypeMAX};
-                    FlizzerTrackerEvent event = {.type = EventTypeInput, .input = inevent, .period = 0}; //making an event so tracker does not wait for next keypress and exits immediately
+                    FlizzerTrackerEvent event = {.type = EventTypeInput, .input = inevent, .period = 0}; // making an event so tracker does not wait for next keypress and exits immediately
                     furi_message_queue_put(tracker->event_queue, &event, FuriWaitForever);
                     view_dispatcher_switch_to_view(tracker->view_dispatcher, VIEW_TRACKER);
                     break;
                 }
 
-                default: break;
+                default:
+                    break;
             }
 
             break;
@@ -29,26 +30,28 @@ void submenu_callback(void* context, uint32_t index)
 
         case INST_EDITOR_VIEW:
         {
-            switch(index)
+            switch (index)
             {
                 case SUBMENU_INSTRUMENT_EXIT:
                 {
                     tracker->quit = true;
 
                     static InputEvent inevent = {.sequence = 0, .key = InputKeyLeft, .type = InputTypeMAX};
-                    FlizzerTrackerEvent event = {.type = EventTypeInput, .input = inevent, .period = 0}; //making an event so tracker does not wait for next keypress and exits immediately
+                    FlizzerTrackerEvent event = {.type = EventTypeInput, .input = inevent, .period = 0}; // making an event so tracker does not wait for next keypress and exits immediately
                     furi_message_queue_put(tracker->event_queue, &event, FuriWaitForever);
                     view_dispatcher_switch_to_view(tracker->view_dispatcher, VIEW_TRACKER);
                     break;
                 }
 
-                default: break;
+                default:
+                    break;
             }
 
             break;
         }
 
-        default: break;
+        default:
+            break;
     }
 }
 
@@ -103,7 +106,7 @@ void cycle_view(FlizzerTrackerApp *tracker)
         tracker->mode = PATTERN_VIEW;
         tracker->focus = EDIT_PATTERN;
 
-        if(tracker->tracker_engine.song == NULL)
+        if (tracker->tracker_engine.song == NULL)
         {
             stop_song(tracker);
             tracker_engine_set_song(&tracker->tracker_engine, &tracker->song);
@@ -133,7 +136,7 @@ void process_input_event(FlizzerTrackerApp *tracker, FlizzerTrackerEvent *event)
     // Если нажата кнопка "назад", то выходим из цикла, а следовательно и из приложения
     if (event->input.key == InputKeyBack && event->input.type == InputTypeLong)
     {
-        switch(tracker->mode)
+        switch (tracker->mode)
         {
             case PATTERN_VIEW:
             {
@@ -147,7 +150,8 @@ void process_input_event(FlizzerTrackerApp *tracker, FlizzerTrackerEvent *event)
                 break;
             }
 
-            default: break;
+            default:
+                break;
         }
 
         return;

+ 1 - 1
input_event.h

@@ -15,5 +15,5 @@
 #include "input/sequence.h"
 #include "input/songinfo.h"
 
-void submenu_callback(void* context, uint32_t index);
+void submenu_callback(void *context, uint32_t index);
 void process_input_event(FlizzerTrackerApp *tracker, FlizzerTrackerEvent *event);

+ 1 - 1
tracker_engine/tracker_engine.c

@@ -319,7 +319,7 @@ void tracker_engine_advance_tick(TrackerEngine *tracker_engine)
                 if (temp_sequence_position >= song->num_sequence_steps)
                 {
                     tracker_engine->playing = false; // TODO: add song loop handling
-                    //tracker_engine->sequence_position--;
+                    // tracker_engine->sequence_position--;
                     tracker_engine->pattern_position = song->pattern_length - 1;
                 }
 

+ 5 - 5
util.c

@@ -75,7 +75,7 @@ bool is_pattern_empty(TrackerSong *song, uint8_t pattern)
     return true;
 }
 
-void set_empty_pattern(TrackerSongPattern* pattern, uint16_t pattern_length)
+void set_empty_pattern(TrackerSongPattern *pattern, uint16_t pattern_length)
 {
     for (uint16_t i = 0; i < pattern_length; i++)
     {
@@ -115,7 +115,7 @@ bool check_and_allocate_pattern(TrackerSong *song, uint8_t pattern)
     }
 }
 
-void resize_pattern(TrackerSongPattern* pattern, uint16_t old_length, uint16_t new_length)
+void resize_pattern(TrackerSongPattern *pattern, uint16_t old_length, uint16_t new_length)
 {
     TrackerSongPattern temp;
     temp.step = malloc((new_length) * sizeof(TrackerSongPatternStep));
@@ -127,11 +127,11 @@ void resize_pattern(TrackerSongPattern* pattern, uint16_t old_length, uint16_t n
     pattern->step = temp.step;
 }
 
-void change_pattern_length(TrackerSong* song, uint16_t new_length)
+void change_pattern_length(TrackerSong *song, uint16_t new_length)
 {
-    for(int i = 0; i < MAX_PATTERNS; i++)
+    for (int i = 0; i < MAX_PATTERNS; i++)
     {
-        if(song->pattern[i].step)
+        if (song->pattern[i].step)
         {
             resize_pattern(&song->pattern[i], song->pattern_length, new_length);
         }

+ 2 - 2
util.h

@@ -21,7 +21,7 @@ void set_command(TrackerSongPatternStep *step, uint16_t command);
 void play_song(FlizzerTrackerApp *tracker, bool from_cursor);
 void stop_song(FlizzerTrackerApp *tracker);
 
-void set_empty_pattern(TrackerSongPattern* pattern, uint16_t pattern_length);
+void set_empty_pattern(TrackerSongPattern *pattern, uint16_t pattern_length);
 bool is_pattern_empty(TrackerSong *song, uint8_t pattern);
 bool check_and_allocate_pattern(TrackerSong *song, uint8_t pattern);
-void change_pattern_length(TrackerSong* song, uint16_t new_length);
+void change_pattern_length(TrackerSong *song, uint16_t new_length);

+ 1 - 1
view/pattern_editor.c

@@ -181,7 +181,7 @@ void draw_pattern_view(Canvas *canvas, FlizzerTrackerApp *tracker)
 
     for (int i = 0; i < SONG_MAX_CHANNELS; ++i)
     {
-        if(tracker->tracker_engine.channel[i].channel_flags & TEC_DISABLED)
+        if (tracker->tracker_engine.channel[i].channel_flags & TEC_DISABLED)
         {
             canvas_draw_icon(canvas, 13 + 32 * i, PATTERN_EDITOR_Y - 3, &I_channel_off);
         }