Changeset 2764

Show
Ignore:
Timestamp:
02/15/18 02:25:32 (10 months ago)
Author:
jwoithe
Message:

Delete trailing whitespaces. Indent with spaces instead tabs.

Patch from Nicolas Boulenguez.

Files:

Legend:

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

    r2450 r2764  
    4242    # Now we specify the files to be included in the .deb 
    4343    # Where they should go, and where they should be copied from. 
    44     # If you have a lot of files, you may wish to generate this  
     44    # If you have a lot of files, you may wish to generate this 
    4545    # list in some other way. 
    4646    ("usr/lib/libffado.so",             "#src/libffado.so"), 
     
    133133# And we can generate the .deb file by calling dpkg-deb 
    134134env.Command(debpkg, DEBCONTROLFILE, 
    135        "dpkg-deb -b %s %s" % ("deb/%s" % DEBNAME, "$TARGET")) 
     135            "dpkg-deb -b %s %s" % ("deb/%s" % DEBNAME, "$TARGET")) 
  • trunk/libffado/doc/SConscript

    r2733 r2764  
    1515 
    1616env.Doxygen( "reference.doxygen" ) 
    17  
  • trunk/libffado/SConstruct

    r2762 r2764  
    3636 
    3737if not os.path.isdir( "cache" ): 
    38        os.makedirs( "cache" ) 
     38    os.makedirs( "cache" ) 
    3939 
    4040opts = Variables( "cache/options.cache" ) 
     
    147147# make sure the necessary dirs exist 
    148148if not os.path.isdir( "cache" ): 
    149        os.makedirs( "cache" ) 
     149    os.makedirs( "cache" ) 
    150150if not os.path.isdir( 'cache/objects' ): 
    151151    os.makedirs( 'cache/objects' ) 
     
    225225        return -1 
    226226    (maj, min, patch) = match.group(1, 2, 3) 
    227     # For now allow "min" to run up to 65535.  "maj" and "patch" are  
     227    # For now allow "min" to run up to 65535.  "maj" and "patch" are 
    228228    # restricted to 0-255. 
    229229    return (int(maj) << 24) | (int(min) << 8) | int(patch) 
     
    288288            pkgs['libxml++-2.6'] = '2.13.0' 
    289289 
    290     # Provide a way for users to compile newer libffado which will work  
     290    # Provide a way for users to compile newer libffado which will work 
    291291    # against older jack installations which will not accept the new API 
    292292    # version reported at runtime. 
     
    309309        if not(have_jack): 
    310310            print(""" 
    311 No Jack Audio Connection Kit (JACK) installed: assuming a FFADO  
     311No Jack Audio Connection Kit (JACK) installed: assuming a FFADO 
    312312setbuffersize-compatible version will be used. 
    313313""") 
     
    315315            FFADO_API_VERSION="8" 
    316316            print(""" 
    317 Installed Jack Audio Connection Kit (JACK) jack does not support FFADO  
    318 setbuffersize API: will report earlier API version at runtime.  Consider  
    319 upgrading to jack1 >=0.122.0 or jack2 >=1.9.9 at some point, and then  
     317Installed Jack Audio Connection Kit (JACK) jack does not support FFADO 
     318setbuffersize API: will report earlier API version at runtime.  Consider 
     319upgrading to jack1 >=0.122.0 or jack2 >=1.9.9 at some point, and then 
    320320recompile ffado to gain access to this added feature. 
    321321""") 
     
    325325        if (have_jack and not(good_jack1) and not(good_jack2)): 
    326326            print(""" 
    327 SetBufferSize API version is enabled but no suitable version of Jack Audio  
    328 Connection Kit (JACK) has been found.  The resulting FFADO would cause your  
    329 jackd to abort with "incompatible FFADO version".  Please upgrade to  
     327SetBufferSize API version is enabled but no suitable version of Jack Audio 
     328Connection Kit (JACK) has been found.  The resulting FFADO would cause your 
     329jackd to abort with "incompatible FFADO version".  Please upgrade to 
    330330jack1 >=0.122.0 or jack2 >=1.9.9, or set ENABLE_SETBUFFERSIZE_API_VER to "auto" 
    331331or "false". 
    332332""") 
    333             # Although it's not strictly an error, in almost every case that  
     333            # Although it's not strictly an error, in almost every case that 
    334334            # this occurs the user will want to know about it and fix the 
    335335            # problem, so we exit so they're guaranteed of seeing the above 
     
    362362        Exit( 1 ) 
    363363 
    364     # libxml++-2.6 requires a c++11 compiler as of version 2.39.1.  The  
     364    # libxml++-2.6 requires a c++11 compiler as of version 2.39.1.  The 
    365365    # gnu++11 standard seems to work both with these later libxml++ versions 
    366366    # and ffado itself, although a significant number of warnings are 
     
    411411            env['BUILD_MIXER'] = 'false' 
    412412            print(""" 
    413 The prerequisites ('pyuic4'/'pyuic5' and the python-modules 'dbus' and  
    414 'PyQt4'/'PyQt5', the packages could be named like dbus-python and PyQt) to  
     413The prerequisites ('pyuic4'/'pyuic5' and the python-modules 'dbus' and 
     414'PyQt4'/'PyQt5', the packages could be named like dbus-python and PyQt) to 
    415415build the mixer were not found. Therefore the qt mixer will not be installed.""") 
    416416        else: # env['BUILD_MIXER'] == 'true' 
    417417            print(""" 
    418 The prerequisites ('pyuic4'/'pyuic5' and the python-modules 'dbus' and  
    419 'PyQt4'/'PyQt5', the packages could be named like dbus-python and PyQt) to  
     418The prerequisites ('pyuic4'/'pyuic5' and the python-modules 'dbus' and 
     419'PyQt4'/'PyQt5', the packages could be named like dbus-python and PyQt) to 
    420420build the mixer were not found, but BUILD_MIXER was requested.""") 
    421421            Exit( 1 ) 
     
    566566needs_fPIC = False 
    567567 
    568 #=== Begin Revised CXXFLAGS =========================================  
     568#=== Begin Revised CXXFLAGS ========================================= 
    569569def outputof(*cmd): 
    570570    """Run a command without running a shell, return cmd's stdout 
     
    701701    answer = None 
    702702 
    703     # If setting DIST_TARGET to i686 on a 64-bit CPU to facilitate  
     703    # If setting DIST_TARGET to i686 on a 64-bit CPU to facilitate 
    704704    # compilation of a multilib environment, force 32-bit. 
    705705    if env['DIST_TARGET'] == 'i686': 
     
    874874# avoid the 1.999.41- type of version for exported versions 
    875875if env['REVISION'] != '': 
    876        env['REVISIONSTRING'] = '-' + env['REVISION'] 
     876    env['REVISIONSTRING'] = '-' + env['REVISION'] 
    877877else: 
    878        env['REVISIONSTRING'] = '' 
     878    env['REVISIONSTRING'] = '' 
    879879 
    880880env['FFADO_API_VERSION'] = FFADO_API_VERSION 
  • trunk/libffado/src/SConscript

    r2718 r2764  
    3131 
    3232ffado_source = env.Split( '\ 
    33        devicemanager.cpp \ 
    34        ffado.cpp \ 
    35        ffadodevice.cpp \ 
    36        debugmodule/debugmodule.cpp \ 
    37        DeviceStringParser.cpp \ 
    38        libieee1394/ARMHandler.cpp \ 
    39        libieee1394/configrom.cpp \ 
    40        libieee1394/csr1212.c \ 
    41        libieee1394/CycleTimerHelper.cpp \ 
    42        libieee1394/ieee1394service.cpp \ 
    43        libieee1394/IEC61883.cpp \ 
    44        libieee1394/IsoHandlerManager.cpp \ 
    45        libstreaming/StreamProcessorManager.cpp \ 
    46        libstreaming/util/cip.c \ 
    47        libstreaming/generic/StreamProcessor.cpp \ 
    48        libstreaming/generic/Port.cpp \ 
    49        libstreaming/generic/PortManager.cpp \ 
    50        libutil/cmd_serialize.cpp \ 
    51        libutil/DelayLockedLoop.cpp \ 
    52        libutil/IpcRingBuffer.cpp \ 
    53        libutil/PacketBuffer.cpp \ 
    54        libutil/Configuration.cpp \ 
    55        libutil/OptionContainer.cpp \ 
    56        libutil/PosixMessageQueue.cpp \ 
    57        libutil/PosixSharedMemory.cpp \ 
    58        libutil/PosixMutex.cpp \ 
    59        libutil/PosixThread.cpp \ 
    60        libutil/ringbuffer.c \ 
    61        libutil/StreamStatistics.cpp \ 
    62        libutil/SystemTimeSource.cpp \ 
    63        libutil/TimestampedBuffer.cpp \ 
    64        libutil/Watchdog.cpp \ 
    65        libcontrol/Element.cpp \ 
    66        libcontrol/BasicElements.cpp \ 
    67        libcontrol/MatrixMixer.cpp \ 
    68        libcontrol/CrossbarRouter.cpp \ 
    69        libcontrol/ClockSelect.cpp \ 
    70        libcontrol/Nickname.cpp \ 
     33    devicemanager.cpp \ 
     34    ffado.cpp \ 
     35    ffadodevice.cpp \ 
     36    debugmodule/debugmodule.cpp \ 
     37    DeviceStringParser.cpp \ 
     38    libieee1394/ARMHandler.cpp \ 
     39    libieee1394/configrom.cpp \ 
     40    libieee1394/csr1212.c \ 
     41    libieee1394/CycleTimerHelper.cpp \ 
     42    libieee1394/ieee1394service.cpp \ 
     43    libieee1394/IEC61883.cpp \ 
     44    libieee1394/IsoHandlerManager.cpp \ 
     45    libstreaming/StreamProcessorManager.cpp \ 
     46    libstreaming/util/cip.c \ 
     47    libstreaming/generic/StreamProcessor.cpp \ 
     48    libstreaming/generic/Port.cpp \ 
     49    libstreaming/generic/PortManager.cpp \ 
     50    libutil/cmd_serialize.cpp \ 
     51    libutil/DelayLockedLoop.cpp \ 
     52    libutil/IpcRingBuffer.cpp \ 
     53    libutil/PacketBuffer.cpp \ 
     54    libutil/Configuration.cpp \ 
     55    libutil/OptionContainer.cpp \ 
     56    libutil/PosixMessageQueue.cpp \ 
     57    libutil/PosixSharedMemory.cpp \ 
     58    libutil/PosixMutex.cpp \ 
     59    libutil/PosixThread.cpp \ 
     60    libutil/ringbuffer.c \ 
     61    libutil/StreamStatistics.cpp \ 
     62    libutil/SystemTimeSource.cpp \ 
     63    libutil/TimestampedBuffer.cpp \ 
     64    libutil/Watchdog.cpp \ 
     65    libcontrol/Element.cpp \ 
     66    libcontrol/BasicElements.cpp \ 
     67    libcontrol/MatrixMixer.cpp \ 
     68    libcontrol/CrossbarRouter.cpp \ 
     69    libcontrol/ClockSelect.cpp \ 
     70    libcontrol/Nickname.cpp \ 
    7171') 
    7272 
    7373if env['SERIALIZE_USE_EXPAT']: 
    74        ffado_source.append('libutil/serialize_expat.cpp') 
    75        ffado_source.append('libutil/serialize_expat_xml.cpp') 
     74    ffado_source.append('libutil/serialize_expat.cpp') 
     75    ffado_source.append('libutil/serialize_expat_xml.cpp') 
    7676else: 
    77        ffado_source.append('libutil/serialize_libxml.cpp') 
     77    ffado_source.append('libutil/serialize_libxml.cpp') 
    7878 
    7979bebob_source = env.Split( '\ 
    80        bebob/bebob_avdevice.cpp \ 
    81        bebob/bebob_avdevice_subunit.cpp \ 
    82        bebob/bebob_avplug.cpp \ 
    83        bebob/bebob_dl_bcd.cpp \ 
    84        bebob/bebob_dl_codes.cpp \ 
    85        bebob/bebob_dl_mgr.cpp \ 
    86        bebob/bebob_functionblock.cpp \ 
    87        bebob/bebob_mixer.cpp \ 
    88        bebob/focusrite/focusrite_generic.cpp \ 
    89        bebob/focusrite/focusrite_saffire.cpp \ 
    90        bebob/focusrite/focusrite_saffirepro.cpp \ 
    91        bebob/focusrite/focusrite_cmd.cpp \ 
    92        bebob/terratec/terratec_device.cpp \ 
    93        bebob/terratec/terratec_cmd.cpp \ 
    94        bebob/edirol/edirol_fa101.cpp \ 
    95        bebob/edirol/edirol_fa66.cpp \ 
    96        bebob/esi/quatafire610.cpp \ 
    97        bebob/mackie/onyxmixer.cpp \ 
    98        bebob/yamaha/yamaha_cmd.cpp \ 
    99        bebob/yamaha/yamaha_avdevice.cpp \ 
    100        bebob/maudio/normal_avdevice.cpp \ 
    101        bebob/maudio/special_avdevice.cpp \ 
    102        bebob/maudio/special_mixer.cpp \ 
    103        bebob/presonus/firebox_avdevice.cpp \ 
    104        bebob/presonus/inspire1394_avdevice.cpp \ 
     80    bebob/bebob_avdevice.cpp \ 
     81    bebob/bebob_avdevice_subunit.cpp \ 
     82    bebob/bebob_avplug.cpp \ 
     83    bebob/bebob_dl_bcd.cpp \ 
     84    bebob/bebob_dl_codes.cpp \ 
     85    bebob/bebob_dl_mgr.cpp \ 
     86    bebob/bebob_functionblock.cpp \ 
     87    bebob/bebob_mixer.cpp \ 
     88    bebob/focusrite/focusrite_generic.cpp \ 
     89    bebob/focusrite/focusrite_saffire.cpp \ 
     90    bebob/focusrite/focusrite_saffirepro.cpp \ 
     91    bebob/focusrite/focusrite_cmd.cpp \ 
     92    bebob/terratec/terratec_device.cpp \ 
     93    bebob/terratec/terratec_cmd.cpp \ 
     94    bebob/edirol/edirol_fa101.cpp \ 
     95    bebob/edirol/edirol_fa66.cpp \ 
     96    bebob/esi/quatafire610.cpp \ 
     97    bebob/mackie/onyxmixer.cpp \ 
     98    bebob/yamaha/yamaha_cmd.cpp \ 
     99    bebob/yamaha/yamaha_avdevice.cpp \ 
     100    bebob/maudio/normal_avdevice.cpp \ 
     101    bebob/maudio/special_avdevice.cpp \ 
     102    bebob/maudio/special_mixer.cpp \ 
     103    bebob/presonus/firebox_avdevice.cpp \ 
     104    bebob/presonus/inspire1394_avdevice.cpp \ 
    105105' ) 
    106106 
    107107bebob_pkgdata = env.Split( '\ 
    108        bebob/maudio/refdesign.xml \ 
    109        bebob/maudio/fw410.xml \ 
    110        bebob/maudio/fwap.xml \ 
     108    bebob/maudio/refdesign.xml \ 
     109    bebob/maudio/fw410.xml \ 
     110    bebob/maudio/fwap.xml \ 
    111111' ) 
    112112 
    113113genericavc_source =  env.Split( '\ 
    114        genericavc/avc_avdevice.cpp \ 
    115        genericavc/stanton/scs.cpp \ 
     114    genericavc/avc_avdevice.cpp \ 
     115    genericavc/stanton/scs.cpp \ 
    116116' ) 
    117117 
    118118genericavc_pkgdata = env.Split( '\ 
    119 ' )     
     119' ) 
    120120 
    121121fireworks_source =  env.Split( '\ 
    122        fireworks/fireworks_device.cpp \ 
    123        fireworks/fireworks_control.cpp \ 
    124        fireworks/fireworks_firmware.cpp \ 
    125        fireworks/efc/efc_avc_cmd.cpp \ 
    126        fireworks/efc/efc_cmd.cpp \ 
    127        fireworks/efc/efc_cmds_hardware.cpp \ 
    128        fireworks/efc/efc_cmds_hardware_ctrl.cpp \ 
    129        fireworks/efc/efc_cmds_flash.cpp \ 
    130        fireworks/efc/efc_cmds_mixer.cpp \ 
    131        fireworks/efc/efc_cmds_monitor.cpp \ 
    132        fireworks/efc/efc_cmds_ioconfig.cpp \ 
    133        fireworks/fireworks_session_block.cpp \ 
    134        fireworks/audiofire/audiofire_device.cpp \ 
     122    fireworks/fireworks_device.cpp \ 
     123    fireworks/fireworks_control.cpp \ 
     124    fireworks/fireworks_firmware.cpp \ 
     125    fireworks/efc/efc_avc_cmd.cpp \ 
     126    fireworks/efc/efc_cmd.cpp \ 
     127    fireworks/efc/efc_cmds_hardware.cpp \ 
     128    fireworks/efc/efc_cmds_hardware_ctrl.cpp \ 
     129    fireworks/efc/efc_cmds_flash.cpp \ 
     130    fireworks/efc/efc_cmds_mixer.cpp \ 
     131    fireworks/efc/efc_cmds_monitor.cpp \ 
     132    fireworks/efc/efc_cmds_ioconfig.cpp \ 
     133    fireworks/fireworks_session_block.cpp \ 
     134    fireworks/audiofire/audiofire_device.cpp \ 
    135135' ) 
    136136 
     
    139139 
    140140oxford_source =  env.Split( '\ 
    141        oxford/oxford_device.cpp \ 
    142        libstreaming/amdtp-oxford/AmdtpOxfordReceiveStreamProcessor.cpp \ 
     141    oxford/oxford_device.cpp \ 
     142    libstreaming/amdtp-oxford/AmdtpOxfordReceiveStreamProcessor.cpp \ 
    143143' ) 
    144144 
    145145oxford_pkgdata = env.Split( '\ 
    146 ' )     
     146' ) 
    147147 
    148148motu_source = env.Split( '\ 
    149        motu/motu_avdevice.cpp \ 
    150        motu/motu_controls.cpp \ 
    151        motu/motu_mark3_controls.cpp \ 
    152        motu/motu_mixerdefs.cpp \ 
    153        motu/motu_mark3_mixerdefs.cpp \ 
    154        motu/motu_mixer.cpp \ 
    155        libstreaming/motu/MotuPort.cpp \ 
    156        libstreaming/motu/MotuPortInfo.cpp \ 
    157        libstreaming/motu/MotuReceiveStreamProcessor.cpp \ 
    158        libstreaming/motu/MotuTransmitStreamProcessor.cpp \ 
     149    motu/motu_avdevice.cpp \ 
     150    motu/motu_controls.cpp \ 
     151    motu/motu_mark3_controls.cpp \ 
     152    motu/motu_mixerdefs.cpp \ 
     153    motu/motu_mark3_mixerdefs.cpp \ 
     154    motu/motu_mixer.cpp \ 
     155    libstreaming/motu/MotuPort.cpp \ 
     156    libstreaming/motu/MotuPortInfo.cpp \ 
     157    libstreaming/motu/MotuReceiveStreamProcessor.cpp \ 
     158    libstreaming/motu/MotuTransmitStreamProcessor.cpp \ 
    159159' ) 
    160160 
    161161dice_source = env.Split( '\ 
    162        dice/dice_avdevice.cpp \ 
    163        dice/dice_firmware_loader.cpp \ 
    164        dice/dice_eap.cpp \ 
    165        dice/focusrite/focusrite_eap.cpp \ 
    166        dice/focusrite/saffire_pro40.cpp \ 
    167        dice/focusrite/saffire_pro26.cpp \ 
    168        dice/focusrite/saffire_pro24.cpp \ 
    169        dice/focusrite/saffire_pro14.cpp \ 
    170        dice/focusrite/saffire_56.cpp \ 
    171        dice/maudio/profire_2626.cpp \ 
    172        dice/presonus/firestudio_tube.cpp \ 
    173        dice/presonus/firestudio_project.cpp \ 
    174        dice/presonus/firestudio_mobile.cpp \ 
     162    dice/dice_avdevice.cpp \ 
     163    dice/dice_firmware_loader.cpp \ 
     164    dice/dice_eap.cpp \ 
     165    dice/focusrite/focusrite_eap.cpp \ 
     166    dice/focusrite/saffire_pro40.cpp \ 
     167    dice/focusrite/saffire_pro26.cpp \ 
     168    dice/focusrite/saffire_pro24.cpp \ 
     169    dice/focusrite/saffire_pro14.cpp \ 
     170    dice/focusrite/saffire_56.cpp \ 
     171    dice/maudio/profire_2626.cpp \ 
     172    dice/presonus/firestudio_tube.cpp \ 
     173    dice/presonus/firestudio_project.cpp \ 
     174    dice/presonus/firestudio_mobile.cpp \ 
    175175' ) 
    176176 
    177177bounce_source = env.Split( '\ 
    178        bounce/bounce_avdevice.cpp \ 
    179        bounce/bounce_slave_avdevice.cpp \ 
     178    bounce/bounce_avdevice.cpp \ 
     179    bounce/bounce_slave_avdevice.cpp \ 
    180180' ) 
    181181 
    182182metric_halo_source = env.Split( '\ 
    183        metrichalo/mh_avdevice.cpp \ 
     183    metrichalo/mh_avdevice.cpp \ 
    184184' ) 
    185185 
    186186rme_source = env.Split( '\ 
    187        rme/rme_shm.cpp \ 
    188        rme/rme_avdevice.cpp \ 
    189        rme/rme_avdevice_settings.cpp \ 
    190        rme/fireface_flash.cpp \ 
    191        rme/fireface_hw.cpp \ 
    192        rme/fireface_settings_ctrls.cpp \ 
    193        libstreaming/rme/RmePort.cpp \ 
    194        libstreaming/rme/RmePortInfo.cpp \ 
    195        libstreaming/rme/RmeReceiveStreamProcessor.cpp \ 
    196        libstreaming/rme/RmeTransmitStreamProcessor.cpp \ 
     187    rme/rme_shm.cpp \ 
     188    rme/rme_avdevice.cpp \ 
     189    rme/rme_avdevice_settings.cpp \ 
     190    rme/fireface_flash.cpp \ 
     191    rme/fireface_hw.cpp \ 
     192    rme/fireface_settings_ctrls.cpp \ 
     193    libstreaming/rme/RmePort.cpp \ 
     194    libstreaming/rme/RmePortInfo.cpp \ 
     195    libstreaming/rme/RmeReceiveStreamProcessor.cpp \ 
     196    libstreaming/rme/RmeTransmitStreamProcessor.cpp \ 
    197197' ) 
    198198 
    199199digidesign_source = env.Split( '\ 
    200        digidesign/digidesign_avdevice.cpp \ 
    201        libstreaming/digidesign/DigidesignPort.cpp \ 
    202        libstreaming/digidesign/DigidesignPortInfo.cpp \ 
    203        libstreaming/digidesign/DigidesignReceiveStreamProcessor.cpp \ 
    204        libstreaming/digidesign/DigidesignTransmitStreamProcessor.cpp \ 
     200    digidesign/digidesign_avdevice.cpp \ 
     201    libstreaming/digidesign/DigidesignPort.cpp \ 
     202    libstreaming/digidesign/DigidesignPortInfo.cpp \ 
     203    libstreaming/digidesign/DigidesignReceiveStreamProcessor.cpp \ 
     204    libstreaming/digidesign/DigidesignTransmitStreamProcessor.cpp \ 
    205205' ) 
    206206 
    207207amdtp_source = env.Split( '\ 
    208        libstreaming/amdtp/AmdtpPort.cpp \ 
    209        libstreaming/amdtp/AmdtpPortInfo.cpp \ 
    210        libstreaming/amdtp/AmdtpReceiveStreamProcessor.cpp \ 
    211        libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp \ 
     208    libstreaming/amdtp/AmdtpPort.cpp \ 
     209    libstreaming/amdtp/AmdtpPortInfo.cpp \ 
     210    libstreaming/amdtp/AmdtpReceiveStreamProcessor.cpp \ 
     211    libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp \ 
    212212' ) 
    213213 
    214214libavc_source = env.Split( '\ 
    215        libavc/streamformat/avc_extended_stream_format.cpp \ 
    216        libavc/musicsubunit/avc_descriptor_music.cpp \ 
    217        libavc/musicsubunit/avc_musicsubunit.cpp \ 
    218        libavc/audiosubunit/avc_audiosubunit.cpp \ 
    219        libavc/audiosubunit/avc_descriptor_audio.cpp \ 
    220        libavc/audiosubunit/avc_function_block.cpp \ 
    221        libavc/descriptors/avc_descriptor_cmd.cpp \ 
    222        libavc/descriptors/avc_descriptor.cpp \ 
    223        libavc/general/avc_extended_subunit_info.cpp \ 
    224        libavc/general/avc_unit_info.cpp \ 
    225        libavc/general/avc_generic.cpp \ 
    226        libavc/general/avc_subunit_info.cpp \ 
    227        libavc/general/avc_connect.cpp \ 
    228        libavc/general/avc_signal_format.cpp \ 
    229        libavc/general/avc_extended_cmd_generic.cpp \ 
    230        libavc/general/avc_extended_plug_info.cpp \ 
    231        libavc/general/avc_plug_info.cpp \ 
    232        libavc/general/avc_unit.cpp \ 
    233        libavc/general/avc_subunit.cpp \ 
    234        libavc/general/avc_plug.cpp \ 
    235        libavc/general/avc_vendor_dependent_cmd.cpp \ 
    236        libavc/avc_definitions.cpp \ 
    237        libavc/ccm/avc_signal_source.cpp \ 
     215    libavc/streamformat/avc_extended_stream_format.cpp \ 
     216    libavc/musicsubunit/avc_descriptor_music.cpp \ 
     217    libavc/musicsubunit/avc_musicsubunit.cpp \ 
     218    libavc/audiosubunit/avc_audiosubunit.cpp \ 
     219    libavc/audiosubunit/avc_descriptor_audio.cpp \ 
     220    libavc/audiosubunit/avc_function_block.cpp \ 
     221    libavc/descriptors/avc_descriptor_cmd.cpp \ 
     222    libavc/descriptors/avc_descriptor.cpp \ 
     223    libavc/general/avc_extended_subunit_info.cpp \ 
     224    libavc/general/avc_unit_info.cpp \ 
     225    libavc/general/avc_generic.cpp \ 
     226    libavc/general/avc_subunit_info.cpp \ 
     227    libavc/general/avc_connect.cpp \ 
     228    libavc/general/avc_signal_format.cpp \ 
     229    libavc/general/avc_extended_cmd_generic.cpp \ 
     230    libavc/general/avc_extended_plug_info.cpp \ 
     231    libavc/general/avc_plug_info.cpp \ 
     232    libavc/general/avc_unit.cpp \ 
     233    libavc/general/avc_subunit.cpp \ 
     234    libavc/general/avc_plug.cpp \ 
     235    libavc/general/avc_vendor_dependent_cmd.cpp \ 
     236    libavc/avc_definitions.cpp \ 
     237    libavc/ccm/avc_signal_source.cpp \ 
    238238' ) 
    239239 
     
    241241pkgdata = [] 
    242242if env['ENABLE_BEBOB']: 
    243        env['ENABLE_GENERICAVC'] = True 
    244        libenv.MergeFlags( "-DENABLE_BEBOB" ) 
    245        source += bebob_source 
    246        pkgdata += bebob_pkgdata 
     243    env['ENABLE_GENERICAVC'] = True 
     244    libenv.MergeFlags( "-DENABLE_BEBOB" ) 
     245    source += bebob_source 
     246    pkgdata += bebob_pkgdata 
    247247if env['ENABLE_FIREWORKS']: 
    248        env['ENABLE_GENERICAVC'] = True 
    249        libenv.MergeFlags( "-DENABLE_FIREWORKS" ) 
    250        source += fireworks_source 
    251        pkgdata += fireworks_pkgdata 
     248    env['ENABLE_GENERICAVC'] = True 
     249    libenv.MergeFlags( "-DENABLE_FIREWORKS" ) 
     250    source += fireworks_source 
     251    pkgdata += fireworks_pkgdata 
    252252if env['ENABLE_OXFORD']: 
    253        env['ENABLE_GENERICAVC'] = True 
    254        libenv.MergeFlags( "-DENABLE_OXFORD" ) 
    255        source += oxford_source 
    256        pkgdata += oxford_pkgdata 
     253    env['ENABLE_GENERICAVC'] = True 
     254    libenv.MergeFlags( "-DENABLE_OXFORD" ) 
     255    source += oxford_source 
     256    pkgdata += oxford_pkgdata 
    257257if env['ENABLE_MOTU']: 
    258        libenv.MergeFlags( "-DENABLE_MOTU" ) 
    259        source += motu_source 
     258    libenv.MergeFlags( "-DENABLE_MOTU" ) 
     259    source += motu_source 
    260260if env['ENABLE_DICE']: 
    261        env['ENABLE_GENERICAVC'] = True 
    262        libenv.MergeFlags( "-DENABLE_DICE" ) 
    263        source += dice_source 
     261    env['ENABLE_GENERICAVC'] = True 
     262    libenv.MergeFlags( "-DENABLE_DICE" ) 
     263    source += dice_source 
    264264if env['ENABLE_METRIC_HALO']: 
    265        libenv.MergeFlags( "-DENABLE_METRIC_HALO" ) 
    266        source += metric_halo_source 
     265    libenv.MergeFlags( "-DENABLE_METRIC_HALO" ) 
     266    source += metric_halo_source 
    267267if env['ENABLE_RME']: 
    268        libenv.MergeFlags( "-DENABLE_RME" ) 
    269        source += rme_source 
     268    libenv.MergeFlags( "-DENABLE_RME" ) 
     269    source += rme_source 
    270270if env['ENABLE_DIGIDESIGN']: 
    271        libenv.MergeFlags( "-DENABLE_DIGIDESIGN" ) 
    272        source += digidesign_source 
     271    libenv.MergeFlags( "-DENABLE_DIGIDESIGN" ) 
     272    source += digidesign_source 
    273273if env['ENABLE_BOUNCE']: 
    274        env['ENABLE_GENERICAVC'] = True 
    275        libenv.MergeFlags( "-DENABLE_BOUNCE" ) 
    276        source += bounce_source 
     274    env['ENABLE_GENERICAVC'] = True 
     275    libenv.MergeFlags( "-DENABLE_BOUNCE" ) 
     276    source += bounce_source 
    277277 
    278278if env['ENABLE_GENERICAVC']: 
    279        libenv.MergeFlags( "-DENABLE_GENERICAVC" ) 
    280        source += libavc_source 
    281        source += amdtp_source 
    282        source += genericavc_source 
    283        pkgdata += genericavc_pkgdata 
     279    libenv.MergeFlags( "-DENABLE_GENERICAVC" ) 
     280    source += libavc_source 
     281    source += amdtp_source 
     282    source += genericavc_source 
     283    pkgdata += genericavc_pkgdata 
    284284 
    285285if not env.GetOption( "clean" ): 
    286        libenv.MergeFlags( "-lrt -lpthread" ) 
    287        libenv.MergeFlags( env['LIBRAW1394_FLAGS'].decode() ) 
    288        libenv.MergeFlags( env['LIBIEC61883_FLAGS'].decode() ) 
    289        libenv.MergeFlags( env['LIBCONFIG_FLAGS'].decode() ) 
    290        if not env['SERIALIZE_USE_EXPAT']: 
    291             if 'LIBXML30_FLAGS' in env : 
    292                libenv.MergeFlags( env['LIBXML30_FLAGS'].decode() ) 
    293             if not('LIBXML30_FLAGS' in env) : 
    294                libenv.MergeFlags( env['LIBXML26_FLAGS'].decode() ) 
    295        else: 
    296                libenv.PrependUnique( LIBS=["expat"] ) 
    297                libenv.MergeFlags( "-DSERIALIZE_USE_EXPAT" ) 
    298        if env['REQUIRE_LIBAVC']: 
    299                libenv.MergeFlags( env['LIBAVC1394_FLAGS'].decode() ) 
     286    libenv.MergeFlags( "-lrt -lpthread" ) 
     287    libenv.MergeFlags( env['LIBRAW1394_FLAGS'].decode() ) 
     288    libenv.MergeFlags( env['LIBIEC61883_FLAGS'].decode() ) 
     289    libenv.MergeFlags( env['LIBCONFIG_FLAGS'].decode() ) 
     290    if not env['SERIALIZE_USE_EXPAT']: 
     291        if 'LIBXML30_FLAGS' in env : 
     292            libenv.MergeFlags( env['LIBXML30_FLAGS'].decode() ) 
     293        if not('LIBXML30_FLAGS' in env) : 
     294            libenv.MergeFlags( env['LIBXML26_FLAGS'].decode() ) 
     295    else: 
     296        libenv.PrependUnique( LIBS=["expat"] ) 
     297        libenv.MergeFlags( "-DSERIALIZE_USE_EXPAT" ) 
     298    if env['REQUIRE_LIBAVC']: 
     299        libenv.MergeFlags( env['LIBAVC1394_FLAGS'].decode() ) 
    300300 
    301301libname_versioned = "libffado.so.%s" % libenv['VERSION'] 
     
    327327# 
    328328for data in pkgdata: 
    329        libenv.Install( "$sharedir", data ) 
     329    libenv.Install( "$sharedir", data ) 
    330330 
    331331# 
     
    337337 
    338338apps = { \ 
    339        "test-debugmodule" : "debugmodule/test_debugmodule.cpp", \ 
    340        "test-dll" : "libutil/test-dll.cpp", \ 
    341        "test-unittests-util" : "libutil/unittests.cpp", \ 
    342        "test-cyclecalc" : "libieee1394/test-cyclecalc.cpp", \ 
     339    "test-debugmodule" : "debugmodule/test_debugmodule.cpp", \ 
     340    "test-dll" : "libutil/test-dll.cpp", \ 
     341    "test-unittests-util" : "libutil/unittests.cpp", \ 
     342    "test-cyclecalc" : "libieee1394/test-cyclecalc.cpp", \ 
    343343} 
    344344 
     
    346346 
    347347for app in apps.keys(): 
    348         env2.Program( target=app, source = env.Split( apps[app] ) ) 
    349         if app.find( "test" ) == -1: 
    350                 env2.Install( "$bindir", app ) 
    351  
     348    env2.Program( target=app, source = env.Split( apps[app] ) ) 
     349    if app.find( "test" ) == -1: 
     350        env2.Install( "$bindir", app ) 
  • trunk/libffado/support/tools/SConscript

    r2753 r2764  
    3333e.MergeFlags( "-I#/ -I#/src -L%ssrc -lffado" % env['build_base'] ) 
    3434if not e.GetOption( "clean" ): 
    35         if not env['SERIALIZE_USE_EXPAT']: 
    36             if 'LIBXML30_FLAGS' in env : 
    37                e.MergeFlags( env['LIBXML30_FLAGS'].decode() ) 
    38             if not('LIBXML30_FLAGS' in env) : 
    39                 e.MergeFlags( env['LIBXML26_FLAGS'].decode() ) 
    40         else: 
    41                 e.PrependUnique( LIBS=["expat"] ) 
     35    if not env['SERIALIZE_USE_EXPAT']: 
     36        if 'LIBXML30_FLAGS' in env : 
     37            e.MergeFlags( env['LIBXML30_FLAGS'].decode() ) 
     38        if not('LIBXML30_FLAGS' in env) : 
     39            e.MergeFlags( env['LIBXML26_FLAGS'].decode() ) 
     40    else: 
     41        e.PrependUnique( LIBS=["expat"] ) 
    4242 
    4343e.Command( "static_info.txt", "ffado-diag", "support/tools/ffado-diag --static > $TARGET" ) 
     
    4949 
    5050if env['ENABLE_DICE']: 
    51         e.Program( target = "ffado-set-nickname", source = "ffado-set-nickname.cpp" ) 
    52         e.Install( "$bindir", "ffado-set-nickname" ) 
     51    e.Program( target = "ffado-set-nickname", source = "ffado-set-nickname.cpp" ) 
     52    e.Install( "$bindir", "ffado-set-nickname" ) 
    5353 
    5454# Install manpages in section 1 
  • trunk/libffado/tests/SConscript

    r2718 r2764  
    2929 
    3030if not env.GetOption( "clean" ): 
    31        env.MergeFlags( "-lpthread" ) 
    32        env.MergeFlags( env['LIBIEC61883_FLAGS'].decode() ) 
    33        env.MergeFlags( env['LIBRAW1394_FLAGS'].decode() ) 
    34        if not env['SERIALIZE_USE_EXPAT']: 
    35             if 'LIBXML30_FLAGS' in env : 
    36                env.MergeFlags( env['LIBXML30_FLAGS'].decode() ) 
    37             if not('LIBXML30_FLAGS' in env) : 
    38                env.MergeFlags( env['LIBXML26_FLAGS'].decode() ) 
    39        else: 
    40                env.PrependUnique( LIBS=["expat"] ) 
     31    env.MergeFlags( "-lpthread" ) 
     32    env.MergeFlags( env['LIBIEC61883_FLAGS'].decode() ) 
     33    env.MergeFlags( env['LIBRAW1394_FLAGS'].decode() ) 
     34    if not env['SERIALIZE_USE_EXPAT']: 
     35        if 'LIBXML30_FLAGS' in env : 
     36             env.MergeFlags( env['LIBXML30_FLAGS'].decode() ) 
     37        if not('LIBXML30_FLAGS' in env) : 
     38             env.MergeFlags( env['LIBXML26_FLAGS'].decode() ) 
     39    else: 
     40        env.PrependUnique( LIBS=["expat"] ) 
    4141 
    4242static_env = env.Clone() 
     
    4747# 
    4848apps = { 
    49        "ffado-test" : "test-ffado.cpp", 
    50        "test-fw410" : "test-fw410.cpp", 
    51        #"test-extplugcmd" : "test-extplugcmd.cpp", 
    52        #"test-mixer" : "test-mixer.cpp", 
    53        "test-timestampedbuffer" : "test-timestampedbuffer.cpp", 
    54        "test-ieee1394service" : "test-ieee1394service.cpp", 
    55        "test-streamdump" : "test-streamdump.cpp", 
    56        "test-bufferops" : "test-bufferops.cpp", 
    57        "test-watchdog" : "test-watchdog.cpp", 
    58        "test-messagequeue" : "test-messagequeue.cpp", 
    59        "test-shm" : "test-shm.cpp", 
    60        "test-ipcringbuffer" : "test-ipcringbuffer.cpp", 
    61        "test-devicestringparser" : "test-devicestringparser.cpp", 
    62        "dumpiso_mod" : "dumpiso_mod.cpp", 
    63        "scan-devreg" : "scan-devreg.cpp", 
    64        "test-cycle-time" : "test-cycle-time.c" 
     49        "ffado-test" : "test-ffado.cpp", 
     50        "test-fw410" : "test-fw410.cpp", 
     51        #"test-extplugcmd" : "test-extplugcmd.cpp", 
     52        #"test-mixer" : "test-mixer.cpp", 
     53        "test-timestampedbuffer" : "test-timestampedbuffer.cpp", 
     54        "test-ieee1394service" : "test-ieee1394service.cpp", 
     55        "test-streamdump" : "test-streamdump.cpp", 
     56        "test-bufferops" : "test-bufferops.cpp", 
     57        "test-watchdog" : "test-watchdog.cpp", 
     58        "test-messagequeue" : "test-messagequeue.cpp", 
     59        "test-shm" : "test-shm.cpp", 
     60        "test-ipcringbuffer" : "test-ipcringbuffer.cpp", 
     61        "test-devicestringparser" : "test-devicestringparser.cpp", 
     62        "dumpiso_mod" : "dumpiso_mod.cpp", 
     63        "scan-devreg" : "scan-devreg.cpp", 
     64        "test-cycle-time" : "test-cycle-time.c" 
    6565} 
    6666 
    6767if env['ENABLE_BEBOB']: 
    68        apps.update( { "test-focusrite" : "test-focusrite.cpp" } ) 
     68    apps.update( { "test-focusrite" : "test-focusrite.cpp" } ) 
    6969if env['ENABLE_GENERICAVC']: 
    70        if 'ALSA_FLAGS' in env and env["ALSA_FLAGS"]: 
    71                env.MergeFlags( env["ALSA_FLAGS"].decode() ) 
    72                apps.update( { "test-scs" : "test-scs.cpp" } ) 
    73        apps.update( { "test-volume" : "test-volume.cpp" } ) 
    74        apps.update( { "test-enhanced-mixer" : "test-enhanced-mixer.cpp" } ) 
    75        # MB: utility to unmute M-Audio Ozonic 
    76        apps.update( { "unmute-ozonic" : "unmute-ozonic.cpp" } ) 
    77        apps.update( { "test-avccmd" : "test-avccmd.cpp" } ) 
     70    if 'ALSA_FLAGS' in env and env["ALSA_FLAGS"]: 
     71        env.MergeFlags( env["ALSA_FLAGS"].decode() ) 
     72        apps.update( { "test-scs" : "test-scs.cpp" } ) 
     73    apps.update( { "test-volume" : "test-volume.cpp" } ) 
     74    apps.update( { "test-enhanced-mixer" : "test-enhanced-mixer.cpp" } ) 
     75    # MB: utility to unmute M-Audio Ozonic 
     76    apps.update( { "unmute-ozonic" : "unmute-ozonic.cpp" } ) 
     77    apps.update( { "test-avccmd" : "test-avccmd.cpp" } ) 
    7878if env['ENABLE_FIREWORKS']: 
    79        apps.update( { "test-echomixer" : "test-echomixer.cpp" } ) 
     79    apps.update( { "test-echomixer" : "test-echomixer.cpp" } ) 
    8080if env['ENABLE_DICE']: 
    81        apps.update( { "test-dice-eap" : "test-dice-eap.cpp" } ) 
    82        apps.update( { "set-default-router-config-dice-eap" : "set-default-router-config-dice-eap.cpp" } ) 
     81    apps.update( { "test-dice-eap" : "test-dice-eap.cpp" } ) 
     82    apps.update( { "set-default-router-config-dice-eap" : "set-default-router-config-dice-eap.cpp" } ) 
    8383 
    8484for app in apps.keys(): 
    85        env.Program( target=app, source = env.Split( apps[app] ) ) 
    86        env.Install( "$bindir", app ) 
     85    env.Program( target=app, source = env.Split( apps[app] ) ) 
     86    env.Install( "$bindir", app ) 
    8787 
    8888env.SConscript( dirs=["streaming", "systemtests"], exports="env" ) 
  • trunk/libffado/tests/streaming/SConscript

    r1498 r2764  
    3232 
    3333apps = { 
    34        "ffado-test-streaming" : "teststreaming3.cpp", 
    35        "ffado-test-streaming-ipc" : "teststreaming-ipc.cpp", 
    36        "ffado-test-streaming-ipcclient" : "test-ipcclient.cpp", 
     34        "ffado-test-streaming" : "teststreaming3.cpp", 
     35        "ffado-test-streaming-ipc" : "teststreaming-ipc.cpp", 
     36        "ffado-test-streaming-ipcclient" : "test-ipcclient.cpp", 
    3737} 
    3838 
    3939for app in apps.keys(): 
    40         env.Program( target=app, source = env.Split( apps[app] ) ) 
    41         env.Install( "$bindir", app ) 
    42  
     40    env.Program( target=app, source = env.Split( apps[app] ) ) 
     41    env.Install( "$bindir", app ) 
  • trunk/libffado/tests/systemtests/SConscript

    r2718 r2764  
    3131 
    3232if not env.GetOption( "clean" ): 
    33        env.MergeFlags( env['LIBRAW1394_FLAGS'].decode() ) 
    34        env.MergeFlags( "-lrt -lpthread" ) 
     33    env.MergeFlags( env['LIBRAW1394_FLAGS'].decode() ) 
     34    env.MergeFlags( "-lrt -lpthread" ) 
    3535 
    3636static_env = env.Clone() 
     
    4141# 
    4242apps = { 
    43        "ffado-test-isorecv" : ["test-isorecv-1.cpp", "realtimetools.cpp"], 
    44        "ffado-test-isoxmit" : ["test-isoxmit-1.cpp", "realtimetools.cpp"], 
    45        "test-sysload" : ["test-sysload.cpp", "realtimetools.cpp"], 
    46        "gen-loadpulses" : ["gen-loadpulses.cpp", "realtimetools.cpp"], 
    47        "test-clock_nanosleep" : ["test-clock_nanosleep.cpp", "realtimetools.cpp"], 
     43        "ffado-test-isorecv" : ["test-isorecv-1.cpp", "realtimetools.cpp"], 
     44        "ffado-test-isoxmit" : ["test-isoxmit-1.cpp", "realtimetools.cpp"], 
     45        "test-sysload" : ["test-sysload.cpp", "realtimetools.cpp"], 
     46        "gen-loadpulses" : ["gen-loadpulses.cpp", "realtimetools.cpp"], 
     47        "test-clock_nanosleep" : ["test-clock_nanosleep.cpp", "realtimetools.cpp"], 
    4848} 
    4949 
    5050for app in apps.keys(): 
    51         env.Program( target=app, source = env.Split( apps[app] ) ) 
    52         env.Install( "$bindir", app ) 
    53  
     51    env.Program( target=app, source = env.Split( apps[app] ) ) 
     52    env.Install( "$bindir", app )