Changeset 5515


Ignore:
Timestamp:
Dec 28, 2016 9:27:40 AM (2 years ago)
Author:
nanang
Message:

Re #1900: Miscelaneous updates, e.g: enable/disable WMME/WASAPI automatically based on active platform, cosmetics.

Location:
pjproject/branches/projects/uwp
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/projects/uwp/pjlib/src/pj/os_info.c

    r5210 r5515  
    231231            si.machine = pj_str("shx"); 
    232232            break; 
    233     #else 
     233        #else 
    234234        case PROCESSOR_ARCHITECTURE_AMD64: 
    235235            si.machine = pj_str("x86_64"); 
     
    241241            si.machine = pj_str("i386"); 
    242242            break; 
    243     #endif      /* PJ_WIN32_WINCE */ 
     243        #endif  /* PJ_WIN32_WINCE */ 
    244244        } 
    245245    #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 
  • pjproject/branches/projects/uwp/pjmedia/include/pjmedia-audiodev/config.h

    r5513 r5515  
    114114 
    115115 
    116 /** 
    117  * This setting controls whether WMME support should be included. 
    118  */ 
     116 /** 
     117  * This setting controls whether WMME support should be included. 
     118  */ 
    119119#ifndef PJMEDIA_AUDIO_DEV_HAS_WMME 
    120 #   define PJMEDIA_AUDIO_DEV_HAS_WMME           1 
    121 #endif 
    122  
    123   
    124 /** 
     120#  ifdef PJ_WIN32_UWP 
     121#    define PJMEDIA_AUDIO_DEV_HAS_WMME          0 
     122#  else 
     123#    define PJMEDIA_AUDIO_DEV_HAS_WMME          1 
     124#  endif 
     125#endif 
     126 
     127 
     128 /** 
     129  * This setting controls whether Windows Audio Session API (WASAPI) 
     130  * support should be included. 
     131  */ 
     132#ifndef PJMEDIA_AUDIO_DEV_HAS_WASAPI 
     133#  ifdef PJ_WIN32_UWP 
     134#    define PJMEDIA_AUDIO_DEV_HAS_WASAPI        1 
     135#  else 
     136#    define PJMEDIA_AUDIO_DEV_HAS_WASAPI        0 
     137#  endif 
     138#endif 
     139 
     140 
     141 /** 
    125142 * This setting controls whether BDIMAD support should be included. 
    126143 */ 
  • pjproject/branches/projects/uwp/pjmedia/include/pjmedia-audiodev/errno.h

    r5210 r5515  
    193193#define PJMEDIA_EAUD_BADLATENCY (PJMEDIA_AUDIODEV_ERRNO_START+12) /* 4200012 */ 
    194194 
    195  /************************************************************ 
    196  * General audio device error code 
    197  ***********************************************************/ 
    198195 /** 
    199  * @hideinitializer 
    200  * General wasapi error 
    201  */ 
     196  * @hideinitializer 
     197  * General WASAPI error 
     198  */ 
    202199#define PJMEDIA_EAUD_WASAPI_ERROR \ 
    203200                                (PJMEDIA_AUDIODEV_ERRNO_START+13) /* 4200013 */ 
Note: See TracChangeset for help on using the changeset viewer.