Skip to content

Commit 690e882

Browse files
narcodenarcode
committed
changes for worm
1 parent 7c50759 commit 690e882

3 files changed

Lines changed: 25 additions & 20 deletions

File tree

‎CodeKlavier/CK_socket.py‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -260,19 +260,19 @@ def main():
260260

261261
if x ==1:
262262
ck_display[str(x)].configure(bg='black', bd=5, fg='cyan',wrap=tkinter.WORD,spacing1=0.3, font='MENLO 20', relief=tkinter.SUNKEN)
263-
ck_display[str(x)].insert(tkinter.END, "Snippet "+str(x)+" \n", 'title')
263+
ck_display[str(x)].insert(tkinter.END, "Snippet "+str(x)+" \n\n", 'title')
264264
elif x == 2:
265265
ck_display[str(x)].configure(bg='black', bd=5, fg='magenta',wrap=tkinter.WORD,spacing1=0.3, font='MENLO 20', relief=tkinter.SUNKEN)
266-
ck_display[str(x)].insert(tkinter.END, "Snippet "+str(x)+" \n", 'title')
266+
ck_display[str(x)].insert(tkinter.END, "Snippet "+str(x)+" \n\n", 'title')
267267
elif x == 3:
268268
ck_display[str(x)].configure(bg='black', bd=5, fg='yellow',wrap=tkinter.WORD,spacing1=0.3, font='MENLO 20', relief=tkinter.SUNKEN)
269-
ck_display[str(x)].insert(tkinter.END, "Conditionals and other stuff \n", 'title')
269+
ck_display[str(x)].insert(tkinter.END, "Conditionals and other stuff \n\n", 'title')
270270
elif x == 4:
271271
ck_display[str(x)].configure(bg='black', bd=5, fg='cyan',wrap=tkinter.WORD,spacing1=0.3, font='MENLO 20', relief=tkinter.SUNKEN)
272-
ck_display[str(x)].insert(tkinter.END, "Loops \n", 'title')
272+
ck_display[str(x)].insert(tkinter.END, "Loops \n\n", 'title')
273273
elif x == 5:
274274
ck_display[str(x)].configure(bg='black', bd=5, fg='white',wrap=tkinter.WORD,spacing1=0.3, font='MENLO 20', relief=tkinter.SUNKEN)
275-
ck_display[str(x)].insert(tkinter.END, "CodeSpace \n", 'title')
275+
ck_display[str(x)].insert(tkinter.END, "Free Code \n\n", 'title')
276276

277277

278278
codedump[str(x)] = Thread(target=displayCode, args=(str(x)))
@@ -341,7 +341,7 @@ def displayCode(display):
341341
tagmatch = re.match('.*:', dump)
342342
tag = tagmatch.group(0)[0:-1]
343343
ckcode = re.sub(''+tag+':', '', dump)
344-
try:
344+
try:
345345
ck_display[display].insert(tkinter.END, ckcode, tag)
346346
ck_display[display].see(tkinter.END)
347347
except RuntimeError as err:
@@ -379,15 +379,18 @@ def displayCode(display):
379379
ck_display[display].see(tkinter.END)
380380
except RuntimeError as err:
381381
break
382-
elif display == '5':
382+
elif display == '5': #this is the codespace
383383
data, addr = s[display].recvfrom(1024)
384384
dump = str(data, 'utf-8')
385385
tagmatch = re.match('.*:', dump)
386386
tag = tagmatch.group(0)[0:-1]
387387
ckcode = re.sub(''+tag+':', '', dump)
388388
try:
389-
ck_display[display].insert(tkinter.END, ckcode, tag)
390-
ck_display[display].see(tkinter.END)
389+
if tag == 'delete':
390+
ck_display[display].delete("%s-1c" % tkinter.INSERT, tkinter.INSERT)
391+
else:
392+
ck_display[display].insert(tkinter.END, ckcode, tag)
393+
ck_display[display].see(tkinter.END)
391394
except RuntimeError as err:
392395
break
393396
except OSError as err:

