Changeset 1791

Show
Ignore:
Timestamp:
01/17/10 16:05:06 (11 years ago)
Author:
arnonym
Message:

Remove that MIDI-name mangling again. (Anyone noticed that I got it wrong? :-)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/src/genericavc/avc_avdevice.cpp

    r1790 r1791  
    690690            std::ostringstream portname; 
    691691 
    692             portname << id << "_"; 
    693             if ( channelInfo->m_name.compare(0, 5, "MIDI ") == 0 ) { 
    694                 debugWarning("Midi channel simply named 'MIDI', will add a direction to make it unique!\n"); 
    695                 portname << "MIDI "; 
    696                 if (direction == Streaming::Port::E_Playback) 
    697                     portname << "IN "; 
    698                 else 
    699                     portname << "OUT "; 
    700                 portname << channelInfo->m_name.substr(5); 
    701             } else { 
    702                 portname << channelInfo->m_name; 
    703             } 
     692            portname << id << "_" << channelInfo->m_name; 
    704693 
    705694            Streaming::Port *p=NULL;