From 5ace442363ae7c112fd0bcb1baf16e707501dd80 Mon Sep 17 00:00:00 2001
From: Carmine De Rosa <dslaky@gmail.com>
Date: Fri, 15 May 2020 20:18:02 +0200
Subject: [PATCH] load pattern globally

---
 C/loaders.cpp |  25 +++++++++----------------
 C/main.cpp    |  14 ++++++++++----
 C/players.cpp |   6 +++---
 C/sonquencer  | Bin 19920 -> 20040 bytes
 4 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/C/loaders.cpp b/C/loaders.cpp
index 7ebade4..4017795 100644
--- a/C/loaders.cpp
+++ b/C/loaders.cpp
@@ -31,8 +31,8 @@ int loadBank(int bank) {
 }
 
 
-void loadPattern(int pattern) {
-  printf("\nLoading pattern %d ...\n", pattern);
+void loadPattern(int patternNum) {
+  printf("\nLoading pattern %d ...\n", patternNum);
 
   FILE *fp;
   char *line = NULL;
@@ -45,15 +45,12 @@ void loadPattern(int pattern) {
   int cols = 0;
   int rows = 0;
 
-  int patternArray[10][32];
-
-  sprintf(patternFile, "patterns/pattern%d", pattern);
+  sprintf(patternFile, "patterns/pattern%d", patternNum);
   fp = fopen(patternFile, "r");
   if(fp == NULL) {exit(EXIT_FAILURE);}
 
   while ((read = getline(&line, &len, fp)) != -1) {
     //printf("Retrieved line of length %zu:\n", read);
-
     if(lineCount == 0) { bank = line[10]-'0'; }
     if(lineCount == 1) { rows = line[10]-'0'; }
 
@@ -61,30 +58,26 @@ void loadPattern(int pattern) {
       if(lineCount == 2) {
         cols = read-1;
       }
-
       for(int i=0; i<cols; i++) {
-        patternArray[lineCount-2][i] = line[i];
+        pattern[lineCount-2][i] = line[i];
       }
-
     }
-
     lineCount++;
   }
 
-  printf("Pattern: %d\nBank: %d\nColumns: %d\nRows: %d\n", pattern, bank, cols, rows);
+  printf("Pattern: %d\nBank: %d\nColumns: %d\nRows: %d\n", patternNum, bank, cols, rows);
+
+  matrix[0] = rows;
+  matrix[1] = cols;
 
   for(int i=0; i<rows; i++) {
-    //printf("\nCol %d: ", i);
     for(int y=0; y<cols; y++) {
-      printf("%d ", patternArray[i][y]-'0');
+      printf("%d ", pattern[i][y]-'0');
     }
     printf("\n");
   }
 
-  printf("\n");
-
   fclose(fp);
   if(line) {free(line);}
-
   loadBank(bank);
 }
diff --git a/C/main.cpp b/C/main.cpp
index 829b009..a0b516e 100644
--- a/C/main.cpp
+++ b/C/main.cpp
@@ -9,8 +9,12 @@
 #include "SDL_image.h"
 
 #define NUM_WAVEFORMS 4
+#define PATTERN_ROWS 10
+#define PATTERN_COLS 32
 
 Mix_Chunk* samples[NUM_WAVEFORMS];
+int pattern[PATTERN_ROWS][PATTERN_COLS];
+int matrix[] = {PATTERN_ROWS, PATTERN_COLS};
 
 #include "players.cpp"
 #include "loaders.cpp"
@@ -20,7 +24,8 @@ int main(int argc, char** argv) {
   bool done = false;
   bool play = true;
   int timer = 0;
-  int step = 500;
+  int step = 0;
+  int stepDuration = 500;
 
   SDL_Window* window;
   SDL_Renderer* renderer;
@@ -41,7 +46,6 @@ int main(int argc, char** argv) {
   if(loadBank(1) == false) {return -1;}
   loadPattern(2);
 
-  /*
   while (!done) {
     bool gotEvent = SDL_PollEvent(&event);
 
@@ -91,9 +95,11 @@ int main(int argc, char** argv) {
 
     }
 
-    playStep(play, &timer, &step);
+    if(play) {
+      playPattern(&timer, stepDuration, &step);
+    }
   }
-  */
+
 
   for( int i = 0; i < NUM_WAVEFORMS; i++ ) {
     Mix_FreeChunk(samples[i]);
diff --git a/C/players.cpp b/C/players.cpp
index 8a042a1..d836e7c 100644
--- a/C/players.cpp
+++ b/C/players.cpp
@@ -1,10 +1,10 @@
 
-void playStep(bool play, int *timer, int *step) {
-  *timer = *timer >= *step ? 0 : *timer+1;
+void playPattern(int *timer, int duration, int *step) {
+  *timer = *timer >= duration ? 0 : *timer+1;
   usleep(1000);
 
   if(*timer == 0) {
-    printf("%d\n", *timer);
+    //printf("%d\n", *timer);
 
     Mix_PlayChannel(-1, samples[1], 0);
   }
diff --git a/C/sonquencer b/C/sonquencer
index ac7649531c21000b3be8498456285111339a3834..6662077b453a9536052f3d37b0bda8fcf45c46c4 100755
GIT binary patch
delta 4092
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
Qwgsd;^L1%1+fw5CH#(rMXaE2J

delta 3314
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
Wr<VD|RC#)o5BHY&=maQOKK=hCWZ6sr