Changeset 5514 for pjproject/branches/projects/uwp/pjmedia/src/pjmedia-audiodev/audiodev.c

Timestamp:

Dec 28, 2016 5:20:16 AM (8 years ago)

Author:

riza

Message:

Re #1900: Fix merge conflict for solution file and project files. And fix some compile error found for UWP.

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjmedia/src/pjmedia-audiodev/audiodev.c (modified) (4 diffs)

pjproject/branches/projects/uwp/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>
@@ -93 +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);
@@ -138 +138 @@
 #endif
 #if PJMEDIA_AUDIO_DEV_HAS_WASAPI
-    aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_wasapi_factory;
+    aud_subsys->drv[aud_subsys->drv_cnt++].create = &pjmedia_wasapi_factory;
 #endif
 #if PJMEDIA_AUDIO_DEV_HAS_NULL_AUDIO