Changeset 1213
- Timestamp:
- 05/25/08 02:28:37 (16 years ago)
- Files:
-
- branches/libffado-2.0/config.h.in (modified) (1 diff)
- branches/libffado-2.0/src/bebob/bebob_avdevice.cpp (modified) (2 diffs)
- branches/libffado-2.0/src/bebob/mackie (copied) (copied from trunk/libffado/src/bebob/mackie)
- branches/libffado-2.0/src/devicemanager.cpp (modified) (1 diff)
- branches/libffado-2.0/src/SConscript (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/libffado-2.0/config.h.in
r1186 r1213 82 82 // debug logging in the critical sections 83 83 #define DEBUG_EXTREME_ENABLE 0 84 85 // discovery 86 #define ENABLE_DISCOVERY_CACHE 0 84 87 85 88 // watchdog branches/libffado-2.0/src/bebob/bebob_avdevice.cpp
r1198 r1213 31 31 #include "bebob/focusrite/focusrite_saffirepro.h" 32 32 #include "bebob/terratec/terratec_device.h" 33 #include "bebob/mackie/onyxmixer.h" 33 34 #include "bebob/edirol/edirol_fa101.h" 34 35 #include "bebob/edirol/edirol_fa66.h" … … 99 100 100 101 switch (vendorId) { 102 case FW_VENDORID_MACKIE: 103 if (modelId == 0x00010065 ) { 104 return new Mackie::OnyxMixerDevice(d, configRom); 105 } 101 106 case FW_VENDORID_EDIROL: 102 107 switch (modelId) { branches/libffado-2.0/src/devicemanager.cpp
r1190 r1213 298 298 DeviceManager::discover( bool useCache, bool rediscover ) 299 299 { 300 useCache = useCache && ENABLE_DISCOVERY_CACHE; 300 301 m_used_cache_last_time = useCache; 301 302 bool slaveMode=false; branches/libffado-2.0/src/SConscript
r1198 r1213 110 110 bebob/edirol/edirol_fa66.cpp \ 111 111 bebob/esi/quatafire610.cpp \ 112 bebob/mackie/onyxmixer.cpp \ 112 113 ' ) 113 114 bebob_pkgdata = env.Split( '\