Changeset 169:14a46c3d94cc

Show
Ignore:
Timestamp:
07/13/07 17:17:26 (1 year ago)
Author:
vadim@jumbol
Message:

implement nonblocking mode for oss

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • SConstruct

    r148 r169  
    1818        BoolOption('portaudio_oss', "Build PortAudio/OSS",  False), 
    1919        BoolOption('portaudio_dsound', "Build PortAudio/DirectSound support",  False), 
     20        BoolOption('oss_nonblock', "Use NON BLOCKING mode with OSS dirvers",  True), 
    2021        BoolOption('speex', "Build speex codec",  False), 
    2122        BoolOption('speexwb_replaces_amrwb', "if set replace negotiated AMR-WB payload by SPEEX WB", False), 

  • libs/webcam/SConscript

    r119 r169  
    8282 
    8383 
    84 env.Append(CPPPATH = include_path, CPPDEFINES = defines) 
     84env.Append(CPPPATH = include_path, CPPDEFINES = defines.items()) 
    8585BJ.Use(env, libs)  
    8686 

  • miniua/SConscript

    r110 r169  
    7373 
    7474 
    75 env.Append(CCFLAGS = cc_flags, LINKFLAGS = link_flags, CPPDEFINES = defines, CPPPATH = includes) 
     75env.Append(CCFLAGS = cc_flags, LINKFLAGS = link_flags, CPPDEFINES = defines.items(), CPPPATH = includes) 
    7676print 'CCFLAGS', env['CCFLAGS'] 
    7777 

  • phapi/SConscript

    r149 r169  
    154154    defines['PH_FORCE_16KHZ'] = 1 
    155155 
     156if env['oss_nonblock']: 
     157    defines['PH_OSS_NONBLOCK'] = 1 
     158 
    156159 
    157160 

  • phapi/phmedia-oss.c

    r0 r169  
    171171       
    172172 
    173  
     173#ifndef PH_OSS_NONBLOCK 
    174174  fcntl(fd, F_SETFL, fcntl(fd, F_GETFL)&~O_NONBLOCK); 
     175#endif 
    175176 
    176177