Index: /trunk/libffado/src/motu/motu_avdevice.cpp =================================================================== --- /trunk/libffado/src/motu/motu_avdevice.cpp (revision 1835) +++ /trunk/libffado/src/motu/motu_avdevice.cpp (revision 1837) @@ -249,4 +249,6 @@ {"Phones-L", MOTU_PA_OUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 10}, {"Phones-R", MOTU_PA_OUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 13}, + {"Padding1", MOTU_PA_IN | MOTU_PA_RATE_1x|MOTU_PA_OPTICAL_OFF|MOTU_PA_PADDING, 22}, + {"Padding2", MOTU_PA_IN | MOTU_PA_RATE_1x|MOTU_PA_OPTICAL_OFF|MOTU_PA_PADDING, 25}, {"ADAT1", MOTU_PA_IN | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ADAT, 40}, {"ADAT1", MOTU_PA_OUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ADAT, 22}, Index: /trunk/libffado/src/motu/motu_mixerdefs.cpp =================================================================== --- /trunk/libffado/src/motu/motu_mixerdefs.cpp (revision 1763) +++ /trunk/libffado/src/motu/motu_mixerdefs.cpp (revision 1837) @@ -270,4 +270,15 @@ {"Analog 7", MOTU_CTRL_STD_CHANNEL, 0x0018, }, {"Analog 8", MOTU_CTRL_STD_CHANNEL, 0x001c, }, + // + // The Ultralite doesn't include AES/EBU or SPDIF mixer controls, but + // "pad" mixer entries are required so the index of the ADAT controls + // within the various matrix mixers remain unchanged compared to other + // interfaces. This in turn means the python ffado-mixer code doesn't + // have to deal with differing layouts within the matrix mixer controls. + {"AES/EBU 1", MOTU_CTRL_STD_CHANNEL, MOTU_CTRL_NONE, }, + {"AES/EBU 2", MOTU_CTRL_STD_CHANNEL, MOTU_CTRL_NONE, }, + {"SPDIF 1", MOTU_CTRL_STD_CHANNEL, MOTU_CTRL_NONE, }, + {"SPDIF 2", MOTU_CTRL_STD_CHANNEL, MOTU_CTRL_NONE, }, + // {"ADAT 1", MOTU_CTRL_STD_CHANNEL, 0x0020, }, {"ADAT 2", MOTU_CTRL_STD_CHANNEL, 0x0024, }, Index: /trunk/libffado/support/mixer-qt4/ffado/mixer/motu.py =================================================================== --- /trunk/libffado/support/mixer-qt4/ffado/mixer/motu.py (revision 1836) +++ /trunk/libffado/support/mixer-qt4/ffado/mixer/motu.py (revision 1837) @@ -632,4 +632,9 @@ self.optical_in_mode.removeItem(2) self.optical_out_mode.removeItem(2) + + # The 8pre doesn't have software phones/main fader controls + if (self.model==MOTU_MODEL_8PRE): + self.disable_hide(self.mainout_fader) + self.disable_hide(self.phones_fader) # Only the 896HD has meter controls