Changeset 2242

Show
Ignore:
Timestamp:
10/13/12 04:26:09 (10 years ago)
Author:
jwoithe
Message:

saffire pro24: Add In/Out for sources and destinations where missing and use names closer to the ones used by Focusrite for anlogic inputs and outputs. Compilation tested only. Patch from Philippe Carriere.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libffado/src/dice/focusrite/saffire_pro24.cpp

    r2240 r2242  
    6666    addSource("SPDIF/In",  6,  2, eRS_AES, 1); 
    6767    addSource("ADAT/In",   0,  8, eRS_ADAT, 1); 
    68     addSource("Analog/In", 0,  4, eRS_InS0, 1); 
     68    addSource("Anlg/In", 0,  4, eRS_InS0, 1); 
    6969    addSource("Mixer/Out",  0, 16, eRS_Mixer, 1); 
    70     addSource("1394",   0,  8, eRS_ARX0, 1); 
     70    addSource("1394/In",   0,  8, eRS_ARX0, 1); 
    7171    addSource("Mute",   0,  1, eRS_Muted); 
    7272} 
    7373void SaffirePro24::SaffirePro24EAP::setupDestinations_low() { 
    7474    addDestination("SPDIF/Out",  6,  2, eRD_AES, 1); 
    75     addDestination("Analog/Out", 0,  6, eRD_InS0, 1); 
     75    addDestination("Line/Out", 0,  6, eRD_InS0, 1); 
    7676    addDestination("Mixer/In",  0, 16, eRD_Mixer0, 1); 
    7777    addDestination("Mixer/In",  0,  2, eRD_Mixer1, 17); 
    78     addDestination("1394",   0, 16, eRD_ATX0, 1); 
     78    addDestination("1394/Out",   0, 16, eRD_ATX0, 1); 
    7979// Is a Mute destination useful ? 
    8080//    addDestination("Mute",   0,  1, eRD_Muted); 
    …… 
    8484    addSource("SPDIF/In",  6,  2, eRS_AES, 1); 
    8585    addSource("ADAT/In",   0,  4, eRS_ADAT, 1); 
    86     addSource("Analog/In", 0,  4, eRS_InS0, 1); 
     86    addSource("Anlg/In", 0,  4, eRS_InS0, 1); 
    8787    addSource("Mixer/Out",  0, 16, eRS_Mixer, 1); 
    88     addSource("1394",   0,  8, eRS_ARX0, 1); 
     88    addSource("1394/In",   0,  8, eRS_ARX0, 1); 
    8989    addSource("Mute",   0,  1, eRS_Muted); 
    9090} 
    9191void SaffirePro24::SaffirePro24EAP::setupDestinations_mid() { 
    9292    addDestination("SPDIF/Out",  6,  2, eRD_AES, 1); 
    93     addDestination("Analog/Out", 0,  6, eRD_InS0, 1); 
     93    addDestination("Line/Out", 0,  6, eRD_InS0, 1); 
    9494    addDestination("Mixer/In",  0, 16, eRD_Mixer0, 1); 
    9595    addDestination("Mixer/In",  0,  2, eRD_Mixer1, 17); 
    96     addDestination("1394",   0, 12, eRD_ATX0, 1); 
     96    addDestination("1394/Out",   0, 12, eRD_ATX0, 1); 
    9797// Is a Mute destination useful ? 
    9898//    addDestination("Mute",   0,  1, eRD_Muted);