Changeset 5539 for pjproject/trunk/pjmedia/src/pjmedia-audiodev/audiodev.c

Timestamp:

Jan 23, 2017 4:32:34 AM (8 years ago)

Author:

nanang

Message:

Re #1900: Reintegrated works in UWP branch to trunk.

Location:

pjproject/trunk

Files:

• . (modified) (2 props)
• pjmedia/src/pjmedia-audiodev/audiodev.c (modified) (5 diffs)

pjproject/trunk/pjmedia/src/pjmedia-audiodev/audiodev.c

@@ -1 +1 @@
 /* $Id$ */
-/* 
+/*
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -16 +16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <pjmedia-audiodev/audiodev_imp.h>
@@ -67 +67 @@
 #if PJMEDIA_AUDIO_DEV_HAS_SYMB_MDA
 pjmedia_aud_dev_factory* pjmedia_symb_mda_factory(pj_pool_factory *pf);
+#endif
+
+#if PJMEDIA_AUDIO_DEV_HAS_WASAPI
+pjmedia_aud_dev_factory* pjmedia_wasapi_factory(pj_pool_factory *pf);
 #endif
 
@@ -89 +93 @@
 
     /* Register error subsystem */
-    status = pj_register_strerror(PJMEDIA_AUDIODEV_ERRNO_START, 
-                                  PJ_ERRNO_SPACE_SIZE, 
+    status = pj_register_strerror(PJMEDIA_AUDIODEV_ERRNO_START,
+                                  PJ_ERRNO_SPACE_SIZE,
                                   &pjmedia_audiodev_strerror);
     pj_assert(status == PJ_SUCCESS);
@@ -132 +136 @@
 #if PJMEDIA_AUDIO_DEV_HAS_SYMB_MDA
     aud_subsys->drv[aud_subsys->drv_cnt++].create = &pjmedia_symb_mda_factory;
+#endif
+#if PJMEDIA_AUDIO_DEV_HAS_WASAPI
+    aud_subsys->drv[aud_subsys->drv_cnt++].create = &pjmedia_wasapi_factory;
 #endif
 #if PJMEDIA_AUDIO_DEV_HAS_NULL_AUDIO