Show
Ignore:
Timestamp:
01/30/12 05:02:09 (12 years ago)
Author:
jwoithe
Message:

matrixmixer: complete initial implementation of optional mute functionality. A graphical indication of mute state (beyond the toggled menu item) is still needed.
matrixmixer: implement optional phase inversion interface. Again, a graphical indication of this state is still required.
rme: make use of the mute/invert functionality of the matrix mixer. Currently this is only connected for the input faders.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/src/rme/fireface_hw.cpp

    r2016 r2021  
    859859    if (src_channel>n_channels || dest_channel>n_channels) 
    860860        return -1; 
    861     if (val<0 || val>0x10000) 
     861    if (abs(val)>0x10000) 
    862862        return -1; 
    863863 
  • trunk/libffado/src/rme/rme_avdevice.cpp

    r2016 r2021  
    200200        new RmeSettingsMatrixCtrl(*this, RME_MATRIXCTRL_OUTPUT_FADER, "OutputFaders")); 
    201201    result &= m_MixerContainer->addElement( 
    202         new RmeSettingsMatrixCtrl(*this, RME_MATRIXCTRL_INPUT_FADER, "InputMutes")); 
     202        new RmeSettingsMatrixCtrl(*this, RME_MATRIXCTRL_INPUT_MUTE, "InputMutes")); 
    203203    result &= m_MixerContainer->addElement( 
    204         new RmeSettingsMatrixCtrl(*this, RME_MATRIXCTRL_PLAYBACK_FADER, "PlaybackMutes")); 
     204        new RmeSettingsMatrixCtrl(*this, RME_MATRIXCTRL_PLAYBACK_MUTE, "PlaybackMutes")); 
    205205    result &= m_MixerContainer->addElement( 
    206         new RmeSettingsMatrixCtrl(*this, RME_MATRIXCTRL_OUTPUT_FADER, "OutputMutes")); 
     206        new RmeSettingsMatrixCtrl(*this, RME_MATRIXCTRL_OUTPUT_MUTE, "OutputMutes")); 
    207207    result &= m_MixerContainer->addElement( 
    208         new RmeSettingsMatrixCtrl(*this, RME_MATRIXCTRL_INPUT_FADER, "InputInverts")); 
     208        new RmeSettingsMatrixCtrl(*this, RME_MATRIXCTRL_INPUT_INVERT, "InputInverts")); 
    209209    result &= m_MixerContainer->addElement( 
    210         new RmeSettingsMatrixCtrl(*this, RME_MATRIXCTRL_PLAYBACK_FADER, "PlaybackInverts")); 
     210        new RmeSettingsMatrixCtrl(*this, RME_MATRIXCTRL_PLAYBACK_INVERT, "PlaybackInverts")); 
    211211 
    212212    if (!result) { 
  • trunk/libffado/src/rme/rme_avdevice_settings.cpp

    r2016 r2021  
    243243    } 
    244244 
     245fprintf(stderr, "val=%d\n", val); 
    245246    return set_hardware_mixergain(ctype, src_channel, dest_channel, val); 
    246247} 
     
    280281        mixerflags = settings->playback_mixerflags; 
    281282 
     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 
    282289    if (val == 0) 
    283290        mixerflags[idx] &= ~flagmask;