Changeset 2658
- Timestamp:
- 11/25/16 02:33:39 (7 years ago)
- Files:
-
- trunk/libffado/support/mixer-qt4/ffado/mixer/audiofire.py (modified) (8 diffs)
- trunk/libffado/support/mixer-qt4/ffado/mixer/bcoaudio5control.py (modified) (1 diff)
- trunk/libffado/support/mixer-qt4/ffado/mixer/edirolfa66control.py (modified) (1 diff)
- trunk/libffado/support/mixer-qt4/ffado/mixer/motu.py (modified) (7 diffs)
- trunk/libffado/support/mixer-qt4/ffado/mixer/phase24control.py (modified) (1 diff)
- trunk/libffado/support/mixer-qt4/ffado/mixer/phase88control.py (modified) (3 diffs)
- trunk/libffado/support/mixer-qt4/ffado/mixer/quatafire.py (modified) (2 diffs)
- trunk/libffado/support/mixer-qt4/ffado/mixer/rme.py (modified) (8 diffs)
- trunk/libffado/support/mixer-qt4/ffado/mixer/saffire_base.py (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/support/mixer-qt4/ffado/mixer/audiofire.py
r2653 r2658 350 350 log.debug("Init values") 351 351 352 for ctrl, info in self.MatrixVolumeControls.ite ritems():352 for ctrl, info in self.MatrixVolumeControls.items(): 353 353 vol = self.hw.getMatrixMixerValue(self.MatrixVolumeControls[ctrl][0], 354 354 self.MatrixVolumeControls[ctrl][1], … … 362 362 ctrl.valueChanged.connect(self.updateMatrixVolume) 363 363 364 for ctrl, info in self.MatrixButtonControls.ite ritems():364 for ctrl, info in self.MatrixButtonControls.items(): 365 365 state = self.hw.getMatrixMixerValue(self.MatrixButtonControls[ctrl][0], 366 366 self.MatrixButtonControls[ctrl][1], … … 376 376 ctrl.clicked.connect(self.updateMatrixButton) 377 377 378 for ctrl, info in self.MatrixRotaryControls.ite ritems():378 for ctrl, info in self.MatrixRotaryControls.items(): 379 379 vol = self.hw.getMatrixMixerValue(self.MatrixRotaryControls[ctrl][0], 380 380 self.MatrixRotaryControls[ctrl][1], … … 387 387 ctrl.valueChanged.connect(self.updateMatrixRotary) 388 388 389 for ctrl, info in self.VolumeControls.ite ritems():389 for ctrl, info in self.VolumeControls.items(): 390 390 vol = self.hw.getContignuous(self.VolumeControls[ctrl][0]) 391 391 … … 397 397 ctrl.valueChanged.connect(self.updateVolume) 398 398 399 for ctrl, info in self.SelectorControls.ite ritems():399 for ctrl, info in self.SelectorControls.items(): 400 400 state = self.hw.getDiscrete(self.SelectorControls[ctrl][0]) 401 401 log.debug("%s state is %d" % (ctrl.objectName() , state)) … … 408 408 ctrl.clicked.connect(self.updateSelector) 409 409 410 for ctrl, info in self.TriggerControls.ite ritems():410 for ctrl, info in self.TriggerControls.items(): 411 411 # connect the UI element 412 412 ctrl.clicked.connect(self.updateTrigger) 413 413 414 for ctrl, info in self.SPDIFmodeControls.ite ritems():414 for ctrl, info in self.SPDIFmodeControls.items(): 415 415 state = self.hw.getDiscrete(self.SPDIFmodeControls[ctrl][0]) 416 416 log.debug("%s state is %d" % (ctrl.objectName() , state)) … … 423 423 ctrl.toggled.connect(self.updateSPDIFmodeControl) 424 424 425 for ctrl, info in self.DigIfaceControls.ite ritems():425 for ctrl, info in self.DigIfaceControls.items(): 426 426 state = self.hw.getDiscrete(self.DigIfaceControls[ctrl][0]) 427 427 # 0/2/3 is available but GUI set 0/1/2 … … 431 431 ctrl.activated.connect(self.updateDigIfaceControl) 432 432 433 for ctrl, info in self.PlbkRouteControls.ite ritems():433 for ctrl, info in self.PlbkRouteControls.items(): 434 434 sink = self.PlbkRouteControls[ctrl][1] 435 435 src = self.hw.getDiscrete(self.PlbkRouteControls[ctrl][0], sink) trunk/libffado/support/mixer-qt4/ffado/mixer/bcoaudio5control.py
r2653 r2658 85 85 86 86 def initValues(self): 87 for name, ctrl in self.VolumeControls.ite ritems():87 for name, ctrl in self.VolumeControls.items(): 88 88 vol = self.hw.getContignuous(ctrl[0]) 89 89 log.debug("%s volume is %d" % (name , vol)) 90 90 ctrl[1].setValue(-vol) 91 91 92 for name, ctrl in self.ComboControls.ite ritems():92 for name, ctrl in self.ComboControls.items(): 93 93 state = self.hw.getDiscrete(ctrl[0]) 94 94 log.debug("%s state is %d" % (name , state)) trunk/libffado/support/mixer-qt4/ffado/mixer/edirolfa66control.py
r2653 r2658 91 91 92 92 def initValues(self): 93 for name, ctrl in self.VolumeControls.ite ritems():93 for name, ctrl in self.VolumeControls.items(): 94 94 val = self.hw.getContignuous(ctrl[0], idx = ctrl[1]) 95 95 log.debug("%s value is %d" % (name , val)) trunk/libffado/support/mixer-qt4/ffado/mixer/motu.py
r2653 r2658 824 824 # Now fetch the current values into the respective controls. Don't 825 825 # bother fetching controls which are disabled. 826 for ctrl, info in self.ChannelFaders.ite ritems():826 for ctrl, info in self.ChannelFaders.items(): 827 827 if (not(ctrl.isEnabled())): 828 828 continue … … 832 832 ctrl.valueChanged.connect(self.updateChannelFader) 833 833 834 for ctrl, info in self.Faders.ite ritems():834 for ctrl, info in self.Faders.items(): 835 835 if (not(ctrl.isEnabled())): 836 836 continue … … 840 840 ctrl.valueChanged.connect(self.updateFader) 841 841 842 for ctrl, info in self.ChannelControls.ite ritems():842 for ctrl, info in self.ChannelControls.items(): 843 843 if (not(ctrl.isEnabled())): 844 844 continue … … 848 848 ctrl.valueChanged.connect(self.updateChannelControl) 849 849 850 for ctrl, info in self.Controls.ite ritems():850 for ctrl, info in self.Controls.items(): 851 851 if (not(ctrl.isEnabled())): 852 852 continue … … 856 856 ctrl.valueChanged.connect(self.updateControl) 857 857 858 for ctrl, info in self.ChannelBinarySwitches.ite ritems():858 for ctrl, info in self.ChannelBinarySwitches.items(): 859 859 if (not(ctrl.isEnabled())): 860 860 continue … … 867 867 ctrl.toggled.connect(self.updateChannelBinarySwitch) 868 868 869 for ctrl, info in self.BinarySwitches.ite ritems():869 for ctrl, info in self.BinarySwitches.items(): 870 870 if (not(ctrl.isEnabled())): 871 871 continue … … 878 878 ctrl.toggled.connect(self.updateBinarySwitch) 879 879 880 for ctrl, info in self.Selectors.ite ritems():880 for ctrl, info in self.Selectors.items(): 881 881 if (not(ctrl.isEnabled())): 882 882 continue trunk/libffado/support/mixer-qt4/ffado/mixer/phase24control.py
r2653 r2658 141 141 self.cmbFrontLevel.setCurrentIndex(0) 142 142 143 for name, ctrl in self.VolumeControls.ite ritems():143 for name, ctrl in self.VolumeControls.items(): 144 144 vol = self.hw.getContignuous(ctrl[0]) 145 145 log.debug("%s volume is %d" % (name , vol)) 146 146 ctrl[1].setValue(-vol) 147 147 148 for name, ctrl in self.SelectorControls.ite ritems():148 for name, ctrl in self.SelectorControls.items(): 149 149 state = self.hw.getDiscrete(ctrl[0]) 150 150 log.debug("%s state is %d" % (name , state)) trunk/libffado/support/mixer-qt4/ffado/mixer/phase88control.py
r2653 r2658 81 81 82 82 # gain control 83 for ctl, params in self.VolumeControls.ite ritems():83 for ctl, params in self.VolumeControls.items(): 84 84 path = params[0] 85 85 idx = params[1] … … 108 108 109 109 # selector controls 110 for ctl, param in self.SelectorControls.ite ritems():110 for ctl, param in self.SelectorControls.items(): 111 111 state = self.hw.getDiscrete(param) 112 112 ctl.setCurrentIndex(state) … … 115 115 116 116 # mute controls 117 for ctl, param in self.MuteControls.ite ritems():117 for ctl, param in self.MuteControls.items(): 118 118 ctl.toggled.connect(self.muteVolume) 119 119 trunk/libffado/support/mixer-qt4/ffado/mixer/quatafire.py
r2653 r2658 76 76 77 77 def initValues(self): 78 for ctrl, info in self.VolumeControls.ite ritems():78 for ctrl, info in self.VolumeControls.items(): 79 79 vol = self.hw.getContignuous(self.VolumeControls[ctrl][0], self.VolumeControls[ctrl][1]) 80 80 val = -vol … … 85 85 ctrl.valueChanged.connect(self.updateVolume) 86 86 87 for ctrl, info in self.PanControls.ite ritems():87 for ctrl, info in self.PanControls.items(): 88 88 pan_left = self.hw.getContignuous(self.PanControls[ctrl][0], 1) 89 89 pan_right = self.hw.getContignuous(self.PanControls[ctrl][0], 2) trunk/libffado/support/mixer-qt4/ffado/mixer/rme.py
r2653 r2658 306 306 307 307 # Connect signal handlers for all command buttons 308 for ctrl, info in self.CommandButtons.ite ritems():308 for ctrl, info in self.CommandButtons.items(): 309 309 if (not(ctrl.isEnabled())): 310 310 continue 311 311 ctrl.clicked.connect(self.sendCommand) 312 312 313 for ctrl, info in self.Combos.ite ritems():313 for ctrl, info in self.Combos.items(): 314 314 if (not(ctrl.isEnabled())): 315 315 continue; … … 320 320 # Get current hardware values and connect GUI element signals to 321 321 # their respective slots 322 for ctrl, info in self.PhantomSwitches.ite ritems():322 for ctrl, info in self.PhantomSwitches.items(): 323 323 if (not(ctrl.isEnabled())): 324 324 continue 325 325 ctrl.toggled.connect(self.updatePhantomSwitch) 326 326 327 for ctrl, info in self.Switches.ite ritems():327 for ctrl, info in self.Switches.items(): 328 328 if (not(ctrl.isEnabled())): 329 329 continue 330 330 ctrl.toggled.connect(self.updateSwitch) 331 331 332 for ctrl, info in self.Radiobuttons.ite ritems():332 for ctrl, info in self.Radiobuttons.items(): 333 333 if (not(ctrl.isEnabled())): 334 334 continue; 335 335 ctrl.toggled.connect(self.updateRadiobutton) 336 336 337 for ctrl, info in self.Checkboxes.ite ritems():337 for ctrl, info in self.Checkboxes.items(): 338 338 if (not(ctrl.isEnabled())): 339 339 continue; 340 340 ctrl.toggled.connect(self.updateCheckboxes) 341 341 342 for ctrl, info in self.Gains.ite ritems():342 for ctrl, info in self.Gains.items(): 343 343 if (not(ctrl.isEnabled())): 344 344 continue … … 347 347 # Obtain control values from the Fireface and make the GUI reflect these 348 348 def getValuesFromFF(self): 349 for ctrl, info in self.Combos.ite ritems():349 for ctrl, info in self.Combos.items(): 350 350 if (not(ctrl.isEnabled())): 351 351 continue; … … 363 363 364 364 # Get current hardware values 365 for ctrl, info in self.PhantomSwitches.ite ritems():365 for ctrl, info in self.PhantomSwitches.items(): 366 366 if (not(ctrl.isEnabled())): 367 367 continue … … 373 373 ctrl.setChecked(False) 374 374 375 for ctrl, info in self.Switches.ite ritems():375 for ctrl, info in self.Switches.items(): 376 376 if (not(ctrl.isEnabled())): 377 377 continue … … 383 383 ctrl.setChecked(False) 384 384 385 for ctrl, info in self.Radiobuttons.ite ritems():385 for ctrl, info in self.Radiobuttons.items(): 386 386 if (not(ctrl.isEnabled())): 387 387 continue; … … 403 403 self.ch1_instr_limiter.setEnabled(1) 404 404 405 for ctrl, info in self.Checkboxes.ite ritems():405 for ctrl, info in self.Checkboxes.items(): 406 406 if (not(ctrl.isEnabled())): 407 407 continue; … … 425 425 self.ch1_instr_limiter.setEnabled(ch1_src==0) 426 426 427 for ctrl, info in self.Gains.ite ritems():427 for ctrl, info in self.Gains.items(): 428 428 if (not(ctrl.isEnabled())): 429 429 continue trunk/libffado/support/mixer-qt4/ffado/mixer/saffire_base.py
r2653 r2658 98 98 99 99 def updateValues(self): 100 for ctrl, info in self.VolumeControls.ite ritems():100 for ctrl, info in self.VolumeControls.items(): 101 101 vol = self.hw.getMatrixMixerValue(self.VolumeControls[ctrl][0], 102 102 self.VolumeControls[ctrl][1], … … 104 104 log.debug("%s volume is %d" % (ctrl.objectName() , vol)) 105 105 ctrl.setValue(vol) 106 for ctrl, info in self.VolumeControlsLowRes.ite ritems():106 for ctrl, info in self.VolumeControlsLowRes.items(): 107 107 vol = self.hw.getDiscrete(self.VolumeControlsLowRes[ctrl][0]) 108 108 … … 110 110 ctrl.setValue(127 - vol) 111 111 112 for ctrl, info in self.SelectorControls.ite ritems():112 for ctrl, info in self.SelectorControls.items(): 113 113 state = self.hw.getDiscrete(self.SelectorControls[ctrl][0]) 114 114 log.debug("%s state is %d" % (ctrl.objectName() , state)) … … 118 118 ctrl.setChecked(False) 119 119 120 for ctrl, info in self.TriggerButtonControls.ite ritems():120 for ctrl, info in self.TriggerButtonControls.items(): 121 121 pass 122 122 123 for ctrl, info in self.TextControls.ite ritems():123 for ctrl, info in self.TextControls.items(): 124 124 text = self.hw.getText(self.TextControls[ctrl][0]) 125 125 log.debug("%s text is %s" % (ctrl.objectName() , text)) 126 126 ctrl.setText(text) 127 127 128 for ctrl, info in self.ComboControls.ite ritems():128 for ctrl, info in self.ComboControls.items(): 129 129 self.initCombo(ctrl) 130 130 … … 136 136 def initValues(self): 137 137 self.updateValues() 138 for ctrl, info in self.VolumeControls.ite ritems():138 for ctrl, info in self.VolumeControls.items(): 139 139 ctrl.valueChanged.connect(self.updateMatrixVolume) 140 140 141 for ctrl, info in self.VolumeControlsLowRes.ite ritems():141 for ctrl, info in self.VolumeControlsLowRes.items(): 142 142 ctrl.valueChanged.connect(self.updateLowResVolume) 143 143 144 for ctrl, info in self.SelectorControls.ite ritems():144 for ctrl, info in self.SelectorControls.items(): 145 145 ctrl.stateChanged.connect(self.updateSelector) 146 146 147 for ctrl, info in self.TriggerButtonControls.ite ritems():147 for ctrl, info in self.TriggerButtonControls.items(): 148 148 ctrl.clicked.connect(,self.triggerButton) 149 149 150 for ctrl, info in self.saveTextControls.ite ritems():150 for ctrl, info in self.saveTextControls.items(): 151 151 ctrl.clicked.connect(self.saveText) 152 152 153 for ctrl, info in self.ComboControls.ite ritems():153 for ctrl, info in self.ComboControls.items(): 154 154 ctrl.activated.connect(self.selectCombo) 155 155