]> sjero.net Git - linphone/commitdiff
Added function to request other side to send a VFU.
authorGuillaume Beraudo <guillaume.beraudo@linphone.org>
Thu, 20 Jan 2011 12:13:39 +0000 (13:13 +0100)
committerGuillaume Beraudo <guillaume.beraudo@linphone.org>
Thu, 20 Jan 2011 12:13:39 +0000 (13:13 +0100)
console/commands.c
coreapi/linphonecall.c
coreapi/linphonecore.h
coreapi/sal_eXosip2.c

index 4fdd4e715f58377ecdc8b49fbb500482697385f8..21067c641eba2cc7ff4b92627f9819154736253c 100644 (file)
@@ -94,6 +94,7 @@ static int lpc_cmd_camera(LinphoneCore *lc, char *args);
 static int lpc_cmd_video_window(LinphoneCore *lc, char *args);
 static int lpc_cmd_preview_window(LinphoneCore *lc, char *args);
 static int lpc_cmd_snapshot(LinphoneCore *lc, char *args);
+static int lpc_cmd_vfureq(LinphoneCore *lc, char *arg);
 #endif
 static int lpc_cmd_states(LinphoneCore *lc, char *args);
 static int lpc_cmd_identify(LinphoneCore *lc, char *args);
@@ -2440,7 +2441,7 @@ static int lpc_cmd_snapshot(LinphoneCore *lc, char *args){
        return 1;
 }
 
-static int lpc_cmd_vfureq(LinphoneCore *lc){
+static int lpc_cmd_vfureq(LinphoneCore *lc, char *arg){
        LinphoneCall *call;
        call=linphone_core_get_current_call(lc);
        if (call!=NULL){
index 393305f5439afb72e35dcc18af8b232480c47fea..db5c45096f3116ad895e0810cdf62a96d68755f8 100644 (file)
@@ -973,11 +973,12 @@ void linphone_call_stop_media_streams(LinphoneCall *call){
        }
 }
 
+#ifdef VIDEO_ENABLED
 /**
  * Request remote side to send us VFU.
 **/
 void linphone_call_send_vfu_request(LinphoneCall *call)
 {
-       LinphoneCall *call=linphone_core_get_current_call(lc);
-               sal_call_send_vfu_request(call->op);
+       sal_call_send_vfu_request(call->op);
 }
+#endif
index 87261673789de1598d9982f7ef2d2be852054459..8cea2d5eb59dee5064ffbcdcb3bc42b54e574bea 100644 (file)
@@ -929,6 +929,6 @@ LinphoneGlobalState linphone_core_get_global_state(const LinphoneCore *lc);
 }
 #endif
 
-
+void linphone_call_send_vfu_request(LinphoneCall *call);
 
 #endif
index 733f8df27eab63b2255678a38107b6d9411bc78d..356b7dca269298ef4eb922d5b90a40af05911b97 100644 (file)
@@ -1238,7 +1238,7 @@ static bool_t call_failure(Sal *sal, eXosip_event_t *ev){
 }
 
 /* Request remote side to send us VFU */
-static void sal_call_send_vfu_request(SalOp *h){
+void sal_call_send_vfu_request(SalOp *h){
        osip_message_t *msg=NULL;
        char info_body[] =
                        "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n"
@@ -1262,7 +1262,6 @@ static void sal_call_send_vfu_request(SalOp *h){
                eXosip_call_send_request(h->did,msg);
        }
        eXosip_unlock();
-       return 0;
 }
 
 static void process_media_control_xml(Sal *sal, eXosip_event_t *ev){