X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=remote.cpp;h=cb6e528da1b6891470465a18937baf60759077de;hp=4917f3b9239b1e591e718a48cf2fe020650b2967;hb=refs%2Fheads%2Fbackup2;hpb=d3b4611440011b798a33974ec6ce649faec32ab5

diff --git a/remote.cpp b/remote.cpp
index 4917f3b..cb6e528 100644
--- a/remote.cpp
+++ b/remote.cpp
@@ -24,6 +24,7 @@ Premote::Premote(int type, char *portname, struct port_settings *settings, struc
 	p_r_ref = new_remote++;
 	SCPY(p_r_remote_app, interface->remote_app);
 	p_r_tones = (interface->is_tones == IS_YES);
+	p_r_earlyb = (interface->is_earlyb == IS_YES);
 
 	/* send new ref to remote socket */
 	memset(&param, 0, sizeof(union parameter));
@@ -139,6 +140,8 @@ void Premote::message_remote(int message_type, union parameter *param)
 
 	switch (message_type) {
 	case MESSAGE_TRAFFIC:
+		if (p_dov_rx)
+			dov_rx(param->traffic.data, param->traffic.len);
 		/* record audio */
 		if (p_record)
 			record(param->traffic.data, param->traffic.len, 0); // from down
@@ -153,6 +156,10 @@ void Premote::message_remote(int message_type, union parameter *param)
 			if (p_tap)
 				tap(param->traffic.data, param->traffic.len, 1); // from up
 			admin_message_from_lcr(p_r_remote_id, p_r_ref, MESSAGE_TRAFFIC, param);
+		} else if (p_dov_tx) {
+			/* use receeived traffic to trigger sending DOV */
+			dov_tx(param->traffic.data, param->traffic.len);
+			admin_message_from_lcr(p_r_remote_id, p_r_ref, MESSAGE_TRAFFIC, param);
 		}
 		return;
 
@@ -232,10 +239,19 @@ int Premote::bridge_rx(unsigned char *data, int len)
 {
 	union parameter newparam;
 	int l;
-
-	/* don't send tones, if not enabled or not connected */
-	if (!p_r_tones
-	 && p_state != PORT_STATE_CONNECT)
+	int ret;
+
+	if ((ret = Port::bridge_rx(data, len)))
+		return ret;
+
+	/* send tones, if connected, or if early audio is enabled in proceeding/alerting state */
+	if (p_state != PORT_STATE_CONNECT
+	 && !(p_r_earlyb
+	  && (p_state == PORT_STATE_OUT_PROCEEDING
+	   || p_state == PORT_STATE_OUT_ALERTING))
+	 && !(p_r_tones
+	  && (p_state == PORT_STATE_IN_PROCEEDING
+	   || p_state == PORT_STATE_IN_ALERTING)))
 	 	return 0;
 
 	if (p_tone_name[0])