From 8b1f3db40684890e95b0098e56ebd90603d269e4 Mon Sep 17 00:00:00 2001
From: Carmine De Rosa <dslaky@gmail.com>
Date: Sat, 16 May 2020 09:35:33 +0200
Subject: [PATCH] set sample

---
 C/inputs.cpp        |  18 ++++++++++++++++++
 C/loaders.cpp       |   6 ++----
 C/main.cpp          |  39 +++++++++------------------------------
 C/patterns/pattern1 |   8 ++++----
 C/players.cpp       |  14 ++++++++++----
 C/sonquencer        | Bin 20040 -> 20088 bytes
 6 files changed, 43 insertions(+), 42 deletions(-)
 create mode 100644 C/inputs.cpp

diff --git a/C/inputs.cpp b/C/inputs.cpp
new file mode 100644
index 0000000..bf732e5
--- /dev/null
+++ b/C/inputs.cpp
@@ -0,0 +1,18 @@
+void inputActions(SDL_Event e, int step) {
+  switch (e.key.keysym.sym) {
+    case SDLK_1:
+      setSample(1, step);
+      break;
+    case SDLK_2:
+      setSample(2, step);
+      break;
+    case SDLK_3:
+      setSample(3, step);
+      break;
+    case SDLK_4:
+      setSample(4, step);
+      break;
+    default:
+      break;
+  }
+}
diff --git a/C/loaders.cpp b/C/loaders.cpp
index 4017795..10a0b39 100644
--- a/C/loaders.cpp
+++ b/C/loaders.cpp
@@ -50,16 +50,14 @@ void loadPattern(int patternNum) {
   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'; }
-
     if(lineCount > 1) {
       if(lineCount == 2) {
         cols = read-1;
       }
       for(int i=0; i<cols; i++) {
-        pattern[lineCount-2][i] = line[i];
+        pattern[lineCount-2][i] = line[i]-'0';
       }
     }
     lineCount++;
@@ -72,7 +70,7 @@ void loadPattern(int patternNum) {
 
   for(int i=0; i<rows; i++) {
     for(int y=0; y<cols; y++) {
-      printf("%d ", pattern[i][y]-'0');
+      printf("%d ", pattern[i][y]);
     }
     printf("\n");
   }
diff --git a/C/main.cpp b/C/main.cpp
index 8f3a7e6..09ac52d 100644
--- a/C/main.cpp
+++ b/C/main.cpp
@@ -18,6 +18,7 @@ int matrix[] = {PATTERN_ROWS, PATTERN_COLS};
 
 #include "players.cpp"
 #include "loaders.cpp"
+#include "inputs.cpp"
 
 int main(int argc, char** argv) {
 
@@ -52,43 +53,21 @@ int main(int argc, char** argv) {
     while (!done && gotEvent) {
       switch (event.type) {
         case SDL_KEYDOWN:
-
-          switch (event.key.keysym.sym) {
-            case SDLK_ESCAPE:
-                Mix_CloseAudio();
-                SDL_Quit();
-                return 0;
-              break;
-            case SDLK_1:
-              playSample(1);
-              break;
-            case SDLK_2:
-              playSample(2);
-              break;
-            case SDLK_3:
-              playSample(3);
-              break;
-            case SDLK_4:
-              playSample(4);
-              break;
-            case SDLK_5:
-              playSample(5);
-              break;
-            case SDLK_6:
-              playSample(6);
-              break;
-
-            default:
-              break;
+          if(event.key.keysym.sym == SDLK_ESCAPE) {
+            Mix_CloseAudio();
+            SDL_Quit();
+            return 0;
+          } else {
+            inputActions(event, step);
           }
           break;
-
         case SDL_QUIT:
           done = true;
           break;
-
         default:
           break;
+
+
       }
 
       if( !done ) { gotEvent = SDL_PollEvent(&event); }
diff --git a/C/patterns/pattern1 b/C/patterns/pattern1
index fb04e98..9ea7a1d 100644
--- a/C/patterns/pattern1
+++ b/C/patterns/pattern1
@@ -1,6 +1,6 @@
 bank      1
 rows      4
-00011010
-01100010
-00011000
-10000000
+00000000
+00000000
+00000000
+00000000
diff --git a/C/players.cpp b/C/players.cpp
index a3fa051..544b71f 100644
--- a/C/players.cpp
+++ b/C/players.cpp
@@ -5,14 +5,20 @@ void playPattern(int *timer, int duration, int *step) {
 
   if(*timer == 0) {
     for(int i=0; i<matrix[0]; i++) {
-      if(pattern[i][*step-1]-'0' == 1) {
+      if(pattern[i][*step-1] == 1) {
         Mix_PlayChannel(-1, samples[i], 0);
       }
     }
-    *step = *step < matrix[1]-1 ? *step+1 : 1;
+    *step = *step < matrix[1] ? *step+1 : 1;
   }
 }
 
-void playSample(int sample) {
-  Mix_PlayChannel(-1, samples[sample-1], 0);
+void setSample(int sample, int step) {
+  pattern[sample-1][step-1] = 1;
+  for(int i=0; i<matrix[0]; i++) {
+    for(int y=0; y<matrix[1]; y++) {
+      printf("%d ", pattern[i][y]);
+    }
+    printf("\n");
+  }
 }
diff --git a/C/sonquencer b/C/sonquencer
index 41d13f1e051a0dfe36caf243b8802e3d930b6dac..a5d1c523dc6d457f3022c3fc32705be9a88e6e56 100755
GIT binary patch
delta 2761
zcmaJ@dr(}}9X@A)z#_@=S{6bQb|Eprgak}vC4{(Zxb+f=i6*O&(a8&HaV#3M%e2-V
z(k>XbTc+SiMtqC|qmzeiXNYT@m^$o|puitGB#xHpWG2L+)4M_~);w;SmD}%}ySozq
z=$+wr&iQ_?@BHp}cNl$(s&CQmRaEUMy<!|oC*m1nS#+JTJV`&5vpO2GS#A2sYIBH9
zd~MWW(iki?L`<1|iycHB8FGka#GcQJvsL;EE6k}}Kt0O?Qk4BQXKDVbA2iJ;Md|bj
zIUr30G6N~UFC(PtJo{r#ahuieo$-5=fHc#!LkmcXPoZ+JeBhEi^mU3%$48Po_BtJe
zqVI?l<=q1*t9iB*^*%NtsXDS$AgZ@KAgOY1z!m+mKtM0x|1^|lb&#_>URfOFgj72H
zNoWrrg7Q+F;X7a;c+7wYaxxM*|Gcef-D4MAvi~2lZ>HSuy&RA(Bcdb`@d+Z%Sy65f
ze<b7pZN<q<x%q7}`uQc*=T*tCS1S!T$^P?lAZ70w1XrPe>>tsYEdr5{hDUi9QK4iM
zQr^2Gdr2a@m}l>vpFPfVME1|Ii_OdDWyf>#$_~#DtOQlLOPU-!s-ubvz#tzom?)i5
z7Rg;<=~<0qmuqtHwfU*lY=wFGU1tF4jGtq>%=QhR&kuR#zoPoU;MG`l(atYT$Ug4`
z@uY`%Ba9|w&NFZ2O#IR~T;rPQShziGYJZ)5W8Op`XDjoTZMMq+*C@mRP0(@Ehr~1(
z#_R3cI@h&hT!#;g$wOBml~I4Lkcv;5q0>WLZ;?&xw|V9^CBb#+Ee#Tz^`}ggLPydy
zf65hXMkED%a8|0NS?~4{X-Yp%RZG{nqNcc_l>e`&3o2LC6rCOo2|<-$1U^Zj)2C!3
zG|#7c`WCZUa@sx?98>^r;~o8|s7${%8jzOz)D7-OVA>jd>U#Hjn6@20wZfh1Q}1=>
zOxNO@g6PBmPhoV^8+5?HC)&$_5*^@QvvPz3**YMk)OtGw2<>JMTJC$8a}MpzbP%Nq
z>CTV%t(|Arp!P@IFy{!-iXdgJD3pU=0p)|6;!P>|h86grJ+3r<vzKnN^Olmf>%5+V
z#!4Y}2%F^2?eq4BP(tU<_0|zK9mV^0r=R78A~y8Yojn-LVXsC^9bcghblS%Y9Y-=!
zj)gm=Io*2{UekxtoNtywHf<dpI0vM@8vbkHuCF1W;(0hAec)3IJ-Lbn`O4QfG)?F>
z5){FZ<V>388P`0cnkTGz&T5_k&2v)o^r2(k9IoLTc1)*!DrppBLo-cp*8UrQ_ZYK<
zf?1hPEwUe;!`_?3)V@)~xF!PIW)XVX|2e<L7nn!HsxfDQweAhD5x+xMls(ug_r%$a
zT`(09=M(i^H4l~Gr958e|H|pA^Iv!Fa{8k#xvT7cz&q<pf8g{LcAfpHKsG*lHz5@_
zBKvOyqXo4ouUgX<uV}QAvY$M_Ry3xwRBHuS1YvgT$1OXbZ#n2`YB|vKA`n`bRNaX6
zF7E!frVU`3oW-56zW<%3O<+CpA5BxSZu(x+@-gjW*EH>Zto^vaZmfLPzrt#T*n6=a
z#yW|$8>`Bk#VZZFXW6sGYYp<Z?2Y2P+b*I0m#9aai!xs^Y+1O#FrJZ`M#vICoXZjP
zJ#&YDAmMKZz65-pMEyj5(k{vac>cTibAe|D|3>2VlTr<F|1cq2i1WIpwZfkWFdR%Y
zm;(G7{0r_VKt+LC_>%brZ?gR*58CRn?Zw?WmH3m1O(TGA;ERG6OF~9Aknv~MU3QX&
zgH>yvNupuaU-1AP4qmOW7;w0?elHFU8;(<Bc(Fs28D{<V9Ja%d%&e7G<8TZe6X-yO
zHTZJna>~ot*HJ6GXt&T#SaWdB{-S}dVFx#IxPRjj>S7l+TbQHzB>fkQR2Q1F$RfNX
zy+^X>M93*tvB^SDv(rfyl-!5?2;Ucci92MI3}VmM<Hb0T^LG*XEgM4QZLv49M-gwq
zxUvlyWFW>Coy4<Dct69(nQd4|;x~*r$tv!p_X)dQ*xlS_eaEYzJIQv4(ABJ`rilK5
zU9GVcybNEKA&=xcbzi(zr^tU(*cxH~BJ6o?3;xElh=o{VS&*A}rdj`HOO_hzH)L@L
zw3VISTtsvE{Aj7LHNx)Vc3(5U4cI-Et49khBCi#ACVKpo+3#ZU{2wR&JS{9Cug368
zv0I970=^Th=K)K_g_yT5mK9go7cu;d*&*r(rDHcG7=F)fK{j45XLuq<j}c!JVr<Oj
zu+Va0w+5>m@6+II=hL)sPeaAM%`Go@+|C2;=I2`uRqd>;-y^j)wYZz#d14D)*idz-
z$-Q&mFJE}BskxaAEieb4t$mXQ(|$H-Fbt-#Z{)QJ@rIeL?jgF2HP@}nivJ%O|NpX)
sodViv(@AyOzzEODV5BaTWJpVA?`^9z{=y+Z@)(P3v(t0T_Q=Zr0sTna#Q*>R

delta 2758
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
AGXMYp