Changeset 1890

Show
Ignore:
Timestamp:
09/11/10 05:49:25 (14 years ago)
Author:
jwoithe
Message:

MOTU: fix a typo which made the new port configuration system think there were more groups than there really were.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/src/motu/motu_avdevice.cpp

    r1886 r1890  
    13891389 
    13901390    // Add audio capture ports 
     1391#define USEOLD 
     1392#ifdef USEOLD 
    13911393    if (!addDirPorts(Streaming::Port::E_Capture, samp_freq, optical_in_mode_a, optical_in_mode_b)) { 
    13921394        return false; 
    13931395    } 
    1394  
     1396#else 
     1397    if (!addDirPortGroups(Streaming::Port::E_Capture, samp_freq, optical_in_mode_a, optical_in_mode_b)) { 
     1398        return false; 
     1399    } 
     1400#endif 
    13951401    // Add MIDI port.  The MOTU only has one MIDI input port, with each 
    13961402    // MIDI byte sent using a 3 byte sequence starting at byte 4 of the 
     
    14471453 
    14481454    // Add audio playback ports 
     1455#ifdef USEOLD 
    14491456    if (!addDirPorts(Streaming::Port::E_Playback, samp_freq, optical_out_mode_a, optical_out_mode_b)) { 
    14501457        return false; 
    14511458    } 
     1459#else 
     1460    if (!addDirPortGroups(Streaming::Port::E_Playback, samp_freq, optical_out_mode_a, optical_out_mode_b)) { 
     1461        return false; 
     1462    } 
     1463#endif 
    14521464 
    14531465    // Add MIDI port.  The MOTU only has one output MIDI port, with each 
     
    20302042signed int pkt_ofs = 10;       /* Port data starts at offset 10 */ 
    20312043const DevicePropertyEntry *devprop = &DevicesProperty[m_motu_model-1]; 
    2032 signed int n_groups = devprop->n_port_entries; 
     2044signed int n_groups = devprop->n_portgroup_entries; 
    20332045signed int creation_indices[n_groups]; 
    20342046signed int create_in_order;