Merge branch 'master' into feature/stepseq

zynautoconnect/zynthian_autoconnect.py

@@ -38,7 +38,7 @@
 # Configure logging
 #-------------------------------------------------------------------------------
 
-log_level = logging.DEBUG
+log_level = logging.WARNING
 
 logger=logging.getLogger(__name__)
 logger.setLevel(log_level)
@@ -639,7 +639,7 @@ def is_running():
 
 
 def cb_jack_xrun(delayed_usecs: float):
-	logger.error("Jack Audio XRUN!")
+	logger.warning("Jack Audio XRUN!")
 	zynthian_gui_config.zyngui.status_info['xrun'] = True
 
 

zyngui/zynthian_gui_base.py

@@ -55,6 +55,7 @@ def __init__(self):
 		self.status_error = None
 		self.status_recplay = None
 		self.status_midi = None
+		self.status_midi_clock = None
 
 		#Status Area Parameters
 		self.status_h = zynthian_gui_config.topbar_height
@@ -299,17 +300,10 @@ def refresh_status(self, status={}):
 				self.status_canvas.itemconfig(self.status_recplay, text=flags, fill=color)
 
 			# Display MIDI flag
-			ul = None
-			flags = ""
-			if 'midi_clock' in status and status['midi_clock']:
-				#flags="\uf017";
-				ul = 0
 			if 'midi' in status and status['midi']:
-				flags = "m"
-				#flags = "\uf001"
-			elif ul is not None:
-				flags = "__"
-				ul = None
+				mstate = "normal"
+			else:
+				mstate = "hidden"
 
 			if not self.status_midi:
 				self.status_midi = self.status_canvas.create_text(
@@ -319,9 +313,27 @@ def refresh_status(self, status={}):
 					justify=tkinter.RIGHT,
 					fill=zynthian_gui_config.color_status_midi,
 					font=("FontAwesome", self.status_fs, "bold"),
-					text=flags, underline=ul)
+					text="m",
+					state=mstate)
+			else:
+				self.status_canvas.itemconfig(self.status_midi, state=mstate)
+
+			# Display MIDI clock flag
+			if 'midi_clock' in status and status['midi_clock']:
+				mcstate = "normal"
+			else:
+				mcstate = "hidden"
+
+			if not self.status_midi_clock:
+				self.status_midi_clock = self.status_canvas.create_line(
+					int(self.status_l-self.status_fs*1.7+1),
+					int(self.status_h*0.85),
+					int(self.status_l-2),
+					int(self.status_h*0.85),
+					fill=zynthian_gui_config.color_status_midi,
+					state=mcstate)
 			else:
-				self.status_canvas.itemconfig(self.status_midi, text=flags, underline=ul)
+				self.status_canvas.itemconfig(self.status_midi_clock, state=mcstate)
 
 
 	def cb_topbar(self,event):

zynthian_gui.py

@@ -1169,7 +1169,6 @@ def zynmidi_read(self):
 				ev=lib_zyncoder.read_zynmidi()
 				if ev==0: break
 
-				self.status_info['midi'] = True
 				evtype = (ev & 0xF00000) >> 20
 				chan = (ev & 0x0F0000) >> 16