Changeset 454:15e1f2a098fa in verona

Timestamp:

Apr 4, 2012 12:05:36 PM (14 months ago)

Author:

Vadim Lebedev <vadim@…>

Branch:

default

Parents:

452:ef158d6b3770 (diff), 453:be77f63cf114 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge

Files:

• phapi/phapi.c (modified) (1 diff)
• phapi/phapi.c (modified) (5 diffs)

phapi/phapi.c

@@ -1928 +1928 @@
 
         for (j = 0; j < hcount; j++)
-                set_custom_header(msg, hdrs[j].hdr, hdrs[j].val);
+                set_customized_header(msg, hdrs[j].hdr, hdrs[j].val);
 
         ph_apply_customizations(msg, NULL, NULL);

phapi/phapi.c

@@ -604 +604 @@
 static int _is_video_enabled(int streams) 
 {
+#ifdef PHAPI_VIDEO_SUPPORT
         return (streams & (PH_STREAM_VIDEO_RX | PH_STREAM_VIDEO_TX));
+#else
+        return 0;
+#endif
 }
 
@@ -870 +874 @@
                                 if (sdp_message_m_attr_has_type(ca->remote_sdp, "audio"))
                                         ca->nego_mflags |= PH_STREAM_AUDIO;
+#ifdef PHAPI_VIDEO_SUPPORT
                                 if (sdp_message_m_attr_has_type(ca->remote_sdp, "video"))
                                         ca->nego_mflags |= PH_STREAM_VIDEO;
+#endif
                                 osip_free(sdp);
                         }
@@ -886 +892 @@
                                 if (sdp_message_m_attr_has_type(ca->remote_sdp, "audio"))
                                         ca->nego_mflags |= PH_STREAM_AUDIO;
+#ifdef PHAPI_VIDEO_SUPPORT
                                 if (sdp_message_m_attr_has_type(ca->remote_sdp, "video"))
                                         ca->nego_mflags |= PH_STREAM_VIDEO;
+#endif
                                 osip_free(sdp);
                         }
@@ -967 +975 @@
 static int ph_call_hasvideo(phcall_t *ca)
 {
+#ifdef PHAPI_VIDEO_SUPPORT
         if (ca->mses && (ca->mses->activestreams & (1 << PH_MSTREAM_VIDEO1)))
                 return 1;
+#endif
         return 0;
 }
@@ -3747 +3757 @@
 PHAPI_EXPORT int phChangeVideoDevices(const char *devstr)
 {
+#ifdef PHAPI_VIDEO_SUPPORT
         if (devstr)
                 osip_strncpy(phcfg.video_config.video_device, devstr, sizeof(phcfg.video_config.video_device)-1);
+#endif
         
         return 0;