Changeset 1949

Show
Ignore:
Timestamp:
01/23/11 01:53:26 (13 years ago)
Author:
adi
Message:

Fix MIDI channel detection on Echo AF series

Patch provided in #233

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/src/libavc/general/avc_plug.cpp

    r1946 r1949  
    379379        c.m_portType = 0; 
    380380        c.m_name = "Unknown"; 
     381        c.m_buildSource = -1; // Flag this as a temp build 
    381382 
    382383        c.m_nrOfChannels = m_nrOfChannels; 
     
    839840                 p->getName(), getName() ); 
    840841 
    841     if (m_clusterInfos.size()==0 || m_clusterInfos[0].m_streamFormat == -1) { 
     842    if (m_clusterInfos.size()==0 || m_clusterInfos[0].m_buildSource == -1) { 
    842843        m_clusterInfos=p->m_clusterInfos; 
     844 
     845        if (m_clusterInfos.size() > 0) { 
     846            m_clusterInfos[0].m_buildSource = 0; // No longer a temp instance 
     847        } 
    843848    } 
    844849 
  • trunk/libffado/src/libavc/general/avc_plug.h

    r1336 r1949  
    189189        ChannelInfoVector   m_channelInfos; 
    190190        stream_format_t     m_streamFormat; 
     191        int                 m_buildSource; // To track how we are instantiated 
    191192    }; 
    192193    typedef std::vector<ClusterInfo> ClusterInfoVector;