Changeset 2021 for trunk/libffado/src
- Timestamp:
- 01/30/12 05:02:09 (12 years ago)
- Files:
-
- trunk/libffado/src/rme/fireface_hw.cpp (modified) (1 diff)
- trunk/libffado/src/rme/rme_avdevice.cpp (modified) (1 diff)
- trunk/libffado/src/rme/rme_avdevice_settings.cpp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/src/rme/fireface_hw.cpp
r2016 r2021 859 859 if (src_channel>n_channels || dest_channel>n_channels) 860 860 return -1; 861 if ( val<0 || val>0x10000)861 if (abs(val)>0x10000) 862 862 return -1; 863 863 trunk/libffado/src/rme/rme_avdevice.cpp
r2016 r2021 200 200 new RmeSettingsMatrixCtrl(*this, RME_MATRIXCTRL_OUTPUT_FADER, "OutputFaders")); 201 201 result &= m_MixerContainer->addElement( 202 new RmeSettingsMatrixCtrl(*this, RME_MATRIXCTRL_INPUT_ FADER, "InputMutes"));202 new RmeSettingsMatrixCtrl(*this, RME_MATRIXCTRL_INPUT_MUTE, "InputMutes")); 203 203 result &= m_MixerContainer->addElement( 204 new RmeSettingsMatrixCtrl(*this, RME_MATRIXCTRL_PLAYBACK_ FADER, "PlaybackMutes"));204 new RmeSettingsMatrixCtrl(*this, RME_MATRIXCTRL_PLAYBACK_MUTE, "PlaybackMutes")); 205 205 result &= m_MixerContainer->addElement( 206 new RmeSettingsMatrixCtrl(*this, RME_MATRIXCTRL_OUTPUT_ FADER, "OutputMutes"));206 new RmeSettingsMatrixCtrl(*this, RME_MATRIXCTRL_OUTPUT_MUTE, "OutputMutes")); 207 207 result &= m_MixerContainer->addElement( 208 new RmeSettingsMatrixCtrl(*this, RME_MATRIXCTRL_INPUT_ FADER, "InputInverts"));208 new RmeSettingsMatrixCtrl(*this, RME_MATRIXCTRL_INPUT_INVERT, "InputInverts")); 209 209 result &= m_MixerContainer->addElement( 210 new RmeSettingsMatrixCtrl(*this, RME_MATRIXCTRL_PLAYBACK_ FADER, "PlaybackInverts"));210 new RmeSettingsMatrixCtrl(*this, RME_MATRIXCTRL_PLAYBACK_INVERT, "PlaybackInverts")); 211 211 212 212 if (!result) { trunk/libffado/src/rme/rme_avdevice_settings.cpp
r2016 r2021 243 243 } 244 244 245 fprintf(stderr, "val=%d\n", val); 245 246 return set_hardware_mixergain(ctype, src_channel, dest_channel, val); 246 247 } … … 280 281 mixerflags = settings->playback_mixerflags; 281 282 283 // FIXME: When switching inversion modes, the hardware seems to a channel to 284 // full volume for about 1/10 sec. Attempt to avoid this by temporarily 285 // muting the channel. This doesn't seem to work though. 286 // if (flagmask & FF_SWPARAM_MF_INVERTED) 287 // set_hardware_mixergain(ctype, src_channel, dest_channel, 0); 288 282 289 if (val == 0) 283 290 mixerflags[idx] &= ~flagmask;