Compare commits

..

No commits in common. "main" and "v1.1" have entirely different histories.
main ... v1.1

12 changed files with 19 additions and 171 deletions

BIN
.DS_Store vendored

Binary file not shown.

BIN
dist/underbridge vendored

Binary file not shown.

View File

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDisplayName</key>
<string>underbridge</string>
<key>CFBundleExecutable</key>
<string>underbridge</string>
<key>CFBundleIconFile</key>
<string>logo.ico</string>
<key>CFBundleIdentifier</key>
<string>underbridge</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>underbridge</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.0.0</string>
<key>NSHighResolutionCapable</key>
<true/>
</dict>
</plist>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

View File

@ -1,128 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>files</key>
<dict>
<key>Resources/logo.ico</key>
<data>
mtFuKBM0y8Zhgf0zPV3iiD5US1w=
</data>
</dict>
<key>files2</key>
<dict>
<key>Resources/logo.ico</key>
<dict>
<key>hash2</key>
<data>
QuvTuLzEUHh3cPgoVPNkcbQ5wWfEioohO8WxSTgroeM=
</data>
</dict>
</dict>
<key>rules</key>
<dict>
<key>^Resources/</key>
<true/>
<key>^Resources/.*\.lproj/</key>
<dict>
<key>optional</key>
<true/>
<key>weight</key>
<real>1000</real>
</dict>
<key>^Resources/.*\.lproj/locversion.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>1100</real>
</dict>
<key>^Resources/Base\.lproj/</key>
<dict>
<key>weight</key>
<real>1010</real>
</dict>
<key>^version.plist$</key>
<true/>
</dict>
<key>rules2</key>
<dict>
<key>.*\.dSYM($|/)</key>
<dict>
<key>weight</key>
<real>11</real>
</dict>
<key>^(.*/)?\.DS_Store$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>2000</real>
</dict>
<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
<dict>
<key>nested</key>
<true/>
<key>weight</key>
<real>10</real>
</dict>
<key>^.*</key>
<true/>
<key>^Info\.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>20</real>
</dict>
<key>^PkgInfo$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>20</real>
</dict>
<key>^Resources/</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
<key>^Resources/.*\.lproj/</key>
<dict>
<key>optional</key>
<true/>
<key>weight</key>
<real>1000</real>
</dict>
<key>^Resources/.*\.lproj/locversion.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>1100</real>
</dict>
<key>^Resources/Base\.lproj/</key>
<dict>
<key>weight</key>
<real>1010</real>
</dict>
<key>^[^/]+$</key>
<dict>
<key>nested</key>
<true/>
<key>weight</key>
<real>10</real>
</dict>
<key>^embedded\.provisionprofile$</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
<key>^version\.plist$</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
</dict>
</dict>
</plist>

BIN
dist/underbridge.exe vendored

Binary file not shown.

BIN
dist/underbridge_lin vendored

Binary file not shown.

BIN
logo.ico

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

BIN
logo.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.0 KiB

View File

