Ignore:
Timestamp:
May 17, 2010 12:51:06 PM (10 years ago)
Author:
ming
Message:

Merge #1051 into the main trunk.

Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk

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

    r2506 r3174  
    7676#if defined(PJ_HAS_ERROR_STRING) && (PJ_HAS_ERROR_STRING != 0) 
    7777 
     78 
     79    /* See if the error comes from Core Audio. */ 
     80#if PJMEDIA_AUDIO_DEV_HAS_COREAUDIO 
     81    if (statcode >= PJMEDIA_AUDIODEV_COREAUDIO_ERRNO_START && 
     82        statcode <= PJMEDIA_AUDIODEV_COREAUDIO_ERRNO_END) 
     83    { 
     84        int ca_err = PJMEDIA_AUDIODEV_COREAUDIO_ERRNO_START - statcode; 
     85 
     86        PJ_UNUSED_ARG(ca_err); 
     87        // TODO: create more helpful error messages 
     88        errstr.ptr = buf; 
     89        pj_strcpy2(&errstr, "Core audio error"); 
     90        return errstr; 
     91    } else 
     92#endif 
     93 
    7894    /* See if the error comes from PortAudio. */ 
    7995#if PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO 
Note: See TracChangeset for help on using the changeset viewer.