Changeset 1837
- Timestamp:
- 05/24/10 05:53:00 (11 years ago)
- Files:
-
- trunk/libffado/src/motu/motu_avdevice.cpp (modified) (1 diff)
- trunk/libffado/src/motu/motu_mixerdefs.cpp (modified) (1 diff)
- trunk/libffado/support/mixer-qt4/ffado/mixer/motu.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/src/motu/motu_avdevice.cpp
r1835 r1837 249 249 {"Phones-L", MOTU_PA_OUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 10}, 250 250 {"Phones-R", MOTU_PA_OUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 13}, 251 {"Padding1", MOTU_PA_IN | MOTU_PA_RATE_1x|MOTU_PA_OPTICAL_OFF|MOTU_PA_PADDING, 22}, 252 {"Padding2", MOTU_PA_IN | MOTU_PA_RATE_1x|MOTU_PA_OPTICAL_OFF|MOTU_PA_PADDING, 25}, 251 253 {"ADAT1", MOTU_PA_IN | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ADAT, 40}, 252 254 {"ADAT1", MOTU_PA_OUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ADAT, 22}, trunk/libffado/src/motu/motu_mixerdefs.cpp
r1763 r1837 270 270 {"Analog 7", MOTU_CTRL_STD_CHANNEL, 0x0018, }, 271 271 {"Analog 8", MOTU_CTRL_STD_CHANNEL, 0x001c, }, 272 // 273 // The Ultralite doesn't include AES/EBU or SPDIF mixer controls, but 274 // "pad" mixer entries are required so the index of the ADAT controls 275 // within the various matrix mixers remain unchanged compared to other 276 // interfaces. This in turn means the python ffado-mixer code doesn't 277 // have to deal with differing layouts within the matrix mixer controls. 278 {"AES/EBU 1", MOTU_CTRL_STD_CHANNEL, MOTU_CTRL_NONE, }, 279 {"AES/EBU 2", MOTU_CTRL_STD_CHANNEL, MOTU_CTRL_NONE, }, 280 {"SPDIF 1", MOTU_CTRL_STD_CHANNEL, MOTU_CTRL_NONE, }, 281 {"SPDIF 2", MOTU_CTRL_STD_CHANNEL, MOTU_CTRL_NONE, }, 282 // 272 283 {"ADAT 1", MOTU_CTRL_STD_CHANNEL, 0x0020, }, 273 284 {"ADAT 2", MOTU_CTRL_STD_CHANNEL, 0x0024, }, trunk/libffado/support/mixer-qt4/ffado/mixer/motu.py
r1836 r1837 632 632 self.optical_in_mode.removeItem(2) 633 633 self.optical_out_mode.removeItem(2) 634 635 # The 8pre doesn't have software phones/main fader controls 636 if (self.model==MOTU_MODEL_8PRE): 637 self.disable_hide(self.mainout_fader) 638 self.disable_hide(self.phones_fader) 634 639 635 640 # Only the 896HD has meter controls