Ignore:
Timestamp:
Jan 16, 2014 5:30:46 AM (9 years ago)
Author:
ming
Message:

Closed #1723: Merging pjsua2 branch into trunk

Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk

  • pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

    r4667 r4704  
    252252 
    253253/** Constant to identify invalid ID for all sorts of IDs. */ 
    254 #define PJSUA_INVALID_ID            (-1) 
     254enum pjsua_invalid_id_const_ 
     255{ 
     256    PJSUA_INVALID_ID = -1 
     257}; 
    255258 
    256259/** Disabled features temporarily for media reorganization */ 
     
    18811884 
    18821885/** 
     1886 * Register a thread to poll for events. This function should be 
     1887 * called by an external worker thread, and it will block polling 
     1888 * for events until the library is destroyed. 
     1889 * 
     1890 * @return              PJ_SUCCESS if things are working correctly 
     1891 *                      or an error polling cannot be done for some 
     1892 *                      reason. 
     1893 */ 
     1894PJ_DECL(pj_status_t) pjsua_register_worker_thread(const char *name); 
     1895 
     1896 
     1897/** 
     1898 * Signal all worker threads to quit. This will only wait until internal 
     1899 * threads are done. For external threads, application must perform 
     1900 * its own waiting for the external threads to quit from 
     1901 * pjsua_register_worker_thread() function. 
     1902 */ 
     1903PJ_DECL(void) pjsua_stop_worker_threads(void); 
     1904 
     1905/** 
    18831906 * Create memory pool to be used by the application. Once application 
    18841907 * finished using the pool, it must be released with pj_pool_release(). 
     
    57785801    pj_str_t            name; 
    57795802 
     5803    /** Format. */ 
     5804    pjmedia_format      format; 
     5805 
    57805806    /** Clock rate. */ 
    57815807    unsigned            clock_rate; 
     
    57895815    /** Bits per sample */ 
    57905816    unsigned            bits_per_sample; 
     5817 
     5818    /** Tx level adjustment. */ 
     5819    float               tx_level_adj; 
     5820 
     5821    /** Rx level adjustment. */ 
     5822    float               rx_level_adj; 
    57915823 
    57925824    /** Number of listeners in the array. */ 
Note: See TracChangeset for help on using the changeset viewer.