Changeset 1787

Show
Ignore:
Timestamp:
01/06/10 09:16:22 (14 years ago)
Author:
ppalmers
Message:

ensure that non-eap dice devices are discovered properly (fixes #248)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libffado/src/dice/dice_avdevice.cpp

    r1772 r1787  
    168168    } 
    169169    if(!m_eap->init()) { 
    170         debugError("Could not init EAP\n"); 
     170        debugWarning("Could not init EAP\n"); 
    171171        delete m_eap; 
    172172        m_eap = NULL; 
    173         return false; 
    174     } 
    175     // register the EAP controls to the control structure 
    176     if(!addElement(m_eap)) { 
    177         debugError("Failed to add the EAP controls to the control tree\n"); 
    178         return false; 
     173    } else { 
     174        // register the EAP controls to the control structure 
     175        if(!addElement(m_eap)) { 
     176            debugError("Failed to add the EAP controls to the control tree\n"); 
     177            return false; 
     178        } 
    179179    } 
    180180    return true; 

  • trunk/libffado/src/dice/dice_eap.cpp

    r1780 r1787  
    110110EAP::init() { 
    111111    if(!supportsEAP(m_device)) { 
    112         debugError("Device does not support EAP"); 
     112        debugError("Device does not support EAP\n"); 
    113113        return false; 
    114114    } 
    …… 
    15441544EAP::PeakSpace::show() 
    15451545{ 
    1546     printMessage("  %i peaks\n", m_peaks.size()); 
     1546    printMessage("  %zi peaks\n", m_peaks.size()); 
    15471547    for (std::map<unsigned char, int>::iterator it=m_peaks.begin(); it!=m_peaks.end(); ++it) { 
    15481548        printMessage("0x%02x : %i\n", it->first, it->second);