Ticket #233: ffado-audiofire_midi_fix.diff

File ffado-audiofire_midi_fix.diff, 1.4 kB (added by euan, 7 years ago)

Non conflicting fix

  • src/libavc/general/avc_plug.cpp

    old new  
    374374        c.m_index = 1; 
    375375        c.m_portType = 0; 
    376376        c.m_name = "Unknown"; 
     377        c.m_buildSource = -1; // Flag this as a temp build 
    377378 
    378379        c.m_nrOfChannels = m_nrOfChannels; 
    379380        for(int i=0; i<m_nrOfChannels; i++) { 
     
    834835                 "Propagating info from plug '%s' to plug '%s'\n", 
    835836                 p->getName(), getName() ); 
    836837 
    837     if (m_clusterInfos.size()==0 || m_clusterInfos[0].m_streamFormat == -1) { 
     838    if (m_clusterInfos.size()==0 || m_clusterInfos[0].m_buildSource == -1) { 
    838839        m_clusterInfos=p->m_clusterInfos; 
     840 
     841        if (m_clusterInfos.size() > 0) 
     842            m_clusterInfos[0].m_buildSource == 0; // No longer a temp instance... 
    839843    } 
    840844 
    841845    m_nrOfChannels=p->m_nrOfChannels; 
  • src/libavc/general/avc_plug.h

    old new  
    188188        nr_of_channels_t    m_nrOfChannels; 
    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; 
    193194