Changeset 1883

Show
Ignore:
Timestamp:
09/03/10 05:33:30 (1 year ago)
Author:
jwoithe
Message:

RME: when initialising the device, create a 1:1 mapping from playback channels to physical outputs. This means audio sent to the device will emerge from the respective outputs.
RME: as for MOTU, only create the 1 kHz test tone (in Phones-L here) if a non-zero debug level is specified.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libffado/src/libstreaming/rme/RmeTransmitStreamProcessor.cpp

    r1872 r1883  
    307307if (++dpy == 8000) 
    308308dpy=0; 
    309   for (i=0; i<n_events; i++, sample+=m_event_size/4) { 
    310     static signed int a_cx = 0; 
    311     signed int val = lrintf(0x7fffff*sin((1000.0*2.0*M_PI/24576000.0)*a_cx)); 
     309#if TESTTONE 
     310        if (getDebugLevel() > 0) { 
     311            for (i=0; i<n_events; i++, sample+=m_event_size/4) { 
     312                static signed int a_cx = 0; 
     313                signed int val = lrintf(0x7fffff*sin((1000.0*2.0*M_PI/24576000.0)*a_cx)); 
    312314//for (j=0; j<18;j++) 
    313315//*(sample+j) = val << 8; 
    314     *sample = val << 8; 
    315     if ((a_cx+=int_tpf) >= 24576000) { 
    316       a_cx -= 24576000; 
    317     } 
    318   } 
    319 } 
     316                *sample = val << 8; 
     317                if ((a_cx+=int_tpf) >= 24576000) { 
     318                    a_cx -= 24576000; 
     319                } 
     320            } 
     321        } 
     322} 
     323#endif 
    320324 
    321325        return eCRV_OK; 

  • trunk/libffado/src/rme/fireface_hw.cpp

    r1870 r1883  
    153153            } 
    154154            for (src=0; src<n_channels; src++) { 
    155                 set_hardware_mixergain(RME_FF_MM_PLAYBACK, src, dest, 0); 
     155                set_hardware_mixergain(RME_FF_MM_PLAYBACK, src, dest,  
     156                  src==dest?0x8000:0); 
    156157readRegister(0xfffff0000410LL); 
    157158            } 
    158159        } 
    159160        for (src=0; src<n_channels; src++) { 
    160             set_hardware_mixergain(RME_FF_MM_OUTPUT, src, 0, 0); 
     161            set_hardware_mixergain(RME_FF_MM_OUTPUT, src, 0, 0x8000); 
    161162readRegister(0xfffff0000410LL); 
    162163        }