Merge branch 'robotic_voice'

gr_client.py

@@ -317,7 +317,6 @@ _DESCRIPTION = '''
 
 class BlocksDemo:
 	def __init__(self, models_path, lojban_models_path, robotic_models_path):
-		# global voice_radio_init
 		self.models_path = models_path
 		self.lojban_models_path = lojban_models_path
 		self.robotic_models_path = robotic_models_path
@@ -613,7 +612,7 @@ class BlocksDemo:
 
 		if voice_id == 'x_selpahi':
 			sample_path = self.lojban_models_path
-		if voice_id == 'cnc_cabal':
+		elif voice_id == 'cnc_cabal':
 			sample_path = self.robotic_models_path
 		else:
 			sample_path = self.models_path