From 4df91dafc9bd6e090a89cd4ce2dc913d92de435e Mon Sep 17 00:00:00 2001
From: Mark Slee <mcslee@Mark-Slees-MacBook-Pro.local>
Date: Thu, 19 Sep 2013 19:58:58 -0700
Subject: [PATCH] Add two virtual keyboard modes

---
 _Internals.pde        |  82 ++++++++++++++++++++++++++++++++++++------
 _UIFramework.pde      |   2 +-
 _UIImplementation.pde |   6 ++--
 code/HeronLX.jar      | Bin 64495 -> 64511 bytes
 4 files changed, 75 insertions(+), 15 deletions(-)

diff --git a/_Internals.pde b/_Internals.pde
index 044d650..3710e0e 100644
--- a/_Internals.pde
+++ b/_Internals.pde
@@ -48,7 +48,8 @@ HeronLX lx;
 LXPattern[] patterns;
 MappingTool mappingTool;
 PandaDriver[] pandaBoards;
-MidiListener midiQwerty;
+MidiListener midiQwertyKeys;
+MidiListener midiQwertyAPC;
 
 // Display configuration mode
 boolean mappingMode = false;
@@ -123,7 +124,8 @@ void setup() {
 
   // MIDI devices
   List<MidiListener> midiListeners = new ArrayList<MidiListener>();
-  midiListeners.add(midiQwerty = new MidiListener());
+  midiListeners.add(midiQwertyKeys = new MidiListener(MidiListener.KEYS));
+  midiListeners.add(midiQwertyAPC = new MidiListener(MidiListener.APC));
   for (MidiInputDevice device : RWMidi.getInputDevices()) {
     boolean enableDevice = device.getName().contains("APC");
     midiListeners.add(new MidiListener(device).setEnabled(enableDevice));
@@ -141,8 +143,8 @@ void setup() {
     new UISpeed(4, 624, 140, 50),
         
     new UIPatternDeck(lx.engine.getDeck(1), "PATTERN B", width-144, 4, 140, 324),
-    uiMidi = new UIMidi(midiListeners, width-144, 332, 140, 160),
-    new UIOutput(width-144, 498, 140, 106),
+    uiMidi = new UIMidi(midiListeners, width-144, 332, 140, 158),
+    new UIOutput(width-144, 494, 140, 106),
     
     uiCrossfader = new UICrossfader(width/2-90, height-90, 180, 86),
     
@@ -171,10 +173,16 @@ void setup() {
 }
 
 public class MidiListener extends AbstractScrollItem {
+  
+  public static final int MIDI = 0;
+  public static final int KEYS = 1;
+  public static final int APC = 2;
+  
   private boolean enabled = false;
   private final String name;
   
   MidiListener(MidiInputDevice d) {
+    mode = MIDI;
     d.createInput(this);
     name = d.getName();
   }
@@ -190,8 +198,25 @@ public class MidiListener extends AbstractScrollItem {
   
   final Map<Character, NoteMeta> keyToNote = new HashMap<Character, NoteMeta>();
   
-  MidiListener() {
-    name = "QWERTY Keyboard";
+  private final int mode;
+  private int octaveShift = 0;
+  
+  MidiListener(int mode) {
+    this.mode = mode;
+    switch (mode) {
+      case APC:
+        name = "QWERTY (APC Mode)";
+        mapAPC();
+        break;
+      default:
+      case KEYS:
+        name = "QWERTY (Key Mode)";
+        mapKeys();
+        break;
+    }
+  }
+  
+  private void mapAPC() {
     mapNote('1', 0, 53);
     mapNote('2', 1, 53);
     mapNote('3', 2, 53);
@@ -219,6 +244,26 @@ public class MidiListener extends AbstractScrollItem {
     registerKeyEvent(this);
   }
   
+  private void mapKeys() {
+    int note = 48;
+    mapNote('a', 1, note++);
+    mapNote('w', 1, note++);
+    mapNote('s', 1, note++);
+    mapNote('e', 1, note++);
+    mapNote('d', 1, note++);
+    mapNote('f', 1, note++);
+    mapNote('t', 1, note++);
+    mapNote('g', 1, note++);
+    mapNote('y', 1, note++);
+    mapNote('h', 1, note++);
+    mapNote('u', 1, note++);
+    mapNote('j', 1, note++);
+    mapNote('k', 1, note++);
+    mapNote('o', 1, note++);
+    mapNote('l', 1, note++);
+    registerKeyEvent(this);
+  }
+  
   void mapNote(char ch, int channel, int number) {
     keyToNote.put(ch, new NoteMeta(channel, number));
   }
@@ -228,15 +273,28 @@ public class MidiListener extends AbstractScrollItem {
   }
   
   public void keyEvent(KeyEvent e) {
+    if (!enabled) {
+      return;
+    }
     char c = Character.toLowerCase(e.getKeyChar());
     NoteMeta nm = keyToNote.get(c);
     if (nm != null) {
       switch (e.getID()) {
         case KeyEvent.KEY_PRESSED:
-          noteOnReceived(new Note(Note.NOTE_ON, nm.channel, nm.number, 127));
+          noteOnReceived(new Note(Note.NOTE_ON, nm.channel, nm.number + octaveShift*12, 127));
           break;
         case KeyEvent.KEY_RELEASED:
-          noteOffReceived(new Note(Note.NOTE_OFF, nm.channel, nm.number, 0));
+          noteOffReceived(new Note(Note.NOTE_OFF, nm.channel, nm.number + octaveShift*12, 0));
+          break;
+      }
+    }
+    if ((mode == KEYS) && (e.getID() == KeyEvent.KEY_PRESSED)) {
+      switch (c) {
+        case 'z':
+          octaveShift = constrain(octaveShift-1, -4, 4);
+          break;
+        case 'x':
+          octaveShift = constrain(octaveShift+1, -4, 4);
           break;
       }
     }
@@ -540,13 +598,13 @@ void keyPressed() {
       frameRate(++targetFramerate);
       break;
     case 'd':
-      if (!midiQwerty.isEnabled()) {
+      if (!midiQwertyAPC.isEnabled() && !midiQwertyKeys.isEnabled()) {
         debugMode = !debugMode;
         println("Debug output: " + (debugMode ? "ON" : "OFF"));
       }
       break;
     case 'm':
-      if (!midiQwerty.isEnabled()) {
+      if (!midiQwertyAPC.isEnabled() && !midiQwertyKeys.isEnabled()) {
         mappingMode = !mappingMode;
         uiPatternA.setVisible(!mappingMode);
         uiMapping.setVisible(mappingMode);
@@ -568,7 +626,9 @@ void keyPressed() {
       }
       break;
     case 'u':
-      uiOn = !uiOn;
+      if (!midiQwertyAPC.isEnabled() && !midiQwertyKeys.isEnabled()) {
+        uiOn = !uiOn;
+      }
       break;
   }
 }
diff --git a/_UIFramework.pde b/_UIFramework.pde
index 2b3d047..0e0be79 100644
--- a/_UIFramework.pde
+++ b/_UIFramework.pde
@@ -778,7 +778,7 @@ public class UIScrollList extends UIObject {
   }
   
   public void setScrollOffset(int offset) {
-    scrollOffset = constrain(offset, 0, items.size() - numVisibleItems);
+    scrollOffset = constrain(offset, 0, max(0, items.size() - numVisibleItems));
     scrollYStart = round(scrollOffset * h / items.size());
     scrollYHeight = round(numVisibleItems * h / items.size());
     redraw();
diff --git a/_UIImplementation.pde b/_UIImplementation.pde
index ae61d30..e72d76b 100644
--- a/_UIImplementation.pde
+++ b/_UIImplementation.pde
@@ -490,9 +490,9 @@ class UIMidi extends UIWindow {
     for (MidiListener ml : midiListeners) {
       scrollItems.add(ml);
     }
-    new UIScrollList(1, titleHeight, w-2, 80).setItems(scrollItems).addToContainer(this);
-    (deckMode = new UIToggleSet(4, 110, 90, 20)).setOptions(new String[] { "A", "B" }).addToContainer(this);
-    (logMode = new UIButton(98, 110, w-103, 20)).setLabel("LOG").addToContainer(this);
+    new UIScrollList(1, titleHeight, w-2, 100).setItems(scrollItems).addToContainer(this);
+    (deckMode = new UIToggleSet(4, 130, 90, 20)).setOptions(new String[] { "A", "B" }).addToContainer(this);
+    (logMode = new UIButton(98, 130, w-103, 20)).setLabel("LOG").addToContainer(this);
   }
   
   public boolean logMidi() {
diff --git a/code/HeronLX.jar b/code/HeronLX.jar
index 5a98f5e5d93681e73eebac40dc9b8c4768da479e..a3f624137cafd5fdb44e9bd18cd1bcdade1dc611 100755
GIT binary patch
delta 6797
zcmZWt2{@E()E+~&23fLXM6zeBWr>LFWXVz(*&182l{Jigm*vgACPE^6wvsK|XD>?<
zV_!3pEz1AS+xLC{@B3ZX%zd5vxzBmdInVQq>pGiz#K(KY2whEL5=t1190p^^NkH(!
z>2ne!;|Skf7YN^LJm5D#PefP%<cLHF;6fz&$6^Q0uao_s2;kZ$A|b-sDY!5JB;ewI
z9M}Po9g5TcZUru7!!LtNRUhHzrwDk3Jd}ulO%yN4sp)gXZ)gX8jN5{Ne{jH6k{)nb
zAghX^qkuF?^qk~`u=T8s1Q!pa6A=}`rM+N*c#;MND+jjNII&XRzO0{y#78R<o3tG}
zJ=VvypN>>I=1Dyxp(A(oJ;U3t;HapTo*Y}9tbDI@u*_FigC8|`TFw46RW<tBm*l7M
zblulK4<<`ITRHXCRKvdcaLse)e)DT4hIeUi8Y}N<s{h_!pYDI`{1xr|waI(?(Qd4*
z4$*s)qgb*GUl$q)tY+Of88vz~v~g&_f<G98NN$u2KInXY7GWfIrz1C1Awc0$Fh{Ti
z#iU<3OnA1%f#QZ-kvQ3X=0|ms&BMa;2X@s)t<ipiF@3V`ks)h-Gm>N}8eVBM$r+if
zTwj)h4HswJY{w{IOUX=XBzFTdn9<!9;=$UCjUAdLD^{~kSoU2D;k~l&3cOC3L^)xn
zwhg-7LyKz?k6p;#$gr$`$2m2nmrl1?1hjAj-{<<$do(6C-YF2qjP87R$kLS5!bnQS
z+!Wg~$$}oZZaKT=eTvMR+2)L8t{C&KC4=ghj83P%18yE1)we!BiwnEB3#6_Ts(vm3
zWMm>O==2bEb}V0vo|aZ7_t!3tj_bCYta4g&%)zdt^mN)jcpmolEjGHZ>%>&k{5aHk
zU#90y3tNrXyjZK6!&@Gwt$2K!YI*2c*|k>@KE2sO<JJ9){ob@+SGXr`3h@nhQ+EB`
z_q2;gd$2gUzxE&d?b9Cd(a3+0dCYz|C--e?;O(LDa3?obmJ>%zCl>)DcQfaF_M%}n
zs;uN{P>E!jQgPDm?mElzWDWhZhGSBU7DY#r(&ft*`Bst3Dj`uqsAsGit>Y!_BLYFD
z>O6BV0|y6lwCpVn$0CIoMsGRTc^0N}@{D;2TE%c!u#3hNRV<T>dZ}2`vQEd&6g<1O
zFk5Wdx|jY7OS{^L=+m8Tf6bFuL1JIF!LFxoqNvW|!zV|(N^5s(am4!hN}W}EHHoR=
z^~>=YRwdN5#P+5JY8T6&Z6G4M*q(HLB+)D7%NHAZCN%V;^U)1%Te@FOY8ou;T~)Bx
z){~!x^22oX`K;qBSUZM?aS8P!F;jf9@e#3{20N;pZP*K<<Qo=U(T2kbsiP@sFS^?s
zWP|#V*+u!mQDsgG8|gJsdZ^Yghhp91cWfRxhSd6Z;*~W|cYnfJUU3ZZ@vc<;5oz?K
zsKF{<f7FLq*|=fb&Mos*=#8@Cc+4f5pL?Zeh`LAPiuujD$|$NCqt$Iw7;(BynMO{I
zig%EFEYVm$ztYG2m7hY~M9Q4>e%u+a4twQ7;^h!1U1OFdTf|@7m0Rz6i|YmNm8_=*
z2xg7_L27R4u6sy!6SSss5&iPFZ%zd;&-NNVWm}7~0>Nok!&o7k3$gvz*Zi%DI6hiv
zs4t8523PmM!<p;VKfhqn`08&pRmvQe&iM{gb&$A-MTi<-M&`6v=x3$kUS{-R!p%n3
zBU^*@bVj&a`x1sfc)R<pQ!kN7_ale+J-6(}k;6C-?I`uJ{78)L3)ODExUzG^>V~l*
z7|Fxf+v$@p9b~A7RRqt^j;NZvC9bdw3Xbu>Y#@Vrqr))Aa+jDTBdZu9=M4l;uggoS
zuHB`;$}5;W)FRJ_>imu9tuI{REBL7QK&xf}buCBsd$iWihrCRdrZbAvUTdM4z=Idk
z-m|7cTC$z>{RwHKeW<1<dfBN?*2}N-OrBDq&c&AS+(K)s@{#6!{`T}L&sAiR@4aet
zwGd6FaJw<UP;e)vh~6gCc&MtQKQKR&v%;733RckNt*`rhLN~6vyo+|R{MJZYg%rw#
z6m#C2&RlaPa74lO^Wb+Kx7ai-o99d)ekdBmaa?RRNJkv(b;9K+>$ezDSrK>?+wz+D
z!?c3uc+R|hMaS8qZ~0&D2xf0<ivtl}?>c0?C;J{(NbCMQs#<irmg1|{5;Z{?<$Tlo
zat_vB8uNa8NsxECn9e`Z$7h|#t?80Q+0;X|taTRpv4=pCbCT=Dd@+IQsr26Bw*m!R
zs#ca+w@0t;g_Rc`SeaBcSi6TK%tM!oW%>N1X-~;<wW;q{BKF!kF;Z}vE<8uD&U;>r
zS42x2J^~RZ<`u*HV&<Wk@A-EeZF4S9Yu{kiXxpsVlX3cZ`=}(kooGZ(;6P7&;Hwz&
z*Bble2Nq7}%`3#&;%L$rLM6viaLlsm_K%#daJDhwC_)UGJi>eN2-)cJd0FKk#0b7R
zB(7(l*<a&>&YbPNBf(&PIDP;xEap%BqzBKC8IRu<^C!wq!Abe5f9Na@SKW%Hlfzz^
z6XnWa>VIeWCf|CCT(xQJb2^njOWZ|K`BQ~lvKOpL`+M*Y_MgNU?`Ox1;PVi|EzwV>
zZ9eI*?-gQvNpq5Lg?Mq6yEgbsUWQ@jZO-@hZ||2Pj!BP&+OY4jJ$Q4x49jm;f8jZG
ziTyal@AjDiJQK@r%Gc`q7?x%@7Qo`%_gPzeZWRNyX!RYg4<GB288S9G61<{jt4TTo
z#J)~9YJOP4mx%et@~0%_BDFfY3|$T5WhOF&yl$#Un*MVCp`n)QJR^yb?W6TX4Cpou
zczNkuwQN`UlpR@~ez|H$$yT61>*oqSri0U=-P!JUkkVY-iodneP8@JW4~xxoaJSB%
zl20F{YWA@<i8SSFmRNsNTQa3HF`bh;_=Dy?KUPr_eObeqGO@IP>LoAv4Y%9dma>|L
zs>LzwPLBf@L$_ks23y06?xl+QVN#NxsH$b+XbKH_=6>IA@H})^;4xU5_tpGxl?x+D
zsWsHWSO!!L9}fsr(3RYK_2Cp&%s<0(O$PBUnxXaz;@trM^CroHn3s>J4XJmS_^WiA
znz?W^_l_=PCvB-B{Ix8@<)009<jf9m9o5G)zfZv&arZtBZF$Yy6xIBKHUCb~^F})!
zY7e$11qLp6WqnIBOu#mSCOHPZ;z1H+^piDu?3j)7q2$vUTKA(bA*w8SSfvde7R8UN
zGVRta^vi1n@_LE|ANi&;ik%v4Yz)6G_DC|uQ$@%W4WD-!m{K?!PH9ecrDN5)!K~GF
z>#56XSn~V@(~eIhlOwlh_5;<2uj|N%e~77hVJV8L&JfE{IM6ZNr|oifxuUSprrdF!
z?V+yG2QHPkXK8#5;ZYGU#4cjHpG&1&cogUn7CWArZr*LMSYA(ATKr?K*Z<h1b?xG?
zvTtmPZ&jk@5FhXEt$Nh!`TT--^cruZVHLYj!K!JQyI?k>4+cFmaz`?vUC?F2;niSk
zo;+15w_48r1{eCTu3PeaPxS-kFWx(lo>(uOEa2|{%Ukn$h(*Ggo;Ji2?BL{+wVMiB
zhT_M0^h}FejlvHYUqzCSu#kSL-ZdRNJ1(qIOX;V?I>0UBHYc*T7vZm;yN4cXC|3$p
zZJnr@vPsjqv%LiCY~fNa&v+9lv->3?kuJ=0LR9#Xs0jtDRSu%mob|T8S(H?Mpb(Ec
zv&Qfd%X^>Q3`0ry@PxgrDpr(26X#S%23yS~lA~lN4mq?lP<e26Eav0u*-E`?8WYsn
zxIDiuhvE>1jps&(smiKnIcq+lDJjzoOrw%}G>2}5@-G*?ptpYcQ%SQX$*y>Y4rQ32
zNS$P#SMXB1+F<<FV+t?aC6_2c|0gQj#S8MPSLFDws!48-z3RUGo=O|*U{0xh!x+yc
z6&7UREG<4mS&Mnk=GYU!;MgC)J3b%t#hCamig=-A5p8aB#CA3kVIX4kWARi*x~iCn
zyjm!lJNP9B#Vekb(_v~iZ<0C`n|J;SWht_a3bUXR>`|o0WrV-5bR|vJ9n+aAV7a3*
zwV?HullW3`bJQV<g}k~RTVh%ge3TPfD*@j?2w9c?tgHF>x@~*(R!YP*k~?P**#Sw$
z<Yv8DFi*!>=lO{HC@bNFx~`vBB)TOZa;+6%5^XqFq^RVaD$A48-52f57=`47Qnl$H
zDNZy|e*P?u58}?HMRRPC(v~(ZxUAuP#&Cj73q^wlq|-rFj5q-o>>#tnP|8dqP@di7
zX1{|m9v@UOXOytPxs5ak2&JR4&-GrVp?KZbdRE7TVLEj4Y~lDleP8ywg4(VHH@9x_
zNA-CGum!W<VK8J2jpj=pAJNCRagHR_9u>~0j{ZoRm&jhsT9qQ!wBM5nA2%B*=O$ib
ze%o)jkUuh*6iChEgB4qHA)C=y{mtxeMPYhf`<|pmtP)>GoXLm5wiZsi+9NbKd7`IC
zeya8t_rExQNgr9&zOt}pY@m_1q-{bg8f9X<DewKNtb3K6`RcX?b9OaVp{KTx3EK~6
zmHQ7g8GSbF3T~fqWt=E3(K0{Iil}ZbOv46Xt3%xBKHS`>tYyP)6iP@7xsG1VU=MEC
zHCg&hRb~+!P4m~|EUBGEXWO7gc+Xc@9LaIWzHJdN*IQbY>uJ<nud%4|`sn@1b&=d9
z<FBrls+g`T`R&4&w~Q3~Ygwd!)Lpt@+lUI!_U};Z!u^t<xQ2*U-JzbuVY{+^Q5pFZ
zQJ8Si=;mt$jwFO)v&8Qf2UeQV9Svl}#Lr-##gGbmU*+XBr^n=()uOP18VXS!lMGk^
zW!IXU3UQz5?oL<(gTR}R+oX<kKIEocC8bs4*SV-{-(T5e_N)}SLp&C;G7`7IeofeY
zIzSTj)uGqiNuzJ<Gp#ncOu$&M4v7nEiDZWp(-ctd9N}$(bqE;#`dhGRrvWkGRP|8e
zIN6G#J}9KFXu~4x!9#8~=5$q?TCKK8lPdhKAX?tkfaR*7UWVG!l+QJSt77(Lf|#O$
zny*)=$kqx3L#ocCp?ZxSum%~ehQkMK5|NDtYAU7i`Q<;&vZH%LqFGleYq-7IRq(#V
z2VrmZ73fx3u^H+2vy7Q5x_zbZo4(3&K*&*vzH87KObKO`8Z4=FiEy&XC`MwU`4tnr
z53f%44<5|l$5M{I$>K~tpt;eZ9zkOmr+s5q+AULp!7(E&pQCu<f?bF2OTTkJmYx9b
zxd*8))D2N`3rj7mn$Z~<B!2LgnjZG5NV=O+ofYOoX^*{Ve%oX@?`MJAqTq19L_CR4
zX^Iqs^={=d%KXd9oYA|M^vpL-Re$MD$SjuXXs3&;@RpXm$=R$O;dC`j%*!Y$mE#O^
zJdmktl_HX455#zn9m=dYEIs~4@+C3Uvk(1!(W<9Kdehx5x!mJ!z<P08X!5n4QI#&i
zFE~5Lp2<0^j|WU2N1~VT$?HmSa}DLDAIaUquZ{I2p?W`!hM8uT3!O#%Zf}qG$m^GX
z>Jis3@4oEUM_ZTb)4Si>`rrya+m6vGCy%Z_y9|~2V%trIziH0CZrgR#`*b+U&;MuG
z^64Q-?P>o6dm`$=v76H(eljZ~6aAUjZqKh9cT%#kVC%d!Qtz+cbzJph56v*%dyCar
zr!SbK(Q0uTImPZz;xoZ%No~l+(bVOEc33fUS}}WYHbio1-cN*g^M<&L!D+*dyPLBg
z#w@DF)=X#IQ%bkIr*uQ3%PZ6#4arSorfv4<&`LjPMr23?u6=A|l~e3&WEsPmzCXnN
znP`y0$jM>gbYKNl2PaGko{Ojv6L3S^gBY3?gez85u7L9e698w&03epn0%?-lgt5XC
zsgKYEA~nuAryQJ%^qm3p+~@%_A~GOAk+dpax{EM<s4`LXgQgJ^H-w=LC{<n)5NK3e
zBrHEy*CB$!oN}^EoF;<7CWrwAa{9zo`YImHZOD`LW;lfT+Sj1e=Jb{!>@yT3A%r+I
zwt{SPvnj}yvq~l<@S}Fdke{f-7_?65BnD+5=W+@{Ww-Z`p3D<~beUdoh|l#=f^gBd
z6~dR;G)Si$!UyS`Lu(=A4Yz<WGQt}|k|@7Fr5L0xTAPx<VCTsRr2z4{<bccfvsKN}
z7$^=;{5SzClN6!wN-4GwmZr5rX}jjqKz2~xT?l9M7obLVm+lioor*TvGh_!ll|=;T
zrm$A6R$Pa+7p&5Q%EZ<JkRL<+EeP!zQ4prQU50dl&3_J}vPA&mzqV~cX$^FdLH2l$
zE`$Pof7*Lzh#s;Zj95cB{HX}q$9IAbvg0Q$A>5wwBZf2N0B$&GusWa=cbx#6IA{pQ
zIV(Z1OlG0Ab8|?bVwQ`*jLj+#;M^RfM$gF+tjsxi0!+=_AOPn)B*Dxp5v-DVNU}C>
zM6hlwXb>Q7L7M>63(5rGSyUr{%c9nQ=3U*3G91v*?7nka5F7^EBZk4w5r$`f|K$g6
zpnwAu61cvEAVkn!LJ}1M_m>0-M%oe*z9kO)5<f?+t4RcBASR3h32z6O24(iZ(Gpat
z@G=sfC<SCoofAAM6Tk7lF9inU`)5xO^8@Xq0c|2i!n*<DrKy3p%h2|{V5qx_f3MI2
zXI3Eg{0b62bpzO1VM<hD0QlDsP)XK*C2&}SCE0-YPUJ*vY86n+0=!z`W+&9Xjr1wX
z00rN{kMId$Gk{-#dMmPugcquVUYvl-DjnqYzpoPp6FA|u4?J6i4)qJ@#eNgoOX()#
zzlj}E9*%5+iD5`#FtHP!McRZS0LL|csDd-1#IJL~1NjIF1y2Z<^Z=T5Mxb{Mx-na8
zNTMNtdi^q#n0U;~9WKyI0rcWL;dKmHu8Tq%N-O)TxnN&h$zZSxCp6YT#kvTjX|$O7
zh6ZEwgQt4_ghnxO14TH0;SD7GvmKz|a4ylF5@2404g(94R~$f+>%W&`09>JV0*LS|
z0O>b2sKV;U#|)j|!#xk?doou=7f6Wy#smpx3X<RWf(iFg{P&`$yFo%HH(KEBw?CKU
z8xnpR`~?H|5%FXIr1ud}J?9Onl4`-dHo(@Oybrm6!lpd5O@EmQ{SK%hJOl9)HRt<)
z0R@1bO(rN973+kD7Z@lA%t`2ka5WKsjnEu<JQ7}pg|hI#a}bzRkWmkTm;pR9fms2W
zhoKO|u>~<#w~+8l;Si%6P6GsNK@~j#+1Ln(?b!O$IoiQdSt&5nZt%l@A_4L!ATXB+
zxD>?zpuR)yGT)K#@Mws2`F;V)KcTXOH44l<0{l01@(v0B<=+*cX7s+CySER9zYR9y
zWQ`<A0PVIcp#q(4BwQ^849yHUrZE1qVKK;7q(SWT_Bn#?5M<nQK}O)ew?gj+5+0TZ
zu3Q9a@@W3KMXy12F&|_(fz2O(9vu4mKujr^N;P;VPd?K=fMW-GrWQL$cxMIZ#RRNY
zF#VHF1IUV0LG0!ZCsh8MS_XY}@c3~5ue4x5WEVO==UpV6xgJPpJ_pFvGXu@LP%HaD
z*0B*{PwjC)ZMt^*K65tMruSgHlWod)3kvyx!M9|<@xh-<xS-}_HU)|oz>OtN99t-m
zyQd5VRBR!h`vPjZK+VasscnG*3hn=S6c?{LP8NcP_yT+sCx0Ji+dv^75W7!DX#TT(
zBz&X`N;>`k0qh+xKt}?yUwZy!<qwz$?41K7T&VAF_B??p2O0Db#2kI1`Nx~;Clc;D
z@-N%HhlFy^cibQ`2lJK#4+(XmzR^#Ai_iYsOE5&h1jMp^rT!-{{~;3obn;);88pEp
VVnNuO`kQ3{CJxV#KEe^={|{t<bNc`Q

delta 6795
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

-- 
2.34.1