Changeset 4087

Timestamp:

Apr 26, 2012 3:39:24 AM (13 years ago)

Author:

ming

Message:

Re #1446 (misc): Disable SDL by default on iOS and fixed various compiler warnings.

Location:

pjproject/trunk

Files:

• configure-iphone (modified) (1 diff)
• pjmedia/src/pjmedia/converter.c (modified) (1 diff)
• pjmedia/src/pjmedia/format.c (modified) (1 diff)
• pjsip-apps/src/pjsua/pjsua_app.c (modified) (1 diff)
• pjsip-apps/src/pjsystest/systest.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (2 diffs)

pjproject/trunk/configure-iphone

@@ -134 +134 @@
 
 # And finally invoke the configure script itself
-./aconfigure --host=arm-apple-darwin9 --disable-floating-point $*
+./aconfigure --host=arm-apple-darwin9 --disable-floating-point --disable-sdl $*
 
 if test "$?" = "0"; then

pjproject/trunk/pjmedia/src/pjmedia/converter.c

@@ -40 +40 @@
 {
     pjmedia_converter_mgr *mgr;
-    pj_status_t status;
+    pj_status_t status = PJ_SUCCESS;
 
     mgr = PJ_POOL_ALLOC_T(pool, pjmedia_converter_mgr);

pjproject/trunk/pjmedia/src/pjmedia/format.c

@@ -54 +54 @@
         return (pjmedia_audio_format_detail*) &fmt->det.aud;
     } else {
+        /* Get rid of unused var compiler warning if pj_assert()
+         * macro does not do anything
+         */
+        PJ_UNUSED_ARG(assert_valid);
         pj_assert(!assert_valid || !"Invalid audio format detail");
         return NULL;

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -3372 +3372 @@
         arrange_window(PJSUA_INVALID_ID);
     }
+#else
+    PJ_UNUSED_ARG(med_idx);
+    PJ_UNUSED_ARG(event);
 #endif
 }

pjproject/trunk/pjsip-apps/src/pjsystest/systest.c

@@ -89 +89 @@
 /*****************************************************************/
 
+#if defined(PJ_DARWINOS) && PJ_DARWINOS!=0
 PJ_INLINE(char *) add_path(const char *path, const char *fname)
 {
@@ -95 +96 @@
     return fpath;
 }
+#else
+#   define add_path(path, fname) fname
+#endif
 
 static void exit_app(void)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -2655 +2655 @@
                                           const pj_str_t *xml_st)
 {
+#if PJMEDIA_HAS_VIDEO
     pjsua_call *call = &pjsua_var.calls[call_id];
     const pj_str_t PICT_FAST_UPDATE = {"picture_fast_update", 19};
 
-#if PJMEDIA_HAS_VIDEO
     if (pj_strstr(xml_st, &PICT_FAST_UPDATE)) {
         unsigned i;
@@ -2677 +2677 @@
 
     /* Just to avoid compiler warning of unused var */
+    PJ_UNUSED_ARG(call_id);
     PJ_UNUSED_ARG(xml_st);