@ -66,9 +66,9 @@ class Midirecorder:
Pattern = Radiobutton(lowerframe, text= 'Pattern', value = 3 , variable = self.mode_select, width = self.buttonsize_x, height = self.buttonsize_y, indicatoron = 0,bg= '#1b7d24' )
Pattern.select()
self.bar_input = Scale(upperframe, from_ = 1, to = 9, orient = HORIZONTAL, label="Nr. Bars", sliderlength= 10, length= 75, fg = 'white')
self.patterns_input = Scale(upperframe, from_ = 1, to = 16, orient = HORIZONTAL, label="Patterns",sliderlength= 10, length= 75, fg = 'white')
self.patterns_input.set(value=16)
self.bar_input = Scale(upperframe, from_ = 1, to = 4, orient = HORIZONTAL, label="Nr. Bars", sliderlength= 10, length= 75, fg = 'white')
self.patterns_input = Scale(upperframe, from_ = 1, to = 10, orient = HORIZONTAL, label="Patterns",sliderlength= 10, length= 75, fg = 'white')
self.patterns_input.set(value=10)
self.bpm_input = Entry(upperframe, width =10, text="BPM",bg= 'lightgrey', relief= FLAT)
self.bpm_input.insert(0, "BPM")
self.add_sec = Scale(upperframe, from_ = 0, to = 10, orient = HORIZONTAL, label="extra Sec", sliderlength= 10, length= 75, fg = 'white')
@ -133,7 +133,7 @@ class Midirecorder:
try:
self.op_device = list(filter(lambda x: 'OP-Z' in x, device_list))
self.op_device = self.op_device[0]
#print (self.op_device)
print (self.op_device)
self.displaymsg.set("OP-Z found")
except:
self.displaymsg.set("Can´t find OP-Z : MIDI Error.")
@ -196,7 +196,7 @@ class Midirecorder:
#global op_device
self.outport= mido.open_output(self.op_device)
#displaymsg.set("OP-Z MIDI not connected :(")
#print(self.outport)
print(self.outport)
def setProject(self,projnr):
msg= mido.Message('program_change',song= self.projnr, program = 1)
@ -204,19 +204,19 @@ class Midirecorder:
def muteAll(self):
checkbutton_name = 0
#print(self.mute_list)
print(self.mute_list)
for j in range (0,8):
for j in range (0,7):
self.mute_list[j] = 1
for i in range (1,7):
for i in range (1,6):
checkbutton_name = 'self.modifier{}_value'.format(i) #checkbutton 1- 6
self.mute_list[i+7] = eval(checkbutton_name).get() #9th position in mute list
for k in range (0,14):
for k in range (0,13):
msg = mido.Message('control_change',control= 53, channel= k, value= self.mute_list[k])
self.outport.send(msg)
#print("Muted Channels",self.mute_list)
print("Muted Channels",self.mute_list)
def setSolo(self,chn):
msg = mido.Message('control_change',control= 53, channel= chn, value=0)
@ -226,7 +226,7 @@ class Midirecorder:
msg = mido.Message('start')
self.outport.send(msg)
self.displaymsg.set("Playback started")
#print("midi")
print("midi")
def stop_MIDI(self):
msg = mido.Message('stop')
@ -278,16 +278,16 @@ class Midirecorder:
#print(projectpath)
def start_Rec(self):
#print("record")
print("record")
self.displaymsg.set("Recording...")
CHUNK = 128
FORMAT = pyaudio.paInt16
CHANNELS = 2
RECORD_SECONDS= self.loop_time
#print("record")
print("record")
WAVE_OUTPUT_FILENAME = self.name_input.get() + "_" + "track" + str(self.j+1) + ".wav"
#print(WAVE_OUTPUT_FILENAME)
print(WAVE_OUTPUT_FILENAME)
p = pyaudio.PyAudio()
stream = p.open(format=FORMAT,
channels=CHANNELS,
@ -297,7 +297,7 @@ class Midirecorder:
frames_per_buffer=CHUNK
)
#print("* recording")
print("* recording")
frames = []
self.start_MIDI()
@ -338,10 +338,11 @@ class Midirecorder:
for i in range (0,8):
pattern_limit = self.patterns_input.get()
if self.cancel == 1 or self.pattern_nr == pattern_limit:
if self.cancel == 1 or self.pattern_nr == pattern_limit:
break
#print("sequence started",i)
self.muteAll()
self.muteAll()
time.sleep(0.1)
self.setSolo(i)
#starting Midi during wave record for timing
@ -349,7 +350,6 @@ class Midirecorder:
self.stop_MIDI()
time.sleep(1)
self.unmuteAll()
time.sleep(1)
mode = self.mode_select.get()
if i == 7 and mode == 2:
@ -357,7 +357,7 @@ class Midirecorder:
time.sleep(5)
self.nextPattern()
self.pattern_nr += 1
if self.pattern_nr == 15 :
if self.pattern_nr == 9 :
self.pattern_nr = 0
self.sequenceMaster()
except: