LTVA1 2 лет назад
Родитель
Сommit
3344167796
7 измененных файлов с 17 добавлено и 12 удалено
  1. 4 0
      application.fam
  2. 1 2
      flizzer_tracker.c
  3. 1 1
      init_deinit.c
  4. 2 1
      input/pattern.c
  5. 4 2
      input_event.c
  6. 4 5
      tracker_engine/tracker_engine.c
  7. 1 1
      util.c

+ 4 - 0
application.fam

@@ -6,6 +6,10 @@ App(
     cdefines=["APP_FLIZZER_TRACKER"],
     stack_size=2 * 1024,
     order=90,
+	fap_version=(0, 1),
+	fap_description="An advanced Flipper Zero chiptune tracker with 4 channels",
+	fap_author="LTVA",
+    fap_weburl="https://github.com/LTVA1/flizzer_tracker",
 	fap_icon="flizzer_tracker.png",
 	fap_icon_assets="images",
     fap_category="Music",

+ 1 - 2
flizzer_tracker.c

@@ -25,8 +25,7 @@ void draw_callback(Canvas* canvas, void* ctx) {
         return;
     }
 
-    if(tracker->showing_help)
-    {
+    if(tracker->showing_help) {
         canvas_draw_icon(canvas, 0, 0, &I_help);
         return;
     }

+ 1 - 1
init_deinit.c

@@ -102,7 +102,7 @@ FlizzerTrackerApp* init_tracker(
         tracker);
     submenu_add_item(
         tracker->pattern_submenu, "Settings", SUBMENU_PATTERN_SETTINGS, submenu_callback, tracker);
-        submenu_add_item(
+    submenu_add_item(
         tracker->pattern_submenu, "Help", SUBMENU_PATTERN_HELP, submenu_callback, tracker);
     submenu_add_item(
         tracker->pattern_submenu, "Exit", SUBMENU_PATTERN_EXIT, submenu_callback, tracker);

+ 2 - 1
input/pattern.c

@@ -258,7 +258,8 @@ void pattern_edit_event(FlizzerTrackerApp* tracker, FlizzerTrackerEvent* event)
 
     if(event->input.key == InputKeyDown && event->input.type == InputTypeLong &&
        !(tracker->editing)) {
-        tracker->tracker_engine.pattern_position = tracker->tracker_engine.song->pattern_length - 1; // return to pattern 1st row
+        tracker->tracker_engine.pattern_position =
+            tracker->tracker_engine.song->pattern_length - 1; // return to pattern 1st row
         return;
     }
 

+ 4 - 2
input_event.c

@@ -272,12 +272,14 @@ void cycle_view(FlizzerTrackerApp* tracker) {
 }
 
 void process_input_event(FlizzerTrackerApp* tracker, FlizzerTrackerEvent* event) {
-    if(event->input.key == InputKeyBack && event->input.type == InputTypeShort && tracker->showing_help) {
+    if(event->input.key == InputKeyBack && event->input.type == InputTypeShort &&
+       tracker->showing_help) {
         tracker->showing_help = false;
         return;
     }
 
-    if(tracker->showing_help || tracker->is_loading || tracker->is_saving) return; //do not react until these are finished
+    if(tracker->showing_help || tracker->is_loading || tracker->is_saving)
+        return; //do not react until these are finished
 
     if(event->input.key == InputKeyBack && event->input.type == InputTypeShort &&
        event->period > 0 && event->period < 300 && !(tracker->editing)) {

+ 4 - 5
tracker_engine/tracker_engine.c

@@ -372,13 +372,13 @@ void tracker_engine_advance_channel(TrackerEngine* tracker_engine, uint8_t chan)
 
         if(te_channel->slide_speed != 0) {
             if(te_channel->target_note > te_channel->note) {
-                te_channel->note +=
-                    my_min(te_channel->slide_speed * 4, te_channel->target_note - te_channel->note);
+                te_channel->note += my_min(
+                    te_channel->slide_speed * 4, te_channel->target_note - te_channel->note);
             }
 
             else if(te_channel->target_note < te_channel->note) {
-                te_channel->note -=
-                    my_min(te_channel->slide_speed * 4, te_channel->note - te_channel->target_note);
+                te_channel->note -= my_min(
+                    te_channel->slide_speed * 4, te_channel->note - te_channel->target_note);
             }
         }
 
@@ -518,7 +518,6 @@ void tracker_engine_advance_tick(TrackerEngine* tracker_engine) {
                 else if(
                     pinst && note != MUS_NOTE_RELEASE && note != MUS_NOTE_CUT &&
                     note != MUS_NOTE_NONE) {
-
                     uint8_t prev_adsr_volume = se_channel->adsr.volume;
 
                     if((opcode & 0x7f00) == TE_EFFECT_SLIDE) {

+ 1 - 1
util.c

@@ -21,7 +21,7 @@ void stop_song(FlizzerTrackerApp* tracker) {
 
 void play_song(FlizzerTrackerApp* tracker, bool from_cursor) {
     stop_song(tracker);
-    
+
     reset_buffer(&tracker->sound_engine);
 
     sound_engine_dma_init(