‎CodeKlavier/Mapping.py‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -590,15 +590,16 @@ def mapping(self, midinumber, prototype='Hello World'):
590590
self.__keyboard.type('?')
591591
self.formatAndSend('?', display=5, syntax_color='hello:', spacing=False)
592592
elif midinumber == 105:
593-
self.__keyboard.type('!.')
594-
self.formatAndSend('!.', display=5, syntax_color='hello:', spacing=False)
593+
self.__keyboard.type('.!')
594+
self.formatAndSend('.!', display=5, syntax_color='hello:', spacing=False)
595595
elif midinumber == 95:
596596
self.__keyboard.press(Key.backspace)
597597
self.__keyboard.release(Key.backspace)
598+
self.formatAndSend('', display=5, syntax_color='delete:', spacing=False)
598599
# supercollider commands:
599600
elif midinumber == 33:
600601
self.evaluateSC('noEnter_eval')
601-
self.formatAndSend('\n', display=5, syntax_color='hello:', spacing=False)
602+
self.formatAndSend('', display=5, syntax_color='hello:', spacing=False)
602603
elif midinumber == 22:
603604
self.__keyboard.type('.tempo')
604605
self.formatAndSend('.tempo', display=5, syntax_color='hello:', spacing=False)
@@ -610,6 +611,7 @@ def mapping(self, midinumber, prototype='Hello World'):
610611
self.formatAndSend('TempoClock.default', display=5, syntax_color='hello:', spacing=False)
611612
elif midinumber == 108:
612613
self.goDown()
614+
self.formatAndSend('\n', display=5, syntax_color='hello:', spacing=False)
613615
# motippets only commands:
614616
elif prototype == 'Motippets':
615617
if midinumber == 66:
@@ -681,7 +683,7 @@ def miniSnippets(self, snippet_num, pianosection):
681683
if snippet_num == 1 and pianosection == 'mid':
682684
self.__keyboard.type(self.__mini_snippet_mid_1)
683685
self.evaluateSC('eval')
684-
self.formatAndSend(self.__mini_snippet_mid_1, display=snippet_num, syntax_color='snippet:')
686+
self.formatAndSend(self.__mini_snippet_mid_1, display=5, syntax_color='mid:')
685687
if snippet_num == 1 and pianosection == 'mid with unmap':
686688
self.__keyboard.type(self.__mini_snippet_mid_1)
687689
self.evaluateSC('eval')
@@ -795,7 +797,7 @@ def tremolo(self, pianoregister, value):
795797
self.formatAndSend('~tremoloH2 = ' + str(value), display=2, syntax_color='hi:')
796798
elif pianoregister == 'mid_1':
797799
self.__keyboard.type('~tremoloM1 = ' + str(value))
798-
self.formatAndSend('~tremoloM1 = ' + str(value), display=1, syntax_color='mid:')
800+
self.formatAndSend('~tremoloM1 = ' + str(value), display=5, syntax_color='mid:')
799801
elif pianoregister == 'mid_2':
800802
self.__keyboard.type('~tremoloM2 = ' + str(value))
801803
self.formatAndSend('~tremoloM2 = ' + str(value), display=2, syntax_color='mid:')

‎default_setup.ini‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ noteoff_id: 0
55

66
[snippets]
77
#Ndef(~name.next,{|pitch=420,fx=88| SinOsc.ar(456*LFTri.kr(fx).range(100, pitch)) * EnvGen.kr(Env.perc) * ev.amp}).play(0,2);(1/ev.rit).wait;}}).play(~ts, quant:0).envir = (rit: ~tremoloL, amp: 0.036);
8-
snippet1 : ~snippet1 = Ndef(\an1, {|dec=40, amp=1, rate=1| GVerb.ar(HPF.ar(SoundIn.ar(1), 9), 109, dec)*LFTri.kr(rate)*amp}).play(0,2)
8+
snippet1 : ~snippet1 = Ndef(\piano_fx, {|dec=40, amp=0.01, rate=1| GVerb.ar(HPF.ar(SoundIn.ar(1), 9), 109, dec)*LFTri.kr(rate)*amp}).play(0,2)
99

1010

11-
mini_snippet_hi_1: Ndef(\an1).map(\dec, Ndef(\krm1_d)); ~tremoloH1;
11+
mini_snippet_hi_1: Ndef(\piano_fx).map(\dec, Ndef(\krm1_d)); ~tremoloH1;
1212
mini_unmap_hi_2: Ndef(\acc).set(\fx, ~tremoloH2.linlin(1, 16, 0, 15));
1313

1414
mini_snippet_mid_1: ~map_sampler = true; ~tremoloM1;
1515
mini_unmap_mid_2: Ndef(\acc).set(\note, ~tremoloM2.linlin(1, 16, 180, 800));
1616

17-
mini_snippet_low_1: ~map_rhythm = true; Ndef(\an1).map(\rate, Ndef(\krm1_r)); ~tremoloL1;
18-
mini_unmap_low_1: ~map_rhythm = false; Ndef(\an1).set(\rate, ~tremoloL1.linlin(1, 16, 1/2, 18));
17+
mini_snippet_low_1: ~map_rhythm = true; Ndef(\piano_fx).map(\rate, Ndef(\krm1_r)); ~tremoloL1;
18+
mini_unmap_low_1: ~map_rhythm = false; Ndef(\piano_fx).set(\rate, ~tremoloL1.linlin(1, 16, 1/2, 18));
1919
mini_unmap_low_2: Ndef(\acc).set(\amp, ~tremoloL2.linlin(1, 16, 0, 1.5))
20-
mini_unmap_low_3: ~map_amplitude = false; \amp, Ndef(\an1).set(\amp, ~tremoloL1amp.linlin(1, 16, 0.01, 1));
21-
mini_snippet_low_1_amp: ~map_amplitude = true; Ndef(\an1).map(\amp, Ndef(\krm1_a)); ~tremoloL1amp;
20+
mini_unmap_low_3: ~map_amplitude = false; \amp, Ndef(\piano_fx).set(\amp, ~tremoloL1amp.linlin(1, 16, 0.01, 1));
21+
mini_snippet_low_1_amp: ~map_amplitude = true; Ndef(\piano_fx).map(\amp, Ndef(\krm1_a)); ~tremoloL1amp;
2222

2323
snippet2 : ~snippet2 = Ndef(\acc, {|note=500, amp=0.036, cut=200, bw=0.5, fx=0.1| BPF.ar(Resonz.ar(SinOsc.ar([note.lag(1), note.lag(2)*3/2, note*2, note.lag(1.5)*4/3]), (note*LFTri.kr(fx).range(1/2, 8))+80, bw), 600, 0.8) * amp.lag(0.5)}).play(0,2);
2424

0 commit comments

Comments
 (0)