Ignore:
Timestamp:
Dec 28, 2016 5:20:16 AM (3 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:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/projects/uwp

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • pjproject/branches/projects/uwp/pjmedia/src/pjmedia-audiodev/audiodev.c

    r5513 r5514  
    11/* $Id$ */ 
    2 /*  
     2/* 
    33 * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com) 
    44 * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> 
     
    1616 * You should have received a copy of the GNU General Public License 
    1717 * along with this program; if not, write to the Free Software 
    18  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  
     18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
    1919 */ 
    2020#include <pjmedia-audiodev/audiodev_imp.h> 
     
    9393 
    9494    /* Register error subsystem */ 
    95     status = pj_register_strerror(PJMEDIA_AUDIODEV_ERRNO_START,  
    96                                   PJ_ERRNO_SPACE_SIZE,  
     95    status = pj_register_strerror(PJMEDIA_AUDIODEV_ERRNO_START, 
     96                                  PJ_ERRNO_SPACE_SIZE, 
    9797                                  &pjmedia_audiodev_strerror); 
    9898    pj_assert(status == PJ_SUCCESS); 
     
    138138#endif 
    139139#if PJMEDIA_AUDIO_DEV_HAS_WASAPI 
    140     aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_wasapi_factory; 
     140    aud_subsys->drv[aud_subsys->drv_cnt++].create = &pjmedia_wasapi_factory; 
    141141#endif 
    142142#if PJMEDIA_AUDIO_DEV_HAS_NULL_AUDIO 
Note: See TracChangeset for help on using the changeset viewer.