Misc fixing

src/digitalpeakmeter.py

@@ -46,29 +46,6 @@ class DigitalPeakMeter(QWidget):
         self.m_paintTimer.timeout.connect(self.update)
         self.m_paintTimer.start()
 
-    def minimumSizeHint(self):
-        return QSize(30, 30)
-
-    def sizeHint(self):
-        return QSize(self.m_width, self.m_height)
-
-    def checkSizes(self):
-        self.m_width = self.width()
-        self.m_height = self.height()
-        self.m_sizeMeter = 0
-
-        if (self.m_orientation == self.HORIZONTAL):
-          self.m_gradientMeter.setFinalStop(self.m_width, 0)
-          if (self.m_channels > 0):
-            self.m_sizeMeter = self.m_height/self.m_channels
-
-        elif (self.m_orientation == self.VERTICAL):
-          self.m_gradientMeter.setFinalStop(0, self.m_height)
-          if (self.m_channels > 0):
-            self.m_sizeMeter = self.m_width/self.m_channels
-
-        self.update()
-
     def displayMeter(self, meter_n, level):
         if (meter_n < 0 or meter_n > self.m_channels):
           qCritical("DigitalPeakMeter::displayMeter(%i, %f) - Invalid meter number", meter_n, level)
@@ -121,7 +98,7 @@ class DigitalPeakMeter(QWidget):
           self.m_gradientMeter.setColorAt(0.8, self.m_colorBase)
           self.m_gradientMeter.setColorAt(1.0, self.m_colorBase)
 
-        self.checkSizes()
+        self.updateSizes()
 
     def setRefreshRate(self, rate):
         self.m_paintTimer.stop()
@@ -135,6 +112,29 @@ class DigitalPeakMeter(QWidget):
           value = 5
         self.m_smoothMultiplier = value
 
+    def updateSizes(self):
+        self.m_width = self.width()
+        self.m_height = self.height()
+        self.m_sizeMeter = 0
+
+        if (self.m_orientation == self.HORIZONTAL):
+          self.m_gradientMeter.setFinalStop(self.m_width, 0)
+          if (self.m_channels > 0):
+            self.m_sizeMeter = self.m_height/self.m_channels
+
+        elif (self.m_orientation == self.VERTICAL):
+          self.m_gradientMeter.setFinalStop(0, self.m_height)
+          if (self.m_channels > 0):
+            self.m_sizeMeter = self.m_width/self.m_channels
+
+        self.update()
+
+    def minimumSizeHint(self):
+        return QSize(30, 30)
+
+    def sizeHint(self):
+        return QSize(self.m_width, self.m_height)
+
     def paintEvent(self, event):
         painter = QPainter(self)
 
@@ -224,5 +224,5 @@ class DigitalPeakMeter(QWidget):
           painter.drawLine(1, lsmall-(lsmall/1.04), lfull, lsmall-(lsmall/1.04))
 
     def resizeEvent(self, event):
-        self.checkSizes()
+        self.updateSizes()
         QWidget.resizeEvent(self, event)

src/icons/icons.qrc

@@ -5,7 +5,9 @@
             <file>16x16/edit-delete.png</file>
             <file>16x16/media-record.png</file>
             <file>16x16/media-playback-stop.png</file>
+            <file>16x16/user-trash.png</file>
             <file>16x16/window-close.png</file>
+
             <file>48x48/media-record.png</file>
 
             <file>bitmaps/dial_01.png</file>

src/jackmeter.py

@@ -29,7 +29,10 @@ global x_port1, x_port2, need_reconnect
 x_port1 = 0.0
 x_port2 = 0.0
 need_reconnect = False
+
 client = None
+port_1 = None
+port_2 = None
 
 def process_callback(nframes, arg):
   global x_port1, x_port2
@@ -60,12 +63,12 @@ def reconnect_inputs():
 
   for port in list_port_1:
     this_port = jacklib.port_by_name(client, port)
-    if not jacklib.port_is_mine(client, this_port):
+    if (bool(jacklib.port_is_mine(client, this_port)) == False and bool(jacklib.port_connected_to(port_1, port)) == False):
       jacklib.connect(client, port, "%s:in1" % (client_name))
 
   for port in list_port_2:
     this_port = jacklib.port_by_name(client, port)
-    if not jacklib.port_is_mine(client, this_port):
+    if (bool(jacklib.port_is_mine(client, this_port)) == False and bool(jacklib.port_connected_to(port_2, port)) == False):
       jacklib.connect(client, port, "%s:in2" % (client_name))
 
   global need_reconnect

src/logs.py

@@ -229,7 +229,7 @@ class LogsW(QDialog, ui_logs.Ui_LogsW):
         QDialog.__init__(self, parent, flags)
         self.setupUi(self)
 
-        self.b_close.setIcon(getIcon("dialog-close"))
+        self.b_close.setIcon(getIcon("window-close"))
         self.b_purge.setIcon(getIcon("user-trash"))
 
         self.m_firstRun = True
@@ -308,10 +308,6 @@ class LogsW(QDialog, ui_logs.Ui_LogsW):
           self.pte_lash.clear()
           self.pte_ladish.clear()
 
-        if (self.LOG_FILE_JACK):
-          if (self.m_text_jack):
-            self.pte_jack.appendPlainText(self.m_text_jack)
-
         if (self.LOG_FILE_A2J):
           if (self.m_text_a2j):
             self.pte_a2j.appendPlainText(self.m_text_a2j)
@@ -324,6 +320,12 @@ class LogsW(QDialog, ui_logs.Ui_LogsW):
           if (self.m_text_ladish):
             self.pte_ladish.appendPlainText(self.m_text_ladish)
 
+        # Somehow appending the whole jack log breaks this call?
+        # Set it here in last for now
+        if (self.LOG_FILE_JACK):
+          if (self.m_text_jack):
+            self.pte_jack.appendPlainText(self.m_text_jack)
+
         if (self.m_firstRun):
           self.pte_jack.horizontalScrollBar().setValue(0)
           self.pte_jack.verticalScrollBar().setValue(self.pte_jack.verticalScrollBar().maximum())

src/pixmapdial.py

@@ -58,6 +58,9 @@ class PixmapDial(QDial):
 
         self.updateSizes()
 
+    def getSize(self):
+        return self.p_size
+
     def setEnabled(self, enabled):
         if (self.isEnabled() != enabled):
           self.m_pixmap.load(":/bitmaps/dial_%s%s.png" % (self.m_pixmap_n_str, "" if enabled else "d"))
@@ -100,9 +103,6 @@ class PixmapDial(QDial):
         self.updateSizes()
         self.update()
 
-    def getSize(self):
-        return self.p_size
-
     def minimumSizeHint(self):
         return QSize(self.p_size, self.p_size)