Changeset 3902

Show
Ignore:
Timestamp:
02/06/10 05:58:35 (1 month ago)
Author:
sletz
Message:

ffado-jackd2-rename patch, fix ticket #155.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • jack2/trunk/jackmp/linux/firewire/JackFFADODriver.cpp

    r3844 r3902  
    434434        driver->capture_channels[chn].stream_type = ffado_streaming_get_capture_stream_type(driver->dev, chn); 
    435435        if (driver->capture_channels[chn].stream_type == ffado_stream_type_audio) { 
    436             snprintf(buf, sizeof(buf) - 1, "%s:AC%d_%s", fClientControl.fName, (int)chn, portname); 
     436            snprintf(buf, sizeof(buf) - 1, "%s:%s", fClientControl.fName, portname); 
    437437            printMessage ("Registering audio capture port %s", buf); 
    438438            if ((port_index = fGraphManager->AllocatePort(fClientControl.fRefNum, buf, 
    …… 
    457457 
    458458        } else if (driver->capture_channels[chn].stream_type == ffado_stream_type_midi) { 
    459             snprintf(buf, sizeof(buf) - 1, "%s:MC%d_%s", fClientControl.fName, (int)chn, portname); 
     459            snprintf(buf, sizeof(buf) - 1, "%s:%s", fClientControl.fName, portname); 
    460460            printMessage ("Registering midi capture port %s", buf); 
    461461            if ((port_index = fGraphManager->AllocatePort(fClientControl.fRefNum, buf, 
    …… 
    506506 
    507507        if (driver->playback_channels[chn].stream_type == ffado_stream_type_audio) { 
    508             snprintf(buf, sizeof(buf) - 1, "%s:AP%d_%s", fClientControl.fName, (int)chn, portname); 
     508            snprintf(buf, sizeof(buf) - 1, "%s:%s", fClientControl.fName, portname); 
    509509            printMessage ("Registering audio playback port %s", buf); 
    510510            if ((port_index = fGraphManager->AllocatePort(fClientControl.fRefNum, buf, 
    …… 
    531531            fPlaybackChannels++; 
    532532        } else if (driver->playback_channels[chn].stream_type == ffado_stream_type_midi) { 
    533             snprintf(buf, sizeof(buf) - 1, "%s:MP%d_%s", fClientControl.fName, (int)chn, portname); 
     533            snprintf(buf, sizeof(buf) - 1, "%s:%s", fClientControl.fName, portname); 
    534534            printMessage ("Registering midi playback port %s", buf); 
    535535            if ((port_index = fGraphManager->AllocatePort(fClientControl.fRefNum, buf,