Changeset 5515

Timestamp:

Dec 28, 2016 9:27:40 AM (8 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:

• pjlib/src/pj/os_info.c (modified) (2 diffs)
• pjmedia/include/pjmedia-audiodev/config.h (modified) (1 diff)
• pjmedia/include/pjmedia-audiodev/errno.h (modified) (1 diff)

pjproject/branches/projects/uwp/pjlib/src/pj/os_info.c

@@ -231 +231 @@
             si.machine = pj_str("shx");
             break;
-    #else
+        #else
         case PROCESSOR_ARCHITECTURE_AMD64:
             si.machine = pj_str("x86_64");
@@ -241 +241 @@
             si.machine = pj_str("i386");
             break;
-    #endif      /* PJ_WIN32_WINCE */
+        #endif  /* PJ_WIN32_WINCE */
         }
     #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8

pjproject/branches/projects/uwp/pjmedia/include/pjmedia-audiodev/config.h

@@ -114 +114 @@
 
 
-/**
- * This setting controls whether WMME support should be included.
- */
+ /**
+  * This setting controls whether WMME support should be included.
+  */
 #ifndef PJMEDIA_AUDIO_DEV_HAS_WMME
-#   define PJMEDIA_AUDIO_DEV_HAS_WMME           1
-#endif
-
- 
-/**
+#  ifdef PJ_WIN32_UWP
+#    define PJMEDIA_AUDIO_DEV_HAS_WMME          0
+#  else
+#    define PJMEDIA_AUDIO_DEV_HAS_WMME          1
+#  endif
+#endif
+
+
+ /**
+  * This setting controls whether Windows Audio Session API (WASAPI)
+  * support should be included.
+  */
+#ifndef PJMEDIA_AUDIO_DEV_HAS_WASAPI
+#  ifdef PJ_WIN32_UWP
+#    define PJMEDIA_AUDIO_DEV_HAS_WASAPI        1
+#  else
+#    define PJMEDIA_AUDIO_DEV_HAS_WASAPI        0
+#  endif
+#endif
+
+
+ /**
  * This setting controls whether BDIMAD support should be included.
  */

pjproject/branches/projects/uwp/pjmedia/include/pjmedia-audiodev/errno.h

@@ -193 +193 @@
 #define PJMEDIA_EAUD_BADLATENCY (PJMEDIA_AUDIODEV_ERRNO_START+12) /* 4200012 */
 
- /************************************************************
- * General audio device error code
- ***********************************************************/
  /**
- * @hideinitializer
- * General wasapi error
- */
+  * @hideinitializer
+  * General WASAPI error
+  */
 #define PJMEDIA_EAUD_WASAPI_ERROR \
                                 (PJMEDIA_AUDIODEV_ERRNO_START+13) /* 4200013 */