Changeset 2450

Show
Ignore:
Timestamp:
10/27/13 20:53:08 (9 years ago)
Author:
mocchi
Message:

[FFADO/MAudio] obsolete ENABLE_MAUDIO build option and remove related files

As long as FFADO developers confirmed, MAudio devices use BeBoB chipset or Dice chipset. This commit obsolete ENABLE_MAUDIO build option and maudio_avdevice class because it's no meaning.

The resources related to Firewire 410 and Firewire Audiophile are going to be moved to under /src/bebob/maudio/.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/deb/SConscript

    r1130 r2450  
    5656    DEBFILES.append(("usr/share/libffado/ffado_driver_bebob.txt",  "#src/bebob/ffado_driver_bebob.txt")) 
    5757    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")) 
    6161if env['ENABLE_FIREWORKS']: 
    6262    DEBFILES.append(("usr/share/libffado/ffado_driver_fireworks.txt",  "#src/fireworks/ffado_driver_fireworks.txt")) 
  • trunk/libffado/SConstruct

    r2383 r2450  
    6262    BoolVariable( "ENABLE_RME", "Enable/Disable support for the RME platform.", True ), 
    6363    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 ), 
    6564    BoolVariable( "ENABLE_BOUNCE", "Enable/Disable the BOUNCE device.", False ), 
    6665    BoolVariable( "ENABLE_GENERICAVC", """\ 
     
    431430    env['ENABLE_DIGIDESIGN'] = True 
    432431    env['ENABLE_BOUNCE'] = True 
    433     env['ENABLE_MAUDIO'] = True 
    434432 
    435433 
  • trunk/libffado/src/devicemanager.cpp

    r2107 r2450  
    4343#ifdef ENABLE_BEBOB 
    4444#include "bebob/bebob_avdevice.h" 
    45 #endif 
    46  
    47 #ifdef ENABLE_MAUDIO 
    48 #include "maudio/maudio_avdevice.h" 
    4945#endif 
    5046 
     
    10541050#endif 
    10551051 
    1056 #ifdef ENABLE_MAUDIO 
    1057     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 #endif 
    1062  
    10631052// we want to try the non-generic AV/C platforms before trying the generic ones 
    10641053#ifdef ENABLE_GENERICAVC 
  • trunk/libffado/src/libutil/Configuration.cpp

    r2356 r2450  
    502502    if(driver == "OXFORD") 
    503503        return eD_Oxford; 
    504     if(driver == "MAUDIO") 
    505         return eD_MAudio; 
    506504    if(driver == "MOTU") 
    507505        return eD_MOTU; 
  • trunk/libffado/src/libutil/Configuration.h

    r2345 r2450  
    4949        eD_GenericAVC  = 3, 
    5050        eD_Oxford      = 4, 
    51         eD_MAudio      = 5, 
    5251        eD_MOTU        = 10, 
    5352        eD_DICE        = 20, 
  • trunk/libffado/src/SConscript

    r2445 r2450  
    102102 
    103103bebob_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' ) 
    115108 
    116109genericavc_source =  env.Split( '\ 
     
    245238        source += bebob_source 
    246239        pkgdata += bebob_pkgdata 
    247 if env['ENABLE_MAUDIO']: 
    248         env['ENABLE_GENERICAVC'] = True 
    249         libenv.MergeFlags( "-DENABLE_MAUDIO" ) 
    250         source += maudio_source 
    251         pkgdata += maudio_pkgdata 
    252240if env['ENABLE_FIREWORKS']: 
    253241        env['ENABLE_GENERICAVC'] = True