Changeset 2829 for branches

Timestamp:

07/09/22 23:57:18 (1 year ago)

Author:

jwoithe

Message:

v2.4.x branch: merge r2825 - r2828 from trunk.

All these patches are effectively bugfixes for 2.4.x. This merge is in
preparation for the release of version 2.4.6.

Command used:

svn merge ^{/trunk -r2824:HEAD}

This was run in the branches/2.4.x/ directory, not within the libffado
subdirectory.

Files:

• branches/2.4.x/libffado/support/mixer-qt4/ffado/mixer/maudio_bebob.py (modified) (1 diff)
• branches/2.4.x/libffado/support/mixer-qt4/ffado/widgets/matrixmixer.py (modified) (8 diffs)

branches/2.4.x/libffado/support/mixer-qt4/ffado/mixer/maudio_bebob.py

@@ -588 +588 @@
-            curr = self.hw.getContignuous(path, idx)
-            state = -(curr / 0x7FFE) * 50 + 50
-state
+int(state)
-            ctl.valueChanged.connect(self.updatePanning)
-

branches/2.4.x/libffado/support/mixer-qt4/ffado/widgets/matrixmixer.py

@@ -164 +164 @@
-            self.mute_action = QAction("Mute", self)
-            self.mute_action.setCheckable(True)
-muted
+bool(muted)
-            self.mute_action.triggered.connect(self.mapper.map)
-            self.mapper.setMapping(self.mute_action, "Mute")
@@ -178 +178 @@
-            self.inv_action = QAction("Invert", self)
-            self.inv_action.setCheckable(True)
-inverted
+bool(inverted)
-            self.inv_action.triggered.connect(self.mapper.map)
-            self.mapper.setMapping(self.inv_action, "Invert")
@@ -211 +211 @@
-            change = newpos.y() - self.pos.y()
-            #log.debug("MixerNode.mouseReleaseEvent() change %s" % (str(change)))
-
+
+
+
-            ev.accept()
-
@@ -219 +221 @@
-            change = newpos.y() - self.pos.y()
-            #log.debug("MixerNode.mouseReleaseEvent() change %s" % (str(change)))
-
+
+
+
-            self.pos = QtCore.QPointF(0, 0)
-            del self.tmpvalue
@@ -230 +234 @@
-            tmpvalue = self.value()
-            change = ev.delta()/8
-
+
+
+
-            ev.accept()
-        else:
@@ -422 +428 @@
-                if (smallFont):
-                    font = node.font()
-font.pointSize()/1.5
+int(font.pointSize()/1.5 + 0.5)
-                    node.setFont(font)
-                self.nodeConnect(node)
@@ -529 +535 @@
-                val = self.interface.getValue(x,y)
-                if (self.transpose):
-val
+int(val)
-                    self.items[y][x].internalValueChanged(val)
-                else:
-val
+int(val)
-                    self.items[x][y].internalValueChanged(val)
-
@@ -763 +769 @@
-        v_max = 50
-        self.setTickPosition(QSlider.TicksBothSides)
-(v_max-v_min)/2
+int((v_max-v_min)/2)
-        self.setMinimum(v_min)
-        self.setMaximum(v_max)