From fed671225ecb2b416e5913f533f7e1f7f7f9c540 Mon Sep 17 00:00:00 2001
From: Carmine De Rosa <dslaky@gmail.com>
Date: Sat, 16 May 2020 11:58:37 +0200
Subject: [PATCH] optimize erease

---
 C/actions.cpp |   8 +++-----
 C/inputs.cpp  |   8 ++++----
 C/main.cpp    |   3 ++-
 C/players.cpp |  16 ++++++++++++----
 C/sonquencer  | Bin 20456 -> 20496 bytes
 README.md     |  22 +++++++++++-----------
 6 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/C/actions.cpp b/C/actions.cpp
index edd7a80..14e1d82 100644
--- a/C/actions.cpp
+++ b/C/actions.cpp
@@ -1,10 +1,8 @@
 
-void setSample(int sample, int step) {
+void setSample(int sample) {
   if(setErease) {
-    for(int i=0; i<matrix[1]; i++) {
-      pattern[sample-1][i] = 0;
-    }
-    setErease = false;
+
+    ereaseSample = sample;
 
   } else if(selectPattern) {
 
diff --git a/C/inputs.cpp b/C/inputs.cpp
index b62b793..2d46169 100644
--- a/C/inputs.cpp
+++ b/C/inputs.cpp
@@ -1,16 +1,16 @@
 void inputActions(SDL_Event e) {
   switch (e.key.keysym.sym) {
     case SDLK_1:
-      setSample(1, step);
+      setSample(1);
       break;
     case SDLK_2:
-      setSample(2, step);
+      setSample(2);
       break;
     case SDLK_3:
-      setSample(3, step);
+      setSample(3);
       break;
     case SDLK_4:
-      setSample(4, step);
+      setSample(4);
       break;
 
     case SDLK_p:
diff --git a/C/main.cpp b/C/main.cpp
index 749926e..f604fef 100644
--- a/C/main.cpp
+++ b/C/main.cpp
@@ -22,6 +22,7 @@ bool play = false;
 bool setErease = false;
 bool selectPattern = false;
 bool selectBank = false;
+int ereaseSample = 0;
 int step = 0;
 
 #include "draw.cpp"
@@ -78,7 +79,7 @@ int main(int argc, char** argv) {
     }
 
     if(play) {
-      playPattern(&timer, stepDuration, &step);
+      playPattern(&timer, stepDuration);
     }
   }
 
diff --git a/C/players.cpp b/C/players.cpp
index a0c0e51..03b276e 100644
--- a/C/players.cpp
+++ b/C/players.cpp
@@ -1,15 +1,23 @@
 
-void playPattern(int *timer, int duration, int *step) {
+void playPattern(int *timer, int duration) {
   *timer = *timer >= duration ? 0 : *timer+1;
   usleep(1000);
 
   if(*timer == 0) {
-    drawRects(*step-1);
+    drawRects(step-1);
     for(int i=0; i<matrix[0]; i++) {
-      if(pattern[i][*step-1] == 1) {
+      if(pattern[i][step-1] == 1) {
         Mix_PlayChannel(-1, samples[i], 0);
       }
     }
-    *step = *step < matrix[1] ? *step+1 : 1;
+
+    step = step < matrix[1] ? step+1 : 1;
+
+    if(setErease && step == 1) {
+      for(int i=0; i<matrix[1]; i++) {
+        pattern[ereaseSample-1][i] = 0;
+      }
+      setErease = false;
+    }
   }
 }
diff --git a/C/sonquencer b/C/sonquencer
index 98f9b5d572e021f9c03143b29cb5e42ff08b9b24..ba712d09e4687dbe7c3686aa5f0ba646294a8f7a 100755
GIT binary patch
delta 2591
zcmc&$YfMx}6rNf3B9G;%a9Lan3KVFimc9@Ra#vhkr0SwIRjW}%Vo0o7z?7z?Kv7}6
zYS3vD8=ETCv_@kqS=&%!WKo1_tTm>OA8l&!(Ov>o5g%(sZ@-znkUnD4G%=lobIzQ{
zcg~zMcNT3YZQ4bf(r8mlx=e!=iHN1J0-8k=SsiVNvLyL+mLx?87LV1`V5SE>&4D{Z
z=^2kb`fF)L#OKn+CkR>RtqfNkeQv21o1W9~hoRhWh~<VZt>vDscS?()BR%{54s-tE
zkTu91a)rZ2I3R4ZOIM{#XxM=`+qgj}i7LIFMo6|}uzF6H!{^sj3XQM&Nw#IAHQU|U
zHjt>0R&LXZZ|i!!!$*5hw1x0}w~y}!Y47f)lgH;d-Ity9eThzYwdP)XiP^2G*`L6{
zsX8>3toKH&mnhG;EQ64Gjp7g=-qH0ghf&D!RDU6}R7uGotl64ZbL*A?|FIgg3T9R6
z8xN;rZ-uJT1xWQ?+AFmJl(?mH*sIc)ps4uvaK&>0f#w~69$lTOO8a=6kFK3EeBMza
zv9CH^mE17$E;)S8?aq>#bI$e)l9Qh8GOyodSC9sw{Pd?grA6>0#-UY5a=n&W@5_6w
z!tHgc<`ZPBLiC^8cwyRh461ign~BStxa?{R;BqaOr?#27T*>8$C^L{3ca1hm_Z}yt
zD^a=&##gVcQ|g6Gdq;Lk7ljbgDgD4a@tL77;e>5VBNd|Mva9h4H3Sz-OS_4_yQQK>
z32~~@46wr-=ctb5MCY{|!k+E7KLuuQ)#32Pa*)HE9OZ<&R&#s}HEWE6s*;%p!SIcL
zdo#tq{T7foauyu>F?G!Q9WPoQ(#mu8#Go1ehGhJ%>$TN7iCBM%XV~mG$id=R$LL9s
z)xgl4AmY09>}TP&F{YsVEW<YL=}k}r^j&YG<9^R-V4`1XkMXfateb+ZI`0O+uDQSC
za4T^8d&aW{+gMu=;>6U>YhMijemjVOKY6^#bJmt>u1VoX<*OuK5q!15-!OQC!B0ID
zUPH*k0sfb`$p60<!1Mp3fc6Kp`qKyK|7!<Z<CQ=$bH@6|B`g^Ao30<ie$-W6UkCmR
z_>bTl`*oeaQx~u6x(!$P4lY#=cptujMc_Gj7~cdx2L3*H2VS-#;K{h`W_<h4u(G67
z+Q_yhO`!8xJ7g2<NlKs_Sa5OzZDZ-l2{oVLVh$h&v4=-)Fy)5@nyy$z1QB9`ssn$G
z$ms&+usxuVatCg|guhnQvH^V9ZmJuOHzV#5e8`l)LqqrhgCc$^RLPXU!cHbnr*SMQ
zMV2D*35R<!Q(g}8G-bF#sD*WB$+QYI#uGlV+(dI&-J}Unw@hlF=UMk;nYo_#(k(11
zrz9qtScor90WKk;V(@PEYK}}b))F9FZ=o9QbH*5^s0u!JS(JHnOcaqx^E3r}Ja~c<
z632=HWICSFT$yHb**YEda?d@6r`hm)QCOG38f~%=WsD;9;fA%0TbVc4oWb);MvbED
z@R$jZXj2$*8Bs<MsS{DY$#Jxqwdcy#k2pHwuSYAwWsgzjA?`=d2>Lyz)?bY(YmJ`|
zj8m*_tZ1@KuW+A&SdkUKr+CBvyi9m=c^0S9B{5q#jDbGN6id<!%%PZcJ_XE$(<7pW
zSwb!mw2ImDWV(qh$V*5+X!L9-@;#1-UhXyYC`haiM5IU1E<t}1bbwJsE+BA=MAYBw
zut3l2K5J71%3?nlu|dzX?4IV=56w1}jkU`(pKVoS>s%xDYK-3}7X9OEIcryBS|R8*
z)(?4yh}tJ;ho{JXnMN;Jn3=g|W%28-;>ya>@>Q;~GWKl#3QK8uX>mpA+~QZ(tSn_a
z@)N_BEX=Mbt@JC(Jcsl5Qf3-qW6Uw14Frz#giYH)nadRD**kq{01aiqg%g5@|7&CR
u!mQw`Bt=wJ<*6&|qI8X?U?#q-$WS(8_H)6tc3~r@nR|8?eSx*lPW=Opp45Z@

