cleaning

.gitignore

@@ -47,4 +47,4 @@ Thumbs.db
 *__pycache__/
 lib/__pycache__/
 lib/*.pyc
-
+config.txt

config.txt

@@ -1,6 +0,0 @@
-default_song = Roland_TR-808
-theme = default
-title = default
-bpm = 90
-volume = 10
-song_dir = /home/pi/zpc_ct/user/songs/drum_machines/

defender_scores.sco

@@ -1,6 +0,0 @@
-name1 = zilla
-name2 = robzilla
-name3 = zilla
-score1 = 1950
-score2 = 2050
-score3 = 2050

lib/StatesDefender.py

@@ -142,7 +142,6 @@ class Player:
 		self.o.draw.rectangle(((self.posx - hw), (self.posy - hh), (self.posx + hw), (self.posy + hh)), outline=self.o.light_grey, fill=self.o.light_grey)
 		self.o.draw.rectangle(((self.posx - (hw/4)), (self.posy - self.height), (self.posx + (hw/4)), (self.posy + hh)), outline=self.o.light_grey, fill=self.o.light_grey)
 
-
 	def check_keys(self, delta):
 		if self.o.keyState[0] == 2:
 			if self.posx > 0:
@@ -153,19 +152,9 @@ class Player:
 
 		elif self.o.keyState[1] == 1 or self.o.keyState[2] == 1:
 			self.game.bullets.append(Bullet(self.o, self.game, self.posx))
-
-
 			self.o.defender_sounds[0].set_volume(self.o.volume / 16)
 			pygame.mixer.Sound.play(self.o.defender_sounds[0])
 
-
-
-			# if self.file != None:
-			# 	if vol != 0:
-			# 		vol = (vol / 16) * (self.volume / 16) * (self.o.volume / 16)
-			# 		self.mixerSound.set_volume(vol)
-			# 	pygame.mixer.Sound.play(self.mixerSound)  
-
 class Bullet:
 	def __init__(self, o, game, x):
 		self.o = o
@@ -274,13 +263,11 @@ class Explode:
 		self.o.draw.rectangle(((c4[0] - hw), (c4[1] - hh), (c4[0] + hw), (c4[1] + hh)), outline=0, fill=self.o.light_grey)		
 
 	def update(self):
-		#self.posy -= self.game.bullet_speed * self.game.delta
 		self.gap += self.game.explode_speed * self.game.delta
 		self.width -= self.scale_speed * self.game.delta
 		self.height -= self.scale_speed * self.game.delta
 		if self.gap > 20:
 			self.game.explodes.remove(self)
-			print('killing explosion ', len(self.game.explodes))
 		self.draw()
 
 	def check_collision(self):
@@ -331,7 +318,6 @@ class Startup(State):
 		super(Startup, self).Enter()        
 		
 	def Execute(self):
-		print('defender startup state')
 		self.FSM.ToTransition('toIntro')
 		
 	def Exit(self):
@@ -353,7 +339,6 @@ class Intro(State):
 		
 	def Execute(self):
 		if (time.perf_counter() - self.birth) > 2:
-			print('time is up')
 			self.FSM.queued_state = "toMain"
 			self.FSM.ToTransition('toBlueFade')
 
@@ -369,13 +354,11 @@ class Main(State):
 		super(Main, self).__init__(FSM)    
 		
 	def Enter(self):
-		print('hello defender main')
 		o = self.FSM.owner 
 		o.draw.rectangle((0, 0, o.width, o.height), outline=0, fill=o.blue)
 		o.update_display(0)
 		self.game = Game(o)
 		o.game = self.game
-
 		super(Main, self).Enter()        
 		
 	def Execute(self):
@@ -419,6 +402,7 @@ class BlueFade(State):
 				ns = self.FSM.queued_state 
 				self.FSM.queued_state = None
 				self.FSM.ToTransition(ns)	
+
 	def Exit(self):
 		pass
 
@@ -438,7 +422,6 @@ class GreyFade(State):
 		self.y = self.o.height / 2
 		self.xsize = 0.0
 		self.ysize = 0.0
-
 		super(GreyFade, self).Enter()        
 		
 	def Execute(self):
@@ -470,12 +453,10 @@ class GameOver(State):
 		self.FSM.stateLife = 1
 		self.o = self.FSM.owner 
 		self.birth = pygame.time.get_ticks()
-
 		self.o.draw.rectangle((0, 0, self.o.width, self.o.height), outline=0, fill=self.o.blue)
 		self.o.center_block("Game Over", self.o.h2, [0, 0, self.o.width, self.o.height], self.o.light_grey)
 		self.o.center_block("Score: " + str(self.o.game.score), self.o.h2, [0, 20, self.o.width, self.o.height + 20], self.o.light_grey)
 		self.o.update_display(0)
-
 		super(GameOver, self).Enter()        
 		
 	def Execute(self):
@@ -485,11 +466,8 @@ class GameOver(State):
 
 		if (pygame.time.get_ticks() - self.birth) > 3000:
 			if self.o.game.score > self.o.game.hs_s1:
-				print('this is a new high score')
 				self.FSM.queued_state = "toNewHighScore"
 			else:
-				print('not a new high score')				
-			
 				self.FSM.queued_state = "toHighScore"
 			self.FSM.ToTransition('toBlueFade')
 
@@ -556,14 +534,11 @@ class EnterText(State):
 		
 	def Enter(self):
 		o = self.FSM.owner 
-	
 		self.input_string = ""
-		
 		self.last_action = pygame.time.get_ticks()
 		self.caps = False
 		self.cur_but = 18
 		self.cur_letter = ""
-
 		self.skips = [7, 3, 11, 12, 13, 14, 15]
 		
 		self.lc_labels = [["p", "q", "r", "s"], ["t", "u", "v"], ["w", "x", "y", "z"], ["C", "A", "P", "S"], 
@@ -581,8 +556,6 @@ class EnterText(State):
 		for l in self.labels:
 			self.cycles.append(cycle(l))
 
-
-
 		self.draw(o)
 		o.update_display(0)
 		super(EnterText, self).Enter()        
@@ -595,7 +568,6 @@ class EnterText(State):
 				o.game.hs_name = self.input_string
 
 				if o.game.score > o.game.hs_s3:
-					print('new first')
 					o.game.hs_s1 = o.game.hs_s2
 					o.game.hs_n1 = o.game.hs_n2
 					o.game.hs_s2 = o.game.hs_s3
@@ -604,17 +576,14 @@ class EnterText(State):
 					o.game.hs_n3 = o.game.hs_name
 
 				elif o.game.score > o.game.hs_s2:
-					print('new second')
 					o.game.hs_s1 = o.game.hs_s2
 					o.game.hs_n1 = o.game.hs_n2
 					o.game.hs_s2 = o.game.score
 					o.game.hs_n2 = o.game.hs_name
 				else:
-					print('new third')
 					o.game.hs_s1 = o.game.score
 					o.game.hs_n1 = o.game.hs_name
 
-				print('new high score saving')
 				self.FSM.queued_state = 'toHighScore'		
 				self.FSM.ToTransition('toBlueFade')		
 				o.game.save_highscore()
@@ -634,19 +603,15 @@ class EnterText(State):
 						o.center_block(self.input_string + self.cur_letter, o.h2, [0, 0, o.width, y_size], o.light_grey)
 
 					if _iter == 7:
-						
 						self.input_string = self.input_string[:-1]
-						print('deleting')
 						self.last_action = 100000000
 						self.draw(o)
 						o.center_block(self.input_string, o.h2, [0, 0, o.width, y_size], o.light_grey)
 
 					elif _iter == 3:
-						print('caps')
 						if self.caps:
 							self.caps = False
 							self.labels = self.lc_labels
-
 						else:
 							self.caps = True
 							self.labels = self.uc_labels
@@ -666,7 +631,6 @@ class EnterText(State):
 			self.last_action = 100000000
 			self.reset_cycles()
 			self.draw(o)
-
 			o.center_block(self.input_string, o.h2, [0, 0, o.width, y_size], o.light_grey)
 			o.update_display(0)
 

lib/menus.py

@@ -27,16 +27,10 @@ def draw_menu1(o):
 			o.center_block("File", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
 		if _id == 5:
 			o.center_block("Util", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
-		# if _id == 6:
-		# 	o.center_block("Bank-", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
-		# if _id == 7:
-		# 	o.center_block("Bank+", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
 		if _id == 8:
 			o.center_block("Vol-", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
 		if _id == 9:
 			o.center_block("Vol+", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
-		#if _id == 11:
-			#o.center_block("", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
 		if _id == 12:
 			o.center_block("Play", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
 		if _id == 13:
@@ -245,17 +239,12 @@ def draw_menu_saveas(o):
 
 def menu1_actions(self, o):
 	if o.keyState[8] == 4 or o.keyState[8] == 3:
-		#print('reset repeat from menu')
 		o.button_repeater(1,[])
 
 	if o.keyState[9] == 4 or o.keyState[9] == 3:
-		#print('reset repeat from menu')
 		o.button_repeater(1,[])
 
 	if o.keyState[16] == 2:
-		#print('key 8 ', o.keyState[8])
-		#o.button_repeater(0, [8,9,14,15])
-
 		if o.keyState[0] == 1:
 			self.FSM.ToTransition('toMain')
 		elif o.keyState[1] == 1:
@@ -303,9 +292,8 @@ def menu1_actions(self, o):
 				o.volume += 1
 				u.text_center(o, "Master Volume", str(o.volume))
 				o.update_display(0)
-		if o.keyState[11] == 1:
-			#o.save_song()
 
+		if o.keyState[11] == 1:
 			pass
 
 		if o.keyState[10] == 2:
@@ -345,39 +333,30 @@ def menu1_actions(self, o):
 
 def menu2_actions_sample(self, o):
 	if o.keyState[6] == 4 or o.keyState[6] == 3:
-		#print('reset repeat from menu')
 		o.button_repeater(1,[])
 
 	if o.keyState[7] == 4 or o.keyState[7] == 3:
-		#print('reset repeat from menu')
 		o.button_repeater(1,[])
 
 	if o.keyState[8] == 4 or o.keyState[8] == 3:
-		#print('reset repeat from menu')
 		o.button_repeater(1,[])
 
 	if o.keyState[9] == 4 or o.keyState[9] == 3:
-		#print('reset repeat from menu')
 		o.button_repeater(1,[])
 
 	if o.keyState[10] == 4 or o.keyState[10] == 3:
-		#print('reset repeat from menu')
 		o.button_repeater(1,[])
 
 	if o.keyState[11] == 4 or o.keyState[11] == 3:
-		#print('reset repeat from menu')
 		o.button_repeater(1,[])
 
 	if o.keyState[17] == 2:
 		if o.keyState[0] == 1:
 			if o.soundSlots[o.eSound].volume > 0:
-				#print('copy')
 				o.soundClipboard = [o.soundSlots[o.eSound].file, o.soundSlots[o.eSound].volume, o.soundSlots[o.eSound].pitch]
-				#print(o.soundClipboard)
 
 		if o.keyState[1] == 1:
 			if o.soundClipboard != []:
-				#print('pasting ', o.soundClipboard)				
 				o.soundSlots[o.eSound].file = o.soundClipboard[0]
 				o.soundSlots[o.eSound].volume = o.soundClipboard[1]
 				o.soundSlots[o.eSound].pitch = o.soundClipboard[2]
@@ -385,15 +364,12 @@ def menu2_actions_sample(self, o):
 				o.soundSlots[o.eSound].set_pitch()
 			
 		if o.keyState[2] == 1:
-			#print('delete sound ', o.eSound)
 			o.soundSlots[o.eSound].file = None
 			o.soundSlots[o.eSound].volume = 16
 			o.soundSlots[o.eSound].pitch = 0
 		if o.keyState[3] == 1:
-			#print('load')
 			o.FSM.FSM.ToTransition("toLoadSound")
 
-
 		if o.keyState[4] == 1:
 			o.prev = not o.prev
 			draw_menu2_sample(o)
@@ -468,7 +444,6 @@ def menu2_actions_sample(self, o):
 					o.update_display(0)
 				o.repeater_states[10] = pygame.time.get_ticks()
 
-
 		if o.keyState[10] == 1:
 			if o.soundSlots[o.eSound].pitch > -10:
 				o.soundSlots[o.eSound].pitch -= 1
@@ -498,12 +473,10 @@ def menu2_actions_sample(self, o):
 		if o.keyState[12] == 1:
 			o.odub = not o.odub
 			o.undo_buf = []
-			#print('odub now is ', o.odub)
 			draw_menu2_sample(o)
 			o.update_display(0)
 
 		if o.keyState[13] == 1:
-			#print('undo something')
 			for i in o.undo_buf:
 				o.soundSlots[i[0]].notes[i[1]][i[2]][0] = 0
 				o.soundSlots[i[0]].notes[i[1]][i[2]][1] = 0
@@ -512,7 +485,6 @@ def menu2_actions_sample(self, o):
 		if o.keyState[14] == 1:
 			o.erase = not o.erase
 			o.erase_buf = []
-			#print('erase now is ', o.erase)
 			if o.erase:
 				o.mute = False
 				o.mute_buf = []
@@ -522,7 +494,6 @@ def menu2_actions_sample(self, o):
 		if o.keyState[15] == 1:
 			o.mute = not o.mute
 			o.mute_buf = []
-			#print('mute now is ', o.mute)
 			if o.mute:
 				o.erase = False
 				o.erase_buf = []
@@ -532,17 +503,14 @@ def menu2_actions_sample(self, o):
 def menu2_actions_pattern(self, o):
 	if o.keyState[17] == 2:
 		if o.keyState[0] == 1:
-			#print('copy')
 			o.patternClipboard = []
 			for s in o.soundSlots:
 				notes = []
 				for i in s.notes[o.ePattern]:
 					notes.append([i[0], i[1]])
 				o.patternClipboard.append(notes)
-				#print('adding to clip ', notes)
 			
 		elif o.keyState[1] == 1:
-			#print('paste')
 			if o.patternClipboard != []:
 				p = 0
 				for s in o.soundSlots:
@@ -551,15 +519,11 @@ def menu2_actions_pattern(self, o):
 						i[0] = o.patternClipboard[p][n][0]
 						i[1] = o.patternClipboard[p][n][1]
 						n += 1
-					#print('added ', o.patternClipboard[p])
 					p += 1
 			else:
 				pass
-				#print('nothing to paste')
 			
 		elif o.keyState[2] == 1:
-			#print('clear')
-			#print(o.soundSlots[o.eSound].notes[o.ePattern])
 			for s in o.soundSlots:
 				for i in s.notes[o.ePattern]:
 					i[0] = 0
@@ -605,10 +569,8 @@ def menu2_actions_pattern(self, o):
 			if o.pat_perf:
 				o.pat_buf = o.song
 				o.song = []
-				print('song is now ', o.song)
 			else:
 				o.song = o.pat_buf
-				print('song is now ', o.song)
 
 			draw_menu2_pattern(o)
 			o.update_display(0)		
@@ -626,22 +588,15 @@ def menu2_actions_song(self, o):
 				o.pat_bank += 1
 				u.text_center(o, "Pattern Bank", str(o.pat_bank))
 				o.update_display(0)		
-				
-
-				
-
+			
 def menu2_actions_note(self, o):
 	if o.keyState[8] == 4 or o.keyState[8] == 3:
-		#print('reset repeat from menu')
 		o.button_repeater(1,[])
 
 	if o.keyState[9] == 4 or o.keyState[9] == 3:
-		#print('reset repeat from menu')
 		o.button_repeater(1,[])
 
 	if o.keyState[17] == 2:
-		
-
 		if o.keyState[8] == 2:
 			if (o.repeater_states[8] != None and ((pygame.time.get_ticks() - o.repeater_states[8]) > 500)):
 				if o.note_vol > 0:
@@ -677,8 +632,6 @@ def menu2_actions_note(self, o):
 				o.patternFollow = False
 			else:
 				o.patternFollow = True
-
-			#print('pattern follow is ', o.patternFollow)
 			draw_menu2_note(o)
 			o.update_display(0)			
 					
@@ -686,13 +639,10 @@ def menu2_actions_note(self, o):
 def menu2_actions_saveas(self, o):
 	if o.keyState[17] == 2:
 		if o.keyState[12] == 1:
-			#print('select folder')
 			self.FSM.ToTransition('toSelectFolder')	
 		elif o.keyState[14] == 1:
-			#print('new folder')
 			self.FSM.ToTransition('toNewDir')	
 
-
 def util_command(self, o, command):
 	if command == "Clock":
 		self.FSM.ToTransition('toClock')		
@@ -725,7 +675,6 @@ def file_command(self, o, command):
 			o.save_song()
 		else:
 			pass
-			#print('cant save over blank')
 	
 	elif command == "Open":
 		self.FSM.ToTransition('toOpenSong')	

lib/sBall.py

@@ -58,10 +58,6 @@ class Ball(State):
 		if o.keyState[16] > 0 or o.keyState[17] > 0:
 			pass
 		else:			
-			#now = datetime.now()
-			#current_time = time.strftime("%-I:%M %p")
-
-
 			if self.ballx < (0 + self.ball_size):
 				self.ball_x_dir = 1
 			if self.ballx > (o.width - self.ball_size):
@@ -72,15 +68,9 @@ class Ball(State):
 			if self.bally > (o.height - self.ball_size):
 				self.ball_y_dir = -1
 
-			# if self.ballx > (o.width - self.ball_size) or self.ballx < (0 + self.ball_size):
-			# 	self.ball_x_dir *= -1
-			# if self.bally > (o.height - self.ball_size) or self.bally < (0 + self.ball_size):
-			# 	self.ball_y_dir *= -1
-
 			self.ballx += self.ball_speed * self.ball_x_dir
 			self.bally += self.ball_speed * self.ball_y_dir
 
-
 			if self.ball2x < (0 + self.ball_size):
 				self.ball2_x_dir = 1
 				self.xmult = random.uniform(.6, 1.2)
@@ -93,13 +83,6 @@ class Ball(State):
 			if self.ball2y > (o.height - self.ball_size):
 				self.ball2_y_dir = -1			
 
-
-			# if self.ball2x > (o.width - self.ball_size) or self.ball2x < (0 + self.ball_size):
-			# 	self.ball2_x_dir *= -1
-			# 	self.xmult = random.uniform(.8, 1.2)
-			# if self.ball2y > (o.height - self.ball_size) or self.ball2y < (0 + self.ball_size):
-			# 	self.ball2_y_dir *= -1
-
 			self.ball2x += (self.ball_speed * self.ball2_x_dir) * self.xmult
 			self.ball2y += (self.ball_speed * self.ball2_y_dir) 
 
@@ -107,7 +90,6 @@ class Ball(State):
 			
 			o.draw.ellipse((self.ballx - self.ball_size, self.bally - self.ball_size, self.ballx + self.ball_size, self.bally + self.ball_size), fill = o.light_grey, outline =o.light_grey)
 			o.draw.ellipse((self.ball2x - self.ball_size, self.ball2y - self.ball_size, self.ball2x + self.ball_size, self.ball2y + self.ball_size), fill = o.light_grey, outline =o.light_grey)
-			#o.center_block(current_time, o.h3, [0,0,o.width,o.height], o.pink)
 			o.update_display(0)
 		
 	def ReceiveMessage(self, message):

lib/sCalculator.py

@@ -64,14 +64,12 @@ class Calculator(State):
 
 	def append_num(self, num):
 		ops = ['+', '-', '*', '/']
-		print('appending num ', num)
 		if num in ops:
 			if self.num1 != '':
 				self.op = num
 				self.num2 = ''
 				self.result = ''
 		elif num == '=':
-			print('this is that')
 			if self.num2 != '':
 				if self.result == '':
 					if self.op == '+':
@@ -109,10 +107,8 @@ class Calculator(State):
 				self.result = ''
 			if self.op == '':
 				self.num1 += num
-				print('---append ', num)
 			else:
 				self.num2 += num
-				print('---append ', num)
 
 	def check_keys(self, o):
 		_iter = 0
@@ -157,7 +153,6 @@ class Calculator(State):
 			_iter += 1
 
 	def draw_main(self, o):
-		print('drawing ', self.num1)
 		x_size = o.width / 4
 		y_size = o.height / 5
 		og_x = 0
@@ -167,10 +162,7 @@ class Calculator(State):
 		
 		_id = 0
 		while _id < 20:
-			# lab = ""
-			# for i in self.labels[_id]:
-			# 	lab += i
-
+			
 			lab = self.labels[_id]
 
 			o.draw.rectangle((o_x, o_y, o_x + x_size, o_y - y_size), outline=0, fill=o.blue)
@@ -181,11 +173,11 @@ class Calculator(State):
 			if _id % 4 == 0:
 				o_y -= y_size
 				o_x = og_x
-		#o.draw.rectangle((0, 0, o.width, y_size), outline=0, fill=o.blue)
+
 		o.draw.rectangle((0, 0, x_size * 3, y_size), outline=0, fill=o.blue)
 		o.draw.rectangle((x_size * 3, 0, o.width, y_size), outline=0, fill=o.blue)
 		o.center_block("Clear", o.h2, [x_size * 3, 0, o.width, y_size], o.light_grey)
-		#o.center_block('where is my fucking text', o.h2, [0, 0, o.width, y_size], o.light_grey)
+
 		if self.num1 != '':
 			if self.result != '':
 				o.center_block(str(self.result), o.h2, [0, 0, x_size * 3, y_size], o.light_grey)
@@ -195,9 +187,9 @@ class Calculator(State):
 				o.center_block(str(self.op), o.h2, [0, 0, x_size * 3, y_size], o.light_grey)
 			else:
 				o.center_block(str(self.num1), o.h2, [0, 0, x_size * 3, y_size], o.light_grey)
-			print('fucking do something')
+
 		else:
-			print('num1 is empty')
+			pass
 		o.update_display(0)
 
 	def ReceiveMessage(self, message):

lib/sDefender.py

@@ -20,10 +20,8 @@ class Defender(State):
 		super(Defender, self).__init__(FSM)    
 		
 	def Enter(self):
-		o = self.FSM.owner 
-		
+		o = self.FSM.owner 		
 		self.gameFSM = FSM.DefenderFSM(o)
-
 		super(Defender, self).Enter()        
 		
 	def Execute(self):
@@ -33,15 +31,9 @@ class Defender(State):
 			m.draw_menu1(o)
 			o.update_display(0)
 		elif o.keyState[16] == 4:
-			#u.draw_header(o)
-			#self.draw_footer(o)
-			#self.draw_main(o)
-			#o.update_display(0)		
 			pass
 
 		if o.keyState[16] > 0 or o.keyState[17] > 0:
-
-		#if o.keyState[16] > 0:
 			pass
 		else:
 			self.gameFSM.Execute()

lib/sEnterText.py

@@ -99,11 +99,6 @@ class EnterText(State):
 			u.draw_header(o)
 			self.draw(o)
 			o.update_display(0)
-
-		# if o.keyState[0] == 1 or o.keyState[0] == 3 or o.keyState[1] == 1 or o.keyState[1] == 3 or o.keyState[2] == 1 or o.keyState[2] == 3 or o.keyState[3] == 1 or o.keyState[3] == 3:
-		# 	u.draw_header(o)
-		# 	self.draw(o)
-		# 	o.update_display(0)	
 			
 		if o.keyState[16] > 0 or o.keyState[17] > 0:
 			pass

lib/sMain.py

@@ -33,7 +33,6 @@ class Main(State):
 			u.draw_header(o)
 			self.draw_square()
 			u.text_box1(o, "Pat", str(o.curPattern))
-			#u.text_box1(o, "Vol", str(o.soundSlots[o.eSound].volume))
 			u.text_box2(o, "BPM", str(o.bpm))
 			u.text_box4(o, "Bank", str(o.note_bank))
 			u.text_box3(o, "Pitch", str(o.soundSlots[o.eSound].pitch))
@@ -60,7 +59,6 @@ class Main(State):
 		elif o.keyState[16] == 4:
 			u.draw_header(o)
 			self.draw_square()
-			#u.text_box1(o, "Vol", str(o.soundSlots[o.eSound].volume))
 			u.text_box1(o, "Pat", str(o.curPattern))
 			u.text_box2(o, "BPM", str(o.bpm))
 			u.text_box4(o, "Bank", str(o.note_bank))
@@ -74,7 +72,6 @@ class Main(State):
 		elif o.keyState[17] == 4:
 			u.draw_header(o)
 			self.draw_square()
-			#u.text_box1(o, "Vol", str(o.soundSlots[o.eSound].volume))
 			u.text_box1(o, "Pat", str(o.curPattern))
 			u.text_box2(o, "BPM", str(o.bpm))
 			u.text_box4(o, "Bank", str(o.note_bank))
@@ -127,11 +124,11 @@ class Main(State):
 			u.draw_header(o)            
 			self.draw_square()   
 			u.text_box1(o, "Pat", str(o.curPattern))
-			#u.text_box1(o, "SVol", str(o.soundSlots[o.eSound].volume))
 			u.text_box2(o, "BPM", str(o.bpm))
 			u.text_box4(o, "Bank", str(o.note_bank))
 			u.text_box3(o, "Pitch", str(o.soundSlots[o.eSound].pitch))			         
 			o.update_display(0)
+
 		if self.record_queue != []:
 			cur_time = pygame.time.get_ticks()
 			note_pos = (cur_time - self.record_queue) - (o.half_bpm / 2)
@@ -151,7 +148,6 @@ class Main(State):
 						o.soundSlots[o.eSound].notes[message[0]][message[1]][0] = 1
 						o.soundSlots[o.eSound].notes[message[0]][message[1]][1] = o.note_vol
 						o.undo_buf.append([o.eSound, message[0], message[1]])
-
 		self.record_queue = []
 
 	def draw_square(self):

lib/sNewDir.py

@@ -95,14 +95,7 @@ class NewDir(State):
 		elif o.keyState[17] == 4:
 			u.draw_header(o)
 			self.draw(o)
-			o.update_display(0)
-
-		# if o.keyState[0] == 1 or o.keyState[0] == 3 or o.keyState[1] == 1 or o.keyState[1] == 3 or o.keyState[2] == 1 or o.keyState[2] == 3 or o.keyState[3] == 1 or o.keyState[3] == 3:
-		# 	u.draw_header(o)
-		# 	self.draw(o)
-		# 	#self.draw_main(o)
-		# 	o.update_display(0)	
-			
+			o.update_display(0)			
 
 		if o.keyState[16] > 0 or o.keyState[17] > 0:
 			pass
@@ -165,8 +158,8 @@ class NewDir(State):
 		o_x = og_x
 		o_y = o.height
 		text_padding = 6
-		
 		_id = 0
+		
 		while _id < 16:
 			lab = ""
 			for i in self.labels[_id]:
@@ -174,7 +167,6 @@ class NewDir(State):
 
 			if _id == 8:
 				lab = "_12"
-
 			o.draw.rectangle((o_x, o_y, o_x + x_size, o_y - y_size), outline=0, fill=o.blue)
 			o.center_block(lab, o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
 

lib/sPing.py

@@ -45,14 +45,12 @@ class Ping(State):
 			self.draw_main(o)
 			o.update_display(0)	
 			
-		
 	def draw_main(self, o):
 		o.center_block(self.pinging, o.h2, [0, 0, o.width, o.height], o.light_grey)
 
 	def check_ping(self):
 		hostname = "8.8.8.8"
 		response = os.system("ping -c 1 " + hostname)
-		# and then check the response...
 		if response == 0:
 			pingstatus = "Network Active "
 		else:

lib/sSelTheme.py

@@ -36,7 +36,7 @@ class SelTheme(State):
 			_id = self.names.index(o.mconf['theme'])
 			self.cur_el = _id
 		else:
-			print('nope ', o.mconf['theme'], ' - ', self.globbed)
+			pass
 		self.menu = self.names
 
 		if o.keyState[16] > 0 or o.keyState[17] > 0:
@@ -65,7 +65,6 @@ class SelTheme(State):
 			self.draw_footer(o)
 			self.draw_main(o)
 			o.update_display(0)	
-			print('draw butt')				
 
 		if o.keyState[16] > 0 or o.keyState[17] > 0:
 			pass
@@ -77,7 +76,6 @@ class SelTheme(State):
 					o.save_config()
 					o.load_config()
 					o.apply_theme()
-					print('cur el down is ', self.cur_el)
 
 			if o.keyState[1] == 1:
 				if self.cur_el < (len(self.menu) - 1):
@@ -86,8 +84,6 @@ class SelTheme(State):
 					o.save_config()
 					o.load_config()
 					o.apply_theme()
-					print('cur el up is ', self.cur_el)
-					print('loading theme ', self.menu[self.cur_el], '-- ', o.mconf['theme'])
 
 			if o.keyState[3] == 1:
 				m.util_command(self, o, self.menu[self.cur_el])
@@ -150,7 +146,6 @@ class SelTheme(State):
 			xpos += width
 			_iter += 1
 		
-
 	def ReceiveMessage(self, message):
 		o = self.FSM.owner 
 		u.play_seq(o, message)

lib/sSelectFolder.py

@@ -33,7 +33,6 @@ class SelectFolder(State):
 		files = u.get_files(o.song_dir, '.zzz')
 		files_trimmed = [os.path.basename(x) for x in files]
 		files_trimmed = [os.path.splitext(x)[0] for x in files_trimmed]
-		print('files trimmed ', files_trimmed)
 		files_trimmed.insert(0, '..')
 		self.menu = files_trimmed
 		if '_blank' in self.menu:
@@ -49,11 +48,7 @@ class SelectFolder(State):
 		super(SelectFolder, self).Enter()    
 
 	def Execute(self):
-
-		#print('doing select folder')
 		o = self.FSM.owner 
-		#u.draw_header(o)
-		#o.update_display(0)
 		m.menu1_actions(self, o)
 		if o.keyState[16] == 1:
 			m.draw_menu1(o)
@@ -74,43 +69,26 @@ class SelectFolder(State):
 			u.draw_header(o)
 			self.draw_footer(o)
 			self.draw_main(o)
-			o.update_display(0)	
-			
+			o.update_display(0)				
 
 		if o.keyState[16] > 0 or o.keyState[17] > 0:
-
 			pass
 		else:
 			u.scroll_ud(o, self)
-			# if o.keyState[0] == 1:
-			# 	if self.cur_el > 0:
-			# 		self.cur_el -= 1
-			# 		print('cur el down is ', self.cur_el)
-
-			# if o.keyState[1] == 1:
-			# 	if self.cur_el < (len(self.menu) - 1):
-			# 		self.cur_el += 1
-			# 		print('cur el up is ', self.cur_el)
 
 			if o.keyState[2] == 1:
-				print('old song dir is ', o.song_dir)
-				print('new song dir is ', self.menu[self.cur_el])
 				self.FSM.ToTransition('toEnterText')
 
 			if o.keyState[3] == 1:
 				if self.menu[self.cur_el] == '..':
-					print('move up dir')
 					if o.song_dir == o.base_song_dir:
 						pass
 					else:
-						print('old song dir ', o.song_dir)
 						o.song_dir = os.path.dirname(os.path.dirname(o.song_dir))
 						o.song_dir += '/'
-						print('new song dir ', o.song_dir)
 						files = u.get_files(o.song_dir, '.zzz')
 						files_trimmed = [os.path.basename(x) for x in files]
 						files_trimmed = [os.path.splitext(x)[0] for x in files_trimmed]
-						print('files trimmed ', files_trimmed)
 						files_trimmed.insert(0, '..')
 						self.menu = files_trimmed
 						if '_blank' in self.menu:
@@ -123,33 +101,24 @@ class SelectFolder(State):
 
 				elif os.path.isdir(o.song_dir + self.menu[self.cur_el]):
 					o.song_dir += self.menu[self.cur_el] + '/'
-					print('new song dir is ', o.song_dir)
-					
 					files = u.get_files(o.song_dir, '.zzz')
 					files_trimmed = [os.path.basename(x) for x in files]
 					files_trimmed = [os.path.splitext(x)[0] for x in files_trimmed]
-					print('files trimmed ', files_trimmed)
 					files_trimmed.insert(0, '..')
 					self.menu = files_trimmed
 					if '_blank' in self.menu:
 						self.menu.remove('_blank')
 					u.draw_header(o)
-					
 					self.draw_footer(o)
 					self.draw_main(o)
 					o.update_display(0)			
-
 				else:
 					pass
-					#o.mconf['default_song'] = self.menu[self.cur_el]
-					#o.save_config()
-					#o.load_song()
 
 	def draw_main(self, o):
 		al = []
 		ypos = 30
 
-
 		if self.cur_el > (len(self.menu) - 1):
 			self.cur_el = 0
 		if self.cur_el == 0:
@@ -159,16 +128,6 @@ class SelectFolder(State):
 					al.append(self.menu[_iter])
 				_iter += 1
 
-		# print('cur el ', self.cur_el)
-		# if self.cur_el > (len(self.menu) - 1):
-		# 	self.cur_el = 0
-		# if self.cur_el == 0:
-		# 	_iter = 0
-		# 	while _iter < 4:
-		# 		if _iter < (len(self.menu)):
-		# 			al.append(self.menu[_iter])
-				
-		#		_iter += 1
 		elif self.cur_el == 1:
 			al.append(self.menu[self.cur_el - 1])
 			al.append(self.menu[self.cur_el])
@@ -193,7 +152,6 @@ class SelectFolder(State):
 		for i in al:
 			
 			if i == self.menu[self.cur_el]:
-			#if _iter == self.cur_el:
 				if os.path.isdir(o.song_dir + i):
 					i += "/"
 				o.draw.rectangle((0, ypos, o.width, ypos + 20), outline=0, fill=o.light_grey)
@@ -220,17 +178,13 @@ class SelectFolder(State):
 				o.draw.rectangle((xpos, yposa, xpos + width, yposb), outline=0, fill=o.light_grey)
 				o.center_block(opts[_iter], o.h2, [xpos,yposa,xpos + width,yposb], o.blue)
 			else:
-				o.center_block(opts[_iter], o.h2, [xpos,yposa,xpos + width,yposb], o.light_grey)
-			
+				o.center_block(opts[_iter], o.h2, [xpos,yposa,xpos + width,yposb], o.light_grey)			
 			xpos += width
 			_iter += 1
 		
-
 	def ReceiveMessage(self, message):
 		o = self.FSM.owner 
 		u.play_seq(o, message)
 		
 	def Exit(self):
-		print('why the fuck are we leaving')
-		self.FSM.owner.pub.unregister("beat", self)
-
+		self.FSM.owner.pub.unregister("beat", self)

lib/sSelectPattern.py

@@ -80,20 +80,15 @@ class SelectPattern(State):
 					if k == 1:
 						if o.pat_perf:
 							this = o.ePattern = (o.pat_bank * 16) +_id 
-							#print('we should play ', this)	
 							o.song = [this]
 							o.songCycle = cycle(o.song)
 							o.songStart = this
 							if not o.playing:
-								
-								
 								o.start_playback()
 								u.play_seq(o, [o.curPattern, 0])
 						o.ePattern = (o.pat_bank * 16) +_id 
-
 						u.draw_header(o)
 						self.draw_square()
-						
 						u.text_box1(o, "Pat", str(o.ePattern))
 						u.text_box4(o, "Bank", str(o.pat_bank))
 						o.update_display(0)
@@ -113,17 +108,10 @@ class SelectPattern(State):
 				u.text_box1(o, "Pat", str(o.ePattern))
 				u.text_box4(o, "Bank", str(o.pat_bank))
 				o.update_display(0)
-			# if o.pat_odub:
-			# 	print('add to record queue ', o.song[0])
-			# else:
-			# 	print('not recording')
-		#print(message)
 		if o.pat_odub:
 			if message[1] == 0:
 				if len(o.song) > 0:
-					#print('adding to rec', o.song[0])
 					o.song_in.append(o.song[0])
-					#print('adding to song_in ', o.song_in)
 
 	def draw_square(self):
 		o = self.FSM.owner 
@@ -166,13 +154,8 @@ class SelectPattern(State):
 	def Exit(self):
 		o = self.FSM.owner 
 		o.pub.unregister("beat", self)
-		# if len(o.song) < 1 and len(o.pat_buf) > 0:
-		# 	o.song = o.pat_buf
-		# 	o.pat_buf = []
 		o.pat_perf = False
-		
 		o.song = o.pat_buf
 		o.pat_buf = []
 		o.songCycle = cycle(o.song)
-		o.songStart = o.song[0]
-		#print('song is ', o.song)
+		o.songStart = o.song[0]

lib/sShutdown.py

@@ -28,7 +28,6 @@ class Shutdown(State):
 		o.draw.rectangle((0, 0, o.width, o.height), outline=0, fill=o.blue)			
 		o.center_block("shutting down", o.h2, [0, 0, o.width,o.height - 20], o.light_grey)
 		o.center_block("(unplug in 20s)", o.h2, [0, 10, o.width,o.height+10], o.light_grey)
-		#o.center_block("thank you for playing", o.h2, [0, 30, o.width,o.height+30], o.light_grey)
 		o.update_display(0)
 		command = 'bash -c "sleep 5; sudo shutdown -h now"&'
 		os.system(command)

lib/sUtil.py

@@ -33,7 +33,6 @@ class Util(State):
 			self.draw_footer(o)
 			self.draw_main(o)
 			o.update_display(0)
-
 		super(Util, self).Enter()        
 		
 	def Execute(self):
@@ -52,8 +51,7 @@ class Util(State):
 			u.draw_header(o)
 			self.draw_footer(o)
 			self.draw_main(o)
-			o.update_display(0)	
-			print('draw butt')				
+			o.update_display(0)					
 
 		if o.keyState[16] > 0 or o.keyState[17] > 0:
 			pass

lib/utils.py

@@ -14,38 +14,28 @@ def play_seq(o, message):
 		if s.notes[message[0]][message[1]][0] == 1:
 			if o.erase:
 				if _id in o.erase_buf:
-					#pass
 					s.notes[message[0]][message[1]][0] = 0
-					print('erasing')
-					#o.undo_buf.append(s.notes[message[0]][message[1]][0])
 				else:
 					o.notes_on[_id] = 1
 					o.soundSlots[_id].play(s.notes[message[0]][message[1]][1])
 			elif o.mute:
 				if _id in o.mute_buf:
-					#pass
-					#s.notes[message[0]][message[1]][0] = 0
-					print('muting')
-					#o.undo_buf.append(s.notes[message[0]][message[1]][0])
+					pass					
 				else:
 					o.notes_on[_id] = 1
 					o.soundSlots[_id].play(s.notes[message[0]][message[1]][1])
 			else:
-
 				o.notes_on[_id] = 1
 				o.soundSlots[_id].play(s.notes[message[0]][message[1]][1])
 		_id += 1
 
 def erase_note(o, message, pressed):
 	_id = 0
-	#o.clear_notes_on()
-
 	for s in o.soundSlots:
 		if s.notes[message[0]][message[1]][0] == 1:
 			o.notes_on[_id] = 1
 			o.soundSlots[_id].play(s.notes[message[0]][message[1]][1])
 		_id += 1
-
 			
 def text_box1(o, a, b):
 	w1 = 0
@@ -88,8 +78,6 @@ def text_center(o, a, b):
 	o.center_block(a, o.h1, [w1,h1,w2,h2], o.light_grey)
 	o.center_block(b, o.h1, [w1,h1+20,w2,h2+45], o.light_grey)
 
-
-
 def breakup_song_text(song):
 	line1 = ""
 	line2 = ""
@@ -151,21 +139,6 @@ def breakup_song_text(song):
 def get_folders(path):
 	globbed = glob.glob(path + "/*/")
 	globbed.sort()
-
-
-		# dirs = os.listdir(o.load_sound_dir)
-		# dirs.sort()
-		# for i in dirs:
-		# 	if os.path.isdir(o.load_sound_dir + i):
-		# 		i += "/asdfasdfasf"
-		# 		print(i, ' is a directory')
-		# 	else:
-		# 		print(i, ' is not a directory')
-		# print(dirs)
-		# return dirs
-
-
-
 	return globbed
 
 def get_files(path, ext):
@@ -173,13 +146,11 @@ def get_files(path, ext):
 	out = []
 	files = os.listdir(path)
 	files.sort()
-	print('from utils ', files)
 	for file in files:
 	    if os.path.isdir(path + file):
 	        out.append(file)
 	    else:
 	    	pass
-
 	for file in files:
 	    if file.lower().endswith(ext):
 	    	if os.path.isdir(path + file):
@@ -188,14 +159,12 @@ def get_files(path, ext):
 	        	out.append(file)
 	    else:	 
 	    	pass
-	
 	out2 = []
 	for f in out:
 		if f[0] == '.':
 			pass
 		else:
 			out2.append(f)
-
 	return out2
 
 def scroll_ud(o, self):