wrapper generator in progress

COPYING

@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
+		    
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
+
 	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest

coreapi/address.c

@@ -171,13 +171,15 @@ void linphone_address_destroy(LinphoneAddress *u){
 	sal_address_unref(u);
 }
 
+/**
+ * Get port number as an integer value.
+ */
 
+/**
+ * Get port number, 0 if not present.
+ */
 int linphone_address_get_port(const LinphoneAddress *u) {
-#ifdef USE_BELLESIP
 	return sal_address_get_port(u);
-#else
-	return sal_address_get_port_int(u);
-#endif
 }
 
 /** @} */

coreapi/help/Doxyfile.in

@@ -190,7 +190,7 @@ EXPAND_ONLY_PREDEF     = NO
 SEARCH_INCLUDES        = YES
 INCLUDE_PATH           = .
 INCLUDE_FILE_PATTERNS  = *.h
-PREDEFINED             = DOXYGEN
+PREDEFINED             = DOXYGEN MS2_PUBLIC= LINPHONE_PUBLIC=
 EXPAND_AS_DEFINED      = 
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------

coreapi/linphonecall.c

@@ -1203,16 +1203,31 @@ void _linphone_call_params_copy(LinphoneCallParams *ncp, const LinphoneCallParam
 	if (cp->custom_headers) ncp->custom_headers=sal_custom_header_clone(cp->custom_headers);
 }
 
+/**
+ * @ingroup call_control
+ * Set requested level of privacy for the call.
+ * \xmlonly <language-tags>javascript</language-tags> \endxmlonly
+ * @param params the call parameters to be modified
+ * @param LinphonePrivacy to configure privacy
+ * */
 void linphone_call_params_set_privacy(LinphoneCallParams *params, LinphonePrivacyMask privacy) {
 	params->privacy=privacy;
 }
+
+/**
+ * @ingroup call_control
+ * Get requested level of privacy for the call.
+ * @param params the call parameters
+ * @return Privacy mode
+ * */
 LinphonePrivacyMask linphone_call_params_get_privacy(const LinphoneCallParams *params) {
 	return params->privacy;
 }
 
-
-
-
+/**
+ * @ingroup call_control
+ * @return string value of LinphonePrivacy enum
+ **/
 const char* linphone_privacy_to_string(LinphonePrivacy privacy) {
 	switch(privacy) {
 	case LinphonePrivacyDefault: return "LinphonePrivacyDefault";

coreapi/linphonecore.h

@@ -182,9 +182,6 @@ const char *linphone_address_get_scheme(const LinphoneAddress *u);
 LINPHONE_PUBLIC	const char *linphone_address_get_display_name(const LinphoneAddress* u);
 LINPHONE_PUBLIC	const char *linphone_address_get_username(const LinphoneAddress *u);
 LINPHONE_PUBLIC	const char *linphone_address_get_domain(const LinphoneAddress *u);
-/**
- * Get port number as an integer value, -1 if not set.
- */
 LINPHONE_PUBLIC int linphone_address_get_port(const LinphoneAddress *u);
 LINPHONE_PUBLIC	void linphone_address_set_display_name(LinphoneAddress *u, const char *display_name);
 LINPHONE_PUBLIC	void linphone_address_set_username(LinphoneAddress *uri, const char *username);
@@ -371,24 +368,9 @@ typedef enum _LinphonePrivacy {
  * */
 typedef unsigned int LinphonePrivacyMask;
 
-/**
- * @ingroup call_control
- * @return string value of LinphonePrivacy enum
- * */
-const char* linphone_privacy_to_string(LinphonePrivacy privacy);
-/**
- * @ingroup call_control
- * Set requested level of privacy for the call.
- * @param params the call parameters to be modified
- * @param LinphonePrivacy to configure privacy
- * */
+
+LINPHONE_PUBLIC const char* linphone_privacy_to_string(LinphonePrivacy privacy);
 LINPHONE_PUBLIC void linphone_call_params_set_privacy(LinphoneCallParams *params, LinphonePrivacyMask privacy);
-/**
- * @ingroup call_control
- * Get requested level of privacy for the call.
- * @param params the call parameters
- * @return Privacy mode
- * */
 LINPHONE_PUBLIC LinphonePrivacyMask linphone_call_params_get_privacy(const LinphoneCallParams *params);
 
 

mediastreamer2 @ 56128aa7

-Subproject commit ac5233ae16394d59cf4d9783a229f2adc2111b12
+Subproject commit 56128aa7e5e613708cd8a35beb5d2643dc4dae67

tools/Makefile.am

@@ -12,7 +12,7 @@ COMMON_CFLAGS=\
 	$(STRICT_OPTIONS) \
 	$(LIBXML2_CFLAGS) 
 
-AM_CXXFLAGS=$(LIBXML2_CFLAGS) 
+AM_CXXFLAGS=$(LIBXML2_CFLAGS) $(STRICT_OPTIONS)
 
 EXTRA_DIST=xml2lpc_jni.cc lpc2xml_jni.cc