delta 2631
zcmc&$4NR3)7(VB6KLk`R7lg~js~6-ZKN>%+;wQm-m5W#L2P2nKDU>+wGDEv=xWz~T
z>Fyg2J<a9%QKwC;wL!NvVWRj4V{2(GH``j-lJ>c4Dn)e(?CUw_`(VlD+S*)a<9*M0
z-{*bb=e*~9=hA+JDu-!%I<4)>u+YeSiHMQUmeV|%$ad3KvoTe(8B?8NVhmUftw!1r
zI2wL<I_(X(VlPV>{+){HGpRL;kmf#L$$)#DLuF|+osa_ec*A_zeXFfpmEGekCCR#R
zoCYuVOC>;)n}ZMtEzm*}0Q3(i_4ib@UvdaQhX%0T2l#7@1B?RD%1i0_l_rIvL|hJq
zaljpd1dWw~MyTQG0r!YzDHfKIh8)>F;(1$M7h=7Mb8{B_p{h;p5gNR7HVQc9qYz(*
zXz*D3;DvP_|B$EYR*uKtp!j#*@c7qVW7Di@MLvK$vRjc!OP{IbAmXsPCKE8hPHIP0
zb+R4)G_4)0ClPFaToP-srZk@ZotHvmP6%I&EM;-<`G)Blwym57r5?U3zV^rHgk-m)
zNy%*rEjG0>`22ky*?1|G>?G=SS=zb~mj1ImNI8d&27R)$Ub7jv?PG4MlBJS`<QWbO
z<HkeWxKfsKG@y~&TDUDAr(}V#=`MX!ipFF>ih$%JXzQ287Z5^&asASWm_+qUx7fv`
z-08L0*x9NWCs9@(m~C$i&BLtVH?+(zy*QumMtTmaho?ECVtCNB(GlTaq4}3WxlXA7
zbZ>^};o=Mz9J-IESHN63&XdYgJP(3nNLz;M%b$=EoyY^wfFr?Cz14@S8g+`-yqSa^
zX?-gGQ&rz+P>HGKGOy6)?&Qfb*wxvEG5e51*#L10E^@Pz*==(SH}0`w+dTRntG2~C
z3NrZzU}|21r1Gi}gx~EsUg{+NFL;)d<0zHJm@OrJ7P5$&^}X`VugH2FLS!AhuqDf6
zZ{`Jv$xZ@SY-z?u@>r5nSW0zWsq1aJ?tZAc5uJai1^y*J>i@3<c>PHNoe${5`wy`H
z*Up{L^X*A;vaxw{HrRev)lb30c1KnD^|%fFE%bq5Rpqa3@E29J;Tlui`$f>1_%NP_
zHsMWs9l9I(UFgqo`%gnJ#6>sa8Cb-&r>4<%b|^KQR<S|Mqu6k&o$h01hn)_vT!+1}
z7q>G5F~k)ev)8b6W_Xx`&X^WKY%pEKUq5d15cH(qaGkq_{|3x5IDL4Z|AR@t5qaam
zHJm?5lliHE14>|WP+}kv>`TWoYcgJ1&SGN3VA2djVj%aCO%bfz5D{p9v^<I$*$;UZ
zS_c^)h|b?(ppUcNh1oE76}HkYW?pPz<xlltx8_AJ#hXb2Np?9!PEZ!(D(ecfSbs$7
zSTck3>L(!>!mkML7`$d;AxBG{B4&b^#MUC#irttE2_#X^EFci`xfgsmW(hE{h8e^;
zN6QecgO=-<b43<fA?8(Vf6;6(wU8rIs@1cUVhi0XP)CG3DP%X>U2L&##=FROkQ}R3
zz{@N~AIB``uV$<PKXiDU|2e+qybu+q?^~Q40C)5~rBB(@n5Y;n`g*r0ktXvQeS%Bt
z3e@1doqEhfhc~jLi|rX5`fetwzpSJAlgWosNJ8pF#ugzD3E9bI<0arZ(}S~|0=Ypy
zgs)(aLDi{DztizoY#ROrJ^yXJ?y)J|9o6w!Rt+!iIAWqfESV7YtjkO@**T}hS_lhg
zawlFxCZJb*l(Au_g;ol=i>0_M);&5>N^}Z@_^vS9&(^vu6lVz86Y#o*D63w&W$r3(
z{iZc_HQQV}H+x?t)xMf~ua8uetlU&mv$cBHCnX&;wlX)j4)gMApRZ=ewsNnxf~nzl
zcG10lW@W)^HNJ}KSL(Lbc)e^mJU)<J`VI|TSymNB!&q)vcI4!Lb<A6q7g?98k*W)v
oEE}M-Hn4q_N)4eXwqwnck+m*Cn4D)_Yw{v9OSM%o>soF98^vk8xBvhE

diff --git a/README.md b/README.md
index fa7d92a..ccfba27 100644
--- a/README.md
+++ b/README.md
@@ -2,15 +2,15 @@
 
 #### Keys (C version)
 
-| Key     | Key +   | Action        | Description                              |
-| ------- | ------- | ------------- | ---------------------------------------- |
-| 1,2,3,4 |         | Play sample n | Set the sample when sequencer is playing |
-| P       |         | Play/Stop     | Play/Stop Sequencer                      |
-| E       | 1,2,3,4 | Erease        | Erease the sample line                   |
-|         |         |               |                                          |
-|         |         |               |                                          |
-|         |         |               |                                          |
-|         |         |               |                                          |
-|         |         |               |                                          |
-|         |         |               |                                          |
+| Key     | Options | Action        | Description                                             |
+| ------- | ------- | ------------- | ------------------------------------------------------- |
+| 1,2,3,4 |         | Play sample n | Set the sample when sequencer is playing or set options |
+| P       |         | Play/Stop     | Play/Stop Sequencer                                     |
+| E       | 1,2,3,4 | Erease        | Erease the sample line                                  |
+| O       | 1,2,3,4 | Open pattern  | Open the pattern by number                              |
+| B       | 1,2,3,4 | Open bank     | Open the bank by number                                 |
+|         |         |               |                                                         |
+|         |         |               |                                                         |
+|         |         |               |                                                         |
+|         |         |               |                                                         |