Changeset 1213

Show
Ignore:
Timestamp:
05/25/08 02:28:37 (13 years ago)
Author:
ppalmers
Message:

merge trunk changes r1209:1212 (svn merge -r 1209:1212 svn+ssh://ffadosvn@ffado.org/ffado/trunk/libffado)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/libffado-2.0/config.h.in

    r1186 r1213  
    8282// debug logging in the critical sections 
    8383#define DEBUG_EXTREME_ENABLE                 0 
     84 
     85// discovery 
     86#define ENABLE_DISCOVERY_CACHE               0 
    8487 
    8588// watchdog 
  • branches/libffado-2.0/src/bebob/bebob_avdevice.cpp

    r1198 r1213  
    3131#include "bebob/focusrite/focusrite_saffirepro.h" 
    3232#include "bebob/terratec/terratec_device.h" 
     33#include "bebob/mackie/onyxmixer.h" 
    3334#include "bebob/edirol/edirol_fa101.h" 
    3435#include "bebob/edirol/edirol_fa66.h" 
     
    99100 
    100101    switch (vendorId) { 
     102        case FW_VENDORID_MACKIE: 
     103            if (modelId == 0x00010065 ) { 
     104                return new Mackie::OnyxMixerDevice(d, configRom); 
     105            } 
    101106        case FW_VENDORID_EDIROL: 
    102107            switch (modelId) { 
  • branches/libffado-2.0/src/devicemanager.cpp

    r1190 r1213  
    298298DeviceManager::discover( bool useCache, bool rediscover ) 
    299299{ 
     300    useCache = useCache && ENABLE_DISCOVERY_CACHE; 
    300301    m_used_cache_last_time = useCache; 
    301302    bool slaveMode=false; 
  • branches/libffado-2.0/src/SConscript

    r1198 r1213  
    110110        bebob/edirol/edirol_fa66.cpp \ 
    111111        bebob/esi/quatafire610.cpp \ 
     112        bebob/mackie/onyxmixer.cpp \ 
    112113' ) 
    113114bebob_pkgdata = env.Split( '\