Changeset 2450
- Timestamp:
- 10/27/13 20:53:08 (10 years ago)
- Files:
-
- trunk/libffado/deb/SConscript (modified) (1 diff)
- trunk/libffado/SConstruct (modified) (2 diffs)
- trunk/libffado/src/bebob/maudio/fw410.xml (added)
- trunk/libffado/src/bebob/maudio/fwap.xml (added)
- trunk/libffado/src/bebob/maudio/refdesign.xml (added)
- trunk/libffado/src/devicemanager.cpp (modified) (2 diffs)
- trunk/libffado/src/libutil/Configuration.cpp (modified) (1 diff)
- trunk/libffado/src/libutil/Configuration.h (modified) (1 diff)
- trunk/libffado/src/maudio/fw410.xml (deleted)
- trunk/libffado/src/maudio/fwap.xml (deleted)
- trunk/libffado/src/maudio/maudio_avdevice.cpp (deleted)
- trunk/libffado/src/maudio/maudio_avdevice.h (deleted)
- trunk/libffado/src/maudio/refdesign.xml (deleted)
- trunk/libffado/src/SConscript (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/deb/SConscript
r1130 r2450 56 56 DEBFILES.append(("usr/share/libffado/ffado_driver_bebob.txt", "#src/bebob/ffado_driver_bebob.txt")) 57 57 DEBFILES.append(("usr/bin/ffado-bridgeco-downloader", "#support/firmware/ffado-bridgeco-downloader")) 58 #DEBFILES.append(("usr/share/libffado/fw410.xml", "#src/ maudio/fw410.xml"))59 #DEBFILES.append(("usr/share/libffado/ fwap.xml","#src/maudio/fwap.xml"))60 #DEBFILES.append(("usr/share/libffado/ refdesign.xml","#src/maudio/refdesign.xml"))58 #DEBFILES.append(("usr/share/libffado/fw410.xml", "#src/bebob/maudio/fw410.xml")) 59 #DEBFILES.append(("usr/share/libffado//fwap.xml","#src/bebob/maudio/fwap.xml")) 60 #DEBFILES.append(("usr/share/libffado//refdesign.xml","#src/bebob/maudio/refdesign.xml")) 61 61 if env['ENABLE_FIREWORKS']: 62 62 DEBFILES.append(("usr/share/libffado/ffado_driver_fireworks.txt", "#src/fireworks/ffado_driver_fireworks.txt")) trunk/libffado/SConstruct
r2383 r2450 62 62 BoolVariable( "ENABLE_RME", "Enable/Disable support for the RME platform.", True ), 63 63 BoolVariable( "ENABLE_DIGIDESIGN", "Enable/Disable support for Digidesign interfaces.", False ), 64 BoolVariable( "ENABLE_MAUDIO", "Enable/Disable support for the M-Audio custom BeBoB devices.", False ),65 64 BoolVariable( "ENABLE_BOUNCE", "Enable/Disable the BOUNCE device.", False ), 66 65 BoolVariable( "ENABLE_GENERICAVC", """\ … … 431 430 env['ENABLE_DIGIDESIGN'] = True 432 431 env['ENABLE_BOUNCE'] = True 433 env['ENABLE_MAUDIO'] = True434 432 435 433 trunk/libffado/src/devicemanager.cpp
r2107 r2450 43 43 #ifdef ENABLE_BEBOB 44 44 #include "bebob/bebob_avdevice.h" 45 #endif46 47 #ifdef ENABLE_MAUDIO48 #include "maudio/maudio_avdevice.h"49 45 #endif 50 46 … … 1054 1050 #endif 1055 1051 1056 #ifdef ENABLE_MAUDIO1057 debugOutput( DEBUG_LEVEL_VERBOSE, "Trying M-Audio...\n" );1058 if ( MAudio::Device::probe( getConfiguration(), *configRom, generic ) ) {1059 return MAudio::Device::createDevice( *this, std::auto_ptr<ConfigRom>( configRom ) );1060 }1061 #endif1062 1063 1052 // we want to try the non-generic AV/C platforms before trying the generic ones 1064 1053 #ifdef ENABLE_GENERICAVC trunk/libffado/src/libutil/Configuration.cpp
r2356 r2450 502 502 if(driver == "OXFORD") 503 503 return eD_Oxford; 504 if(driver == "MAUDIO")505 return eD_MAudio;506 504 if(driver == "MOTU") 507 505 return eD_MOTU; trunk/libffado/src/libutil/Configuration.h
r2345 r2450 49 49 eD_GenericAVC = 3, 50 50 eD_Oxford = 4, 51 eD_MAudio = 5,52 51 eD_MOTU = 10, 53 52 eD_DICE = 20, trunk/libffado/src/SConscript
r2445 r2450 102 102 103 103 bebob_pkgdata = env.Split( '\ 104 maudio/refdesign.xml \ 105 maudio/fw410.xml \ 106 maudio/fwap.xml \ 107 ' ) 108 109 maudio_source = env.Split( '\ 110 maudio/maudio_avdevice.cpp \ 111 ' ) 112 113 maudio_pkgdata = env.Split( '\ 114 ' ) 104 bebob/maudio/refdesign.xml \ 105 bebob/maudio/fw410.xml \ 106 bebob/maudio/fwap.xml \ 107 ' ) 115 108 116 109 genericavc_source = env.Split( '\ … … 245 238 source += bebob_source 246 239 pkgdata += bebob_pkgdata 247 if env['ENABLE_MAUDIO']:248 env['ENABLE_GENERICAVC'] = True249 libenv.MergeFlags( "-DENABLE_MAUDIO" )250 source += maudio_source251 pkgdata += maudio_pkgdata252 240 if env['ENABLE_FIREWORKS']: 253 241 env['ENABLE_GENERICAVC'] = True