- Timestamp:
- Jan 23, 2017 4:32:34 AM (7 years ago)
- Location:
- pjproject/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk
- Property svn:mergeinfo changed
/pjproject/branches/projects/uwp (added) merged: 5208,5210-5211,5254,5256,5298,5439,5470,5497,5511-5515,5526,5528-5529,5532,5538 -
Property
svn:global-ignores
set to
bin
obj
lib
Bin
output
Debug
Generated[^A-Ba-b0-9]Files
Service[^A-Ba-b0-9]References
*.opendb
*.db
*.user
- Property svn:mergeinfo changed
-
pjproject/trunk/pjmedia/include/pjmedia-audiodev/config.h
r5268 r5539 114 114 115 115 116 /**117 * This setting controls whether WMME support should be included.118 */116 /** 117 * This setting controls whether WMME support should be included. 118 */ 119 119 #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 /** 125 142 * This setting controls whether BDIMAD support should be included. 126 143 */
Note: See TracChangeset
for help on using the changeset viewer.