- Timestamp:
- Dec 4, 2013 3:01:20 AM (11 years ago)
- Location:
- pjproject/branches/projects/pjsua2/pjsip
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/account.hpp
r4659 r4672 29 29 #include <pjsua2/siptypes.hpp> 30 30 31 /** PJSUA2 API is inside pj namespace */ 32 namespace pj 33 { 34 31 35 /** 32 36 * @defgroup PJSUA2_ACC Account 33 37 * @ingroup PJSUA2_Ref 34 */35 36 /**37 * @defgroup PJSUA2_Acc_Data_Structure Data Structure38 * @ingroup PJSUA2_Ref39 38 * @{ 40 39 */ 41 40 42 /** PJSUA2 API is inside pj namespace */43 namespace pj44 {45 41 using std::string; 46 42 … … 91 87 * See also \a firstRetryIntervalSec setting. 92 88 * 93 * Default: #PJSUA_REG_RETRY_INTERVAL89 * Default: PJSUA_REG_RETRY_INTERVAL 94 90 */ 95 91 unsigned retryIntervalSec; … … 263 259 /** 264 260 * Specify how to offer call hold to remote peer. Please see the 265 * documentation on #pjsua_call_hold_type for more info.261 * documentation on pjsua_call_hold_type for more info. 266 262 * 267 263 * Default: PJSUA_CALL_HOLD_TYPE_DEFAULT … … 280 276 /** 281 277 * Specify the usage of Session Timers for all sessions. See the 282 * #pjsua_sip_timer_use for possible values.278 * pjsua_sip_timer_use for possible values. 283 279 * 284 280 * Default: PJSUA_SIP_TIMER_OPTIONAL … … 677 673 /** 678 674 * Specify whether stream keep-alive and NAT hole punching with 679 * non-codec-VAD mechanism (see @refPJMEDIA_STREAM_ENABLE_KA) is enabled675 * non-codec-VAD mechanism (see PJMEDIA_STREAM_ENABLE_KA) is enabled 680 676 * for this account. 681 677 * … … 689 685 * PJMEDIA_SRTP_MANDATORY. 690 686 * 691 * Default: #PJSUA_DEFAULT_USE_SRTP687 * Default: PJSUA_DEFAULT_USE_SRTP 692 688 */ 693 689 pjmedia_srtp_use srtpUse; … … 702 698 * 2: SRTP requires secure end-to-end transport (SIPS) 703 699 * 704 * Default: #PJSUA_DEFAULT_SRTP_SECURE_SIGNALING700 * Default: PJSUA_DEFAULT_SRTP_SECURE_SIGNALING 705 701 */ 706 702 int srtpSecureSignaling; … … 739 735 * Regardless of this setting, application can detect incoming video 740 736 * by implementing \a on_call_media_state() callback and enumerating 741 * the media stream(s) with #pjsua_call_get_info(). Once incoming737 * the media stream(s) with pjsua_call_get_info(). Once incoming 742 738 * video is recognised, application may retrieve the window associated 743 739 * with the incoming video and show or hide it with 744 * #pjsua_vid_win_set_show().740 * pjsua_vid_win_set_show(). 745 741 * 746 742 * Default: False … … 757 753 * 758 754 * Regardless of the value of this setting, application can start and 759 * stop outgoing video transmission with #pjsua_call_set_vid_strm().755 * stop outgoing video transmission with pjsua_call_set_vid_strm(). 760 756 * 761 757 * Default: False … … 765 761 /** 766 762 * Specify video window's flags. The value is a bitmask combination of 767 * #pjmedia_vid_dev_wnd_flag.763 * pjmedia_vid_dev_wnd_flag. 768 764 * 769 765 * Default: 0 … … 984 980 985 981 public: 982 /** Import from pjsip data */ 986 983 void fromPj(const pjsua_acc_info &pai); 987 984 }; … … 1274 1271 }; 1275 1272 1276 /**1277 * @} // PJSUA2_Acc_Data_Structure1278 */1279 1280 /**1281 * @addtogroup PJSUA2_ACC1282 * @{1283 */1284 1285 1273 1286 1274 /** … … 1315 1303 * reregistration on the account. 1316 1304 * 1317 * @param cfg New account config to be applied to the account. 1318 */ 1319 void modify(const AccountConfig &acc) throw(Error); 1305 * @param cfg New account config to be applied to the 1306 * account. 1307 */ 1308 void modify(const AccountConfig &cfg) throw(Error); 1320 1309 1321 1310 /** … … 1495 1484 * parameter. In this case, the library will automatically send NOTIFY 1496 1485 * request upon returning from this callback. 1497 * 1486 * - it may delay the processing of the request, for example to request 1498 1487 * user permission whether to accept or reject the request. In this 1499 1488 * case, the application MUST set the IncomingSubscribeParam.code … … 1559 1548 }; 1560 1549 1550 /** 1551 * @} // PJSUA2_ACC 1552 */ 1553 1561 1554 } // namespace pj 1562 1555 1563 /**1564 * @} // PJSUA2_ACC1565 */1566 1567 1556 #endif /* __PJSUA2_ACCOUNT_HPP__ */ 1568 1557 -
pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/call.hpp
r4670 r4672 27 27 #include <pjsua2/media.hpp> 28 28 29 /** PJSUA2 API is inside pj namespace */ 30 namespace pj 31 { 32 29 33 /** 30 34 * @defgroup PJSUA2_CALL Call … … 33 37 34 38 /** 35 * @defgroup PJSUA2_Call_Data_Structure Data Structure36 * @ingroup PJSUA2_ Ref39 * @defgroup PJSUA2_Call_Data_Structure Call Related Types 40 * @ingroup PJSUA2_DS 37 41 * @{ 38 42 */ 39 43 40 /** PJSUA2 API is inside pj namespace */41 namespace pj42 {43 44 using std::string; 44 45 using std::vector; … … 308 309 { 309 310 /** 310 * Bitmask of #pjsua_call_flag constants.311 * Bitmask of pjsua_call_flag constants. 311 312 * 312 313 * Default: PJSUA_CALL_INCLUDE_DISABLED_MEDIA … … 316 317 /** 317 318 * This flag controls what methods to request keyframe are allowed on 318 * the call. Value is bitmask of #pjsua_vid_req_keyframe_method.319 * the call. Value is bitmask of pjsua_vid_req_keyframe_method. 319 320 * 320 321 * Default: PJSUA_VID_REQ_KEYFRAME_SIP_INFO | … … 622 623 623 624 /** 624 * This structure contains parameters for onCallState() callback.625 * This structure contains parameters for Call::onCallState() callback. 625 626 */ 626 627 struct OnCallStateParam … … 633 634 634 635 /** 635 * This structure contains parameters for onCallTsxState() callback.636 * This structure contains parameters for Call::onCallTsxState() callback. 636 637 */ 637 638 struct OnCallTsxStateParam … … 644 645 645 646 /** 646 * This structure contains parameters for onCallMediaState() callback.647 * This structure contains parameters for Call::onCallMediaState() callback. 647 648 */ 648 649 struct OnCallMediaStateParam … … 651 652 652 653 /** 653 * This structure contains parameters for onCallSdpCreated() callback.654 * This structure contains parameters for Call::onCallSdpCreated() callback. 654 655 */ 655 656 struct OnCallSdpCreatedParam … … 667 668 668 669 /** 669 * This structure contains parameters for onStreamCreated() callback. 670 * This structure contains parameters for Call::onStreamCreated() 671 * callback. 670 672 */ 671 673 struct OnStreamCreatedParam … … 690 692 691 693 /** 692 * This structure contains parameters for onStreamDestroyed() callback. 694 * This structure contains parameters for Call::onStreamDestroyed() 695 * callback. 693 696 */ 694 697 struct OnStreamDestroyedParam … … 706 709 707 710 /** 708 * This structure contains parameters for onDtmfDigit() callback. 711 * This structure contains parameters for Call::onDtmfDigit() 712 * callback. 709 713 */ 710 714 struct OnDtmfDigitParam … … 717 721 718 722 /** 719 * This structure contains parameters for onCallTransferRequest() callback. 723 * This structure contains parameters for Call::onCallTransferRequest() 724 * callback. 720 725 */ 721 726 struct OnCallTransferRequestParam … … 740 745 741 746 /** 742 * This structure contains parameters for onCallTransferStatus() callback. 747 * This structure contains parameters for Call::onCallTransferStatus() 748 * callback. 743 749 */ 744 750 struct OnCallTransferStatusParam … … 769 775 770 776 /** 771 * This structure contains parameters for onCallReplaceRequest() callback. 777 * This structure contains parameters for Call::onCallReplaceRequest() 778 * callback. 772 779 */ 773 780 struct OnCallReplaceRequestParam … … 797 804 798 805 /** 799 * This structure contains parameters for onCallReplaced() callback.806 * This structure contains parameters for Call::onCallReplaced() callback. 800 807 */ 801 808 struct OnCallReplacedParam … … 808 815 809 816 /** 810 * This structure contains parameters for onCallRxOffer() callback.817 * This structure contains parameters for Call::onCallRxOffer() callback. 811 818 */ 812 819 struct OnCallRxOfferParam … … 831 838 }; 832 839 840 /** 841 * This structure contains parameters for Call::onCallRedirected() callback. 842 */ 833 843 struct OnCallRedirectedParam 834 844 { … … 843 853 * received for the INVITE sent to subsequent targets, or empty 844 854 * (e.type == PJSIP_EVENT_UNKNOWN) 845 * if this callback is called from within #Call::processRedirect()855 * if this callback is called from within Call::processRedirect() 846 856 * context. 847 857 */ … … 850 860 851 861 /** 852 * This structure contains parameters for onCallMediaEvent() callback.862 * This structure contains parameters for Call::onCallMediaEvent() callback. 853 863 */ 854 864 struct OnCallMediaEventParam … … 866 876 867 877 /** 868 * This structure contains parameters for onCallMediaTransportState() callback. 878 * This structure contains parameters for Call::onCallMediaTransportState() 879 * callback. 869 880 */ 870 881 struct OnCallMediaTransportStateParam … … 892 903 893 904 /** 894 * This structure contains parameters for onCreateMediaTransport() callback. 905 * This structure contains parameters for Call::onCreateMediaTransport() 906 * callback. 895 907 */ 896 908 struct OnCreateMediaTransportParam … … 1093 1105 * Get media for the specified media index. 1094 1106 * 1095 * @p saram med_idxMedia index.1107 * @param med_idx Media index. 1096 1108 * 1097 1109 * @return The media or NULL if invalid or inactive. … … 1118 1130 * @return PJSIP_DIALOG_CAP_SUPPORTED if the specified 1119 1131 * capability is explicitly supported, see 1120 * @pjsip_dialog_cap_status for more info.1132 * pjsip_dialog_cap_status for more info. 1121 1133 */ 1122 1134 pjsip_dialog_cap_status remoteHasCap(int htype, … … 1126 1138 /** 1127 1139 * Attach application specific data to the call. Application can then 1128 * inspect this data by calling #Call::getUserData().1140 * inspect this data by calling getUserData(). 1129 1141 * 1130 1142 * @param user_data Arbitrary data to be attached to the call. … … 1134 1146 /** 1135 1147 * Get user data attached to the call, which has been previously set with 1136 * #Call::setUserData().1148 * setUserData(). 1137 1149 * 1138 1150 * @return The user data. … … 1143 1155 * Get the NAT type of remote's endpoint. This is a proprietary feature 1144 1156 * of PJSUA-LIB which sends its NAT type in the SDP when \a natTypeInSdp 1145 * is set in #UaConfig.1157 * is set in UaConfig. 1146 1158 * 1147 1159 * This function can only be called after SDP has been received from remote, … … 1180 1192 * - if no call setting is supplied when SDP has to be sent, i.e: answer 1181 1193 * with status code 183 or 2xx, the default call setting will be used, 1182 * check #CallSetting for its default values.1194 * check CallSetting for its default values. 1183 1195 * 1184 1196 * @param prm.opt Optional call setting. 1185 * @param prm.statusCode 1186 * Status code, (100-699). 1197 * @param prm.statusCode Status code, (100-699). 1187 1198 * @param prm.reason Optional reason phrase. If empty, default text 1188 1199 * will be used. … … 1197 1208 * Hangup call by using method that is appropriate according to the 1198 1209 * call state. This function is different than answering the call with 1199 * 3xx-6xx response (with #Call::answer()), in that this function1210 * 3xx-6xx response (with answer()), in that this function 1200 1211 * will hangup the call regardless of the state and role of the call, 1201 * while #Call::answer() only works with incoming calls on EARLY1212 * while answer() only works with incoming calls on EARLY 1202 1213 * state. 1203 1214 * … … 1395 1406 * 1396 1407 * @param op The video stream operation to be performed, 1397 * possible values are #pjsua_call_vid_strm_op.1408 * possible values are pjsua_call_vid_strm_op. 1398 1409 * @param param The parameters for the video stream operation 1399 * (see #CallVidSetStreamParam).1410 * (see CallVidSetStreamParam). 1400 1411 */ 1401 1412 void vidSetStream(pjsua_call_vid_strm_op op, … … 1447 1458 * Notify application when call state has changed. 1448 1459 * Application may then query the call info to get the 1449 * detail call states by calling Call::getInfo() function.1460 * detail call states by calling getInfo() function. 1450 1461 * 1451 1462 * @param prm Callback parameter. … … 1639 1650 * no decision can be made immediately (for example 1640 1651 * to request confirmation from user). Application 1641 * then MUST call #Call::processRedirect()1652 * then MUST call processRedirect() 1642 1653 * to either accept or reject the redirection upon 1643 1654 * getting user decision. … … 1693 1704 }; 1694 1705 1706 /** 1707 * @} // PJSUA2_CALL 1708 */ 1709 1695 1710 } // namespace pj 1696 1711 1697 /**1698 * @} // PJSUA2_CALL1699 */1700 1701 1712 #endif /* __PJSUA2_CALL_HPP__ */ 1702 1713 -
pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/config.hpp
r4644 r4672 21 21 22 22 /** 23 * @file pjsua2/ ua.hpp23 * @file pjsua2/config.hpp 24 24 * @brief PJSUA2 Base Agent Operation 25 25 */ … … 28 28 /** 29 29 * @defgroup PJSUA2_CFG_Compile Compile time settings 30 * @ingroup PJSUA2_ Ref30 * @ingroup PJSUA2_DS 31 31 * @{ 32 32 */ -
pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/doxygen.hpp
r4597 r4672 26 26 27 27 /** 28 * @defgroup PJSUA2 PJSUA2: High Level Object Oriented PJSUA API 29 * @{ 30 * The PJSUA2 API is a new, high-level, object-oriented API that is built 31 * on top of PJSUA-LIB API. The PJSUA2 API is implemented with C++ and 32 * can be used from other high level languages such as Java and Python. 33 * Thanks to <A HREF="http://www.swig.org">SWIG</A>, the API can potentially 34 * be used in other high level or scripting languages where SWIG binding is 35 * available, such as C#, Perl, PHP, Ruby, and Tcl. 36 * 37 * This page mostly contains the reference documentation of the API. For 38 * more guide on the API, please see the PJSUA2 wiki page: 39 * http://trac.pjsip.org/repos/wiki/pjsua2_API 40 * @} 28 @mainpage pjsua2 API 29 30 This documentation contains the API Reference for pjsua2. Please 31 go to <b>Modules</b> section above for navigation. 32 33 For more info regarding pjsua2, including some tutorials, please 34 see The PJSIP Book. 35 */ 36 37 38 /** 39 * @defgroup PJSUA2_Ref pjsua2 API Reference 41 40 */ 42 41 43 42 /** 44 * @defgroup PJSUA2_ Ref API Reference45 * @ingroup PJSUA2 43 * @defgroup PJSUA2_DS Data Structure 44 * @ingroup PJSUA2_Ref 46 45 */ 47 48 46 49 47 -
pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/endpoint.hpp
r4670 r4672 21 21 22 22 /** 23 * @file pjsua2/ ua.hpp23 * @file pjsua2/endpoint.hpp 24 24 * @brief PJSUA2 Base Agent Operation 25 25 */ … … 33 33 34 34 /** 35 * @defgroup PJSUA2_UA Base Endpoint Operations35 * @defgroup PJSUA2_UA Endpoint 36 36 * @ingroup PJSUA2_Ref 37 37 * @{ … … 163 163 164 164 ////////////////////////////////////////////////////////////////////////////// 165 165 /** 166 * SIP User Agent related settings. 167 */ 166 168 struct UaConfig : public PersistentObject 167 169 { … … 213 215 * 214 216 * When nameserver is not configured, entries will be resolved with 215 * #pj_gethostbyname() if it's not an IP address. Port number may be217 * pj_gethostbyname() if it's not an IP address. Port number may be 216 218 * specified if the server is not listening in standard STUN port. 217 219 */ … … 343 345 344 346 /** 345 * Additional flags to be given to #pj_file_open() when opening347 * Additional flags to be given to pj_file_open() when opening 346 348 * the log file. By default, the flag is PJ_O_WRONLY. Application 347 349 * may set PJ_O_APPEND here so that logs are appended to existing … … 499 501 500 502 /** 501 * Echo canceller options (see #pjmedia_echo_create())503 * Echo canceller options (see pjmedia_echo_create()) 502 504 * 503 505 * Default: 0. … … 791 793 /** 792 794 * Schedule a timer with the specified interval and user data. When the 793 * interval elapsed, Endpoint::onTimer() callback will be795 * interval elapsed, onTimer() callback will be 794 796 * called. Note that the callback may be executed by different thread, 795 797 * depending on whether worker thread is enabled or not. … … 811 813 * previous utilTimerSchedule() call. 812 814 */ 813 void utilTimerCancel(Token prmT imerToken);815 void utilTimerCancel(Token prmToken); 814 816 815 817 /** … … 824 826 * This is a utility function to detect NAT type in front of this endpoint. 825 827 * Once invoked successfully, this function will complete asynchronously 826 * and report the result in Endpoint::onNatDetectionComplete().828 * and report the result in onNatDetectionComplete(). 827 829 * 828 830 * After NAT has been detected and the callback is called, application can 829 * get the detected NAT type by calling #natGetType(). Application830 * can also perform NAT detection by calling #natDetectType()831 * get the detected NAT type by calling natGetType(). Application 832 * can also perform NAT detection by calling natDetectType() 831 833 * again at later time. 832 834 * … … 836 838 837 839 /** 838 * Get the NAT type as detected by #natDetectType() function. This839 * function will only return useful NAT type after #natDetectType()840 * has completed successfully and Endpoint::onNatDetectionComplete()840 * Get the NAT type as detected by natDetectType() function. This 841 * function will only return useful NAT type after natDetectType() 842 * has completed successfully and onNatDetectionComplete() 841 843 * callback has been called. 842 844 * … … 848 850 /** 849 851 * Auxiliary function to resolve and contact each of the STUN server 850 * entries (sequentially) to find which is usable. The #pjsua_init() must852 * entries (sequentially) to find which is usable. The libInit() must 851 853 * have been called before calling this function. 852 854 * … … 966 968 * @param media media to be added. 967 969 */ 968 void addMedia(AudioMedia &media);970 void mediaAdd(AudioMedia &media); 969 971 970 972 /** … … 973 975 * @param media media to be removed. 974 976 */ 975 void removeMedia(AudioMedia &media);977 void mediaRemove(AudioMedia &media); 976 978 977 979 /** … … 1005 1007 const AudioMediaVector &mediaEnumPorts() const throw(Error); 1006 1008 1009 /** 1010 * Get the instance of Audio Device Manager. 1011 * 1012 * @return The Audio Device Manager. 1013 */ 1007 1014 AudDevManager &audDevManager(); 1008 1015 … … 1060 1067 /** 1061 1068 * Callback when the Endpoint has finished performing NAT type 1062 * detection that is initiated with Endpoint::natDetectType().1069 * detection that is initiated with natDetectType(). 1063 1070 * 1064 1071 * @param prm Callback parameters containing the detection … … 1071 1078 /** 1072 1079 * Callback when the Endpoint has finished performing STUN server 1073 * checking that is initiated with Endpoint::natCheckStunServers().1080 * checking that is initiated with natCheckStunServers(). 1074 1081 * 1075 1082 * @param prm Callback parameters. … … 1090 1097 /** 1091 1098 * Callback when a timer has fired. The timer was scheduled by 1092 * Endpoint::utilTimerSchedule().1099 * utilTimerSchedule(). 1093 1100 * 1094 1101 * @param prm Callback parameters. -
pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/json.hpp
r4644 r4672 29 29 #include <string> 30 30 31 /** PJSUA2 API is inside pj namespace */ 32 namespace pj 33 { 34 31 35 /** 32 36 * @defgroup PJSUA2_JSON JSON Persistent Support … … 36 40 */ 37 41 38 /** PJSUA2 API is inside pj namespace */39 namespace pj40 {41 42 using std::string; 42 43 43 44 /** 45 * Persistent document (file) with JSON format. 46 */ 44 47 class JsonDocument : public PersistentDocument 45 48 { … … 104 107 105 108 106 } // namespace pj107 108 109 /** 109 110 * @} PJSUA2 110 111 */ 111 112 113 } // namespace pj 112 114 113 115 -
pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/media.hpp
r4669 r4672 28 28 #include <pjsua2/types.hpp> 29 29 30 /** PJSUA2 API is inside pj namespace */ 31 namespace pj 32 { 33 30 34 /** 31 35 * @defgroup PJSUA2_MED Media … … 34 38 */ 35 39 36 /** PJSUA2 API is inside pj namespace */37 namespace pj38 {39 40 using std::string; 40 41 using std::vector; … … 488 489 * function at any time to replace current sound device. 489 490 * 490 * @param capture 491 * @param capture_dev Device ID of the capture device. 491 492 */ 492 493 void setCaptureDev(int capture_dev) const throw(Error); … … 1093 1094 typedef void *CodecParam; 1094 1095 1096 1097 /** 1098 * @} // PJSUA2_MED 1099 */ 1100 1095 1101 } // namespace pj 1096 1102 1097 /**1098 * @} // PJSUA2_MED1099 */1100 1101 1103 #endif /* __PJSUA2_MEDIA_HPP__ */ -
pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/persistent.hpp
r4657 r4672 28 28 #include <string> 29 29 #include <vector> 30 31 /** PJSUA2 API is inside pj namespace */ 32 namespace pj 33 { 30 34 31 35 /** … … 41 45 */ 42 46 43 /** PJSUA2 API is inside pj namespace */44 namespace pj45 {46 47 using std::string; 47 48 using std::vector; … … 262 263 * 263 264 * @param name The name for the value in the container. 264 * @param valueThe value to be written.265 * @param num The value to be written. 265 266 */ 266 267 void writeNumber(const string &name, … … 271 272 * 272 273 * @param name The name for the value in the container. 273 * @param valueThe value to be written.274 * @param num The value to be written. 274 275 */ 275 276 void writeInt(const string &name, … … 298 299 * 299 300 * @param name The name for the value in the container. 300 * @param arr ayThe vector to be written.301 * @param arr The vector to be written. 301 302 */ 302 303 void writeStringVector(const string &name, 303 const StringVector & value)304 const StringVector &arr) 304 305 throw(Error); 305 306 … … 348 349 struct container_node_internal_data 349 350 { 350 void *doc; 351 void *data1; 352 void *data2; 351 void *doc; /**< The document. */ 352 void *data1; /**< Internal data 1 */ 353 void *data2; /**< Internal data 2 */ 353 354 }; 354 355 … … 524 525 * 525 526 * @param name The name for the value in the container. 526 * @param valueThe value to be written.527 * @param num The value to be written. 527 528 */ 528 529 void writeNumber(const string &name, … … 533 534 * 534 535 * @param name The name for the value in the container. 535 * @param valueThe value to be written.536 * @param num The value to be written. 536 537 */ 537 538 void writeInt(const string &name, … … 560 561 * 561 562 * @param name The name for the value in the container. 562 * @param arr ayThe vector to be written.563 * @param arr The vector to be written. 563 564 */ 564 565 void writeStringVector(const string &name, 565 const StringVector & value)566 const StringVector &arr) 566 567 throw(Error); 567 568 … … 598 599 public: 599 600 /* internal data */ 600 container_node_op *op; 601 container_node_internal_data data; 601 container_node_op *op; /**< Method table. */ 602 container_node_internal_data data; /**< Internal data */ 602 603 }; 603 604 … … 607 608 * implementation notes for more info. 608 609 */ 610 //! @cond Doxygen_Suppress 609 611 struct container_node_op 610 612 { … … 652 654 const string &name) 653 655 throw(Error); 654 655 656 }; 656 657 657 658 658 /* … … 677 677 #define NODE_WRITE_OBJ(node,item) node.writeObject(item) 678 678 679 //! @endcond 680 681 /** 682 * @} PJSUA2 683 */ 679 684 680 685 } // namespace pj 681 686 682 /**683 * @} PJSUA2684 */685 686 687 687 688 -
pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/presence.hpp
r4657 r4672 27 27 #include <pjsua2/siptypes.hpp> 28 28 29 /** PJSUA2 API is inside pj namespace */ 30 namespace pj 31 { 32 29 33 /** 30 34 * @defgroup PJSUA2_PRES Presence … … 33 37 */ 34 38 35 /** PJSUA2 API is inside pj namespace */36 namespace pj37 {38 39 using std::string; 39 40 using std::vector; … … 170 171 171 172 public: 173 /** Import from pjsip structure */ 172 174 void fromPj(const pjsua_buddy_info &pbi); 173 175 }; … … 286 288 287 289 290 /** 291 * @} // PJSUA2_PRES 292 */ 293 288 294 } // namespace pj 289 295 290 /**291 * @} // PJSUA2_PRES292 */293 294 296 #endif /* __PJSUA2_PRESENCE_HPP__ */ -
pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/siptypes.hpp
r4663 r4672 30 30 #include <vector> 31 31 32 /**33 * @defgroup PJSUA2_TYPES Data structure34 * @ingroup PJSUA2_Ref35 * @{36 */37 38 32 /** PJSUA2 API is inside pj namespace */ 39 33 namespace pj … … 41 35 42 36 /** 37 * @defgroup PJSUA2_SIP_Types SIP Types 38 * @ingroup PJSUA2_DS 39 * @{ 40 */ 41 42 /** 43 43 * Credential information. Credential contains information to authenticate 44 44 * against a service. … … 75 75 /* 76 76 * Digest AKA credential information. Note that when AKA credential 77 * is being used, the \a data field of this #pjsip_cred_info is77 * is being used, the \a data field of this pjsip_cred_info is 78 78 * not used, but it still must be initialized to an empty string. 79 * Please see \refPJSIP_AUTH_AKA_API for more information.79 * Please see PJSIP_AUTH_AKA_API for more information. 80 80 */ 81 81 … … 146 146 147 147 /** 148 * TLS protocol method from #pjsip_ssl_method.148 * TLS protocol method from pjsip_ssl_method. 149 149 * 150 150 * Default is PJSIP_SSL_UNSPECIFIED_METHOD (0), which in turn will … … 166 166 * verification result: 167 167 * - If \a verifyServer is disabled, TLS transport will just notify 168 * the application via #pjsip_tp_state_callback with state168 * the application via pjsip_tp_state_callback with state 169 169 * PJSIP_TP_STATE_CONNECTED regardless TLS verification result. 170 170 * - If \a verifyServer is enabled, TLS transport will be shutdown … … 173 173 * error, otherwise PJSIP_TP_STATE_CONNECTED will be notified. 174 174 * 175 * In any cases, application can inspect #pjsip_tls_state_info in the175 * In any cases, application can inspect pjsip_tls_state_info in the 176 176 * callback to see the verification detail. 177 177 * … … 184 184 * verification result: 185 185 * - If \a verifyClient is disabled, TLS transport will just notify 186 * the application via #pjsip_tp_state_callback with state186 * the application via pjsip_tp_state_callback with state 187 187 * PJSIP_TP_STATE_CONNECTED regardless TLS verification result. 188 188 * - If \a verifyClient is enabled, TLS transport will be shutdown … … 191 191 * error, otherwise PJSIP_TP_STATE_CONNECTED will be notified. 192 192 * 193 * In any cases, application can inspect #pjsip_tls_state_info in the193 * In any cases, application can inspect pjsip_tls_state_info in the 194 194 * callback to see the verification detail. 195 195 * … … 382 382 string info; 383 383 384 /** Transport flags (see #pjsip_transport_flags_e). */384 /** Transport flags (see pjsip_transport_flags_e). */ 385 385 unsigned flags; 386 386 … … 860 860 /* Utilities */ 861 861 #ifndef SWIG 862 //! @cond Doxygen_Suppress 862 863 void readIntVector( ContainerNode &node, 863 864 const string &array_name, … … 876 877 const string &array_name, 877 878 const SipHeaderVector &headers) throw(Error); 879 //! @endcond 878 880 #endif // SWIG 879 881 882 /** 883 * @} PJSUA2 884 */ 885 880 886 } // namespace pj 881 887 882 /**883 * @} PJSUA2884 */885 886 888 887 889 -
pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/types.hpp
r4670 r4672 34 34 #include <vector> 35 35 36 /**37 * @defgroup PJSUA2_TYPES Data structure38 * @ingroup PJSUA2_Ref39 * @{40 */41 42 36 /** PJSUA2 API is inside pj namespace */ 43 37 namespace pj 44 38 { 39 40 /** 41 * @defgroup PJSUA2_TYPES General Data Structure 42 * @ingroup PJSUA2_DS 43 * @{ 44 */ 45 45 46 using std::string; 46 47 using std::vector; … … 165 166 166 167 #else 168 /** Raise Error exception */ 167 169 # define PJSUA2_RAISE_ERROR(status) \ 168 170 PJSUA2_RAISE_ERROR2(status, string()) 169 171 172 /** Raise Error exception */ 170 173 # define PJSUA2_RAISE_ERROR2(status,op) \ 171 174 PJSUA2_RAISE_ERROR3(status, op, string()) 172 175 176 /** Raise Error exception */ 173 177 # define PJSUA2_RAISE_ERROR3(status,op,txt) \ 174 178 do { \ … … 180 184 #endif 181 185 186 /** Raise Error exception if the expression fails */ 182 187 #define PJSUA2_CHECK_RAISE_ERROR2(status, op) \ 183 188 do { \ … … 187 192 } while (0) 188 193 194 /** Raise Error exception if the status fails */ 189 195 #define PJSUA2_CHECK_RAISE_ERROR(status) \ 190 196 PJSUA2_CHECK_RAISE_ERROR2(status, "") 191 197 198 /** Raise Error exception if the expression fails */ 192 199 #define PJSUA2_CHECK_EXPR(expr) \ 193 200 do { \ … … 197 204 198 205 ////////////////////////////////////////////////////////////////////////////// 199 206 /** 207 * Version information. 208 */ 200 209 struct Version 201 210 { … … 247 256 }; 248 257 258 /** 259 * @} PJSUA2 260 */ 261 249 262 } // namespace pj 250 263 251 /**252 * @} PJSUA2253 */254 255 264 256 265 -
pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/call.cpp
r4670 r4672 685 685 if (pj_ci.media[mi].stream.aud.conf_slot != PJSUA_INVALID_ID) 686 686 { 687 Endpoint::instance(). addMedia((AudioMedia &)*aud_med);687 Endpoint::instance().mediaAdd((AudioMedia &)*aud_med); 688 688 } else { 689 Endpoint::instance(). removeMedia((AudioMedia &)*aud_med);689 Endpoint::instance().mediaRemove((AudioMedia &)*aud_med); 690 690 } 691 691 } -
pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/endpoint.cpp
r4670 r4672 1367 1367 } 1368 1368 1369 void Endpoint:: addMedia(AudioMedia &media)1369 void Endpoint::mediaAdd(AudioMedia &media) 1370 1370 { 1371 1371 if (mediaExists(media)) … … 1375 1375 } 1376 1376 1377 void Endpoint:: removeMedia(AudioMedia &media)1377 void Endpoint::mediaRemove(AudioMedia &media) 1378 1378 { 1379 1379 AudioMediaVector::iterator it = std::find(mediaList.begin(), -
pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/media.cpp
r4670 r4672 146 146 } 147 147 148 Endpoint::instance(). addMedia(*this);148 Endpoint::instance().mediaAdd(*this); 149 149 } 150 150 … … 162 162 id = PJSUA_INVALID_ID; 163 163 164 Endpoint::instance(). removeMedia(*this);164 Endpoint::instance().mediaRemove(*this); 165 165 } 166 166
Note: See TracChangeset
for help on using the changeset viewer.