Merge branch 'Eng1n33r:dev' into subbrute-rev3

applications/plugins/arkanoid/arkanoid_game.c

@@ -10,6 +10,7 @@
 
 #define FLIPPER_LCD_WIDTH 128
 #define FLIPPER_LCD_HEIGHT 64
+#define MAX_SPEED 3
 
 typedef enum { EventTypeTick, EventTypeKey } EventType;
 
@@ -51,6 +52,7 @@ typedef struct {
     unsigned int brickCount; //Amount of bricks hit
     int tick; //Tick counter
     bool gameStarted; // Did the game start?
+    int speed; // Ball speed
 } ArkanoidState;
 
 typedef struct {
@@ -72,12 +74,18 @@ int rand_range(int min, int max) {
 
 void move_ball(Canvas* canvas, ArkanoidState* st) {
     st->tick++;
+
+    int current_speed = abs(st->speed-1 - MAX_SPEED);
+    if (st->tick % current_speed != 0 && st->tick % (current_speed + 1) != 0) {
+        return;
+    }
+
     if(st->ball_state.released) {
         //Move ball
         if(abs(st->ball_state.dx) == 2) {
             st->ball_state.xb += st->ball_state.dx / 2;
             // 2x speed is really 1.5 speed
-            if(st->tick % 2 == 0) st->ball_state.xb += st->ball_state.dx / 2;
+            if((st->tick / current_speed) % 2 == 0) st->ball_state.xb += st->ball_state.dx / 2;
         } else {
             st->ball_state.xb += st->ball_state.dx;
         }
@@ -286,6 +294,7 @@ static void arkanoid_state_init(ArkanoidState* arkanoid_state) {
     arkanoid_state->ROWS = 4;
     arkanoid_state->ball_state.dx = -1;
     arkanoid_state->ball_state.dy = -1;
+    arkanoid_state->speed = 2;
     arkanoid_state->bounced = false;
     arkanoid_state->lives = 3;
     arkanoid_state->level = 1;
@@ -414,8 +423,14 @@ int32_t arkanoid_game_app(void* p) {
                         }
                         break;
                     case InputKeyUp:
+                        if(arkanoid_state->speed < MAX_SPEED) {
+                            arkanoid_state->speed++;
+                        }
                         break;
                     case InputKeyDown:
+                        if(arkanoid_state->speed > 1) {
+                            arkanoid_state->speed--;
+                        }
                         break;
                     case InputKeyOk:
                         if(arkanoid_state->gameStarted == false) {

applications/plugins/music_player/music_player.c

@@ -248,12 +248,16 @@ static void music_player_worker_callback(
     view_port_update(music_player->view_port);
 }
 
+void music_player_clear(MusicPlayer* instance) {
+    memset(instance->model->duration_history, 0xff, MUSIC_PLAYER_SEMITONE_HISTORY_SIZE);
+    memset(instance->model->semitone_history, 0xff, MUSIC_PLAYER_SEMITONE_HISTORY_SIZE);
+    music_player_worker_clear(instance->worker);
+}
+
 MusicPlayer* music_player_alloc() {
     MusicPlayer* instance = malloc(sizeof(MusicPlayer));
 
     instance->model = malloc(sizeof(MusicPlayerModel));
-    memset(instance->model->duration_history, 0xff, MUSIC_PLAYER_SEMITONE_HISTORY_SIZE);
-    memset(instance->model->semitone_history, 0xff, MUSIC_PLAYER_SEMITONE_HISTORY_SIZE);
     instance->model->volume = 3;
 
     instance->model_mutex = furi_mutex_alloc(FuriMutexTypeNormal);
@@ -265,6 +269,8 @@ MusicPlayer* music_player_alloc() {
         instance->worker, MUSIC_PLAYER_VOLUMES[instance->model->volume]);
     music_player_worker_set_callback(instance->worker, music_player_worker_callback, instance);
 
+    music_player_clear(instance);
+
     instance->view_port = view_port_alloc();
     view_port_draw_callback_set(instance->view_port, render_callback, instance);
     view_port_input_callback_set(instance->view_port, input_callback, instance);
@@ -299,7 +305,7 @@ int32_t music_player_app(void* p) {
 
     do {
         if(p && strlen(p)) {
-            furi_string_cat(file_path, (const char*)p);
+            furi_string_set(file_path, (const char*)p);
         } else {
             furi_string_set(file_path, MUSIC_PLAYER_APP_PATH_FOLDER);
 
@@ -350,7 +356,9 @@ int32_t music_player_app(void* p) {
         }
 
         music_player_worker_stop(music_player->worker);
-    } while(0);
+        if(p && strlen(p)) break; // Exit instead of going to browser if launched with arg
+        music_player_clear(music_player);
+    } while(1);
 
     furi_string_free(file_path);
     music_player_free(music_player);

applications/plugins/music_player/music_player_worker.c

@@ -108,6 +108,10 @@ MusicPlayerWorker* music_player_worker_alloc() {
     return instance;
 }
 
+void music_player_worker_clear(MusicPlayerWorker* instance) {
+    NoteBlockArray_reset(instance->notes);
+}
+
 void music_player_worker_free(MusicPlayerWorker* instance) {
     furi_assert(instance);
     furi_thread_free(instance->thread);
@@ -129,6 +133,7 @@ static bool is_space(const char c) {
 
 static size_t extract_number(const char* string, uint32_t* number) {
     size_t ret = 0;
+    *number = 0;
     while(is_digit(*string)) {
         *number *= 10;
         *number += (*string - '0');
@@ -140,6 +145,7 @@ static size_t extract_number(const char* string, uint32_t* number) {
 
 static size_t extract_dots(const char* string, uint32_t* number) {
     size_t ret = 0;
+    *number = 0;
     while(*string == '.') {
         *number += 1;
         string++;

applications/plugins/music_player/music_player_worker.h

@@ -18,6 +18,8 @@ typedef struct MusicPlayerWorker MusicPlayerWorker;
 
 MusicPlayerWorker* music_player_worker_alloc();
 
+void music_player_worker_clear(MusicPlayerWorker* instance);
+
 void music_player_worker_free(MusicPlayerWorker* instance);
 
 bool music_player_worker_load(MusicPlayerWorker* instance, const char* file_path);