X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=apppbx.cpp;h=66aba313a9b23f1593dba0a8beeaad2d5ebdd866;hp=3a3952483288d153c9ff2aacbf6df85e14d99964;hb=d57a2db4c6a9143b8fbee59ff4d151846e8f4303;hpb=d2ffecef264949e36341e87f8e1ff41a8effb1f2

diff --git a/apppbx.cpp b/apppbx.cpp
index 3a39524..66aba31 100644
--- a/apppbx.cpp
+++ b/apppbx.cpp
@@ -40,14 +40,7 @@ EndpointAppPBX::EndpointAppPBX(class Endpoint *epoint, int origin) : EndpointApp
         memset(&e_ext, 0, sizeof(struct extension));
 	// *************** NOTE: also change value in read_extension() **************
 	e_ext.rights = 4; /* international */
-	e_ext.tout_setup = 120;
-	e_ext.tout_dialing = 120;
-	e_ext.tout_proceeding = 120;
-	e_ext.tout_alerting = 120;
-	e_ext.tout_disconnect = 120;
-//	e_ext.tout_hold = 900;
-//	e_ext.tout_park = 900;
-	e_ext.rxvol = e_ext.txvol = 0;
+	e_ext.rx_gain = e_ext.tx_gain = 0;
         e_state = EPOINT_STATE_IDLE;
         e_ext.number[0] = '\0';
 	e_extension_interface[0] = '\0';
@@ -860,13 +853,6 @@ void EndpointAppPBX::out_setup(void)
 		SCPY(port_settings.tones_dir, e_ext.tones_dir);
 	else
 		SCPY(port_settings.tones_dir, options.tones_dir);
-	port_settings.tout_setup = e_ext.tout_setup;
-	port_settings.tout_dialing = e_ext.tout_dialing;
-	port_settings.tout_proceeding = e_ext.tout_proceeding;
-	port_settings.tout_alerting = e_ext.tout_alerting;
-	port_settings.tout_disconnect = e_ext.tout_disconnect;
-//	port_settings.tout_hold = e_ext.tout_hold;
-//	port_settings.tout_park = e_ext.tout_park;
 	port_settings.no_seconds = e_ext.no_seconds;
 	
 	/* NOTE: currently the try_card feature is not supported. it should be used later to try another card, if the outgoing call fails on one port */
@@ -1015,7 +1001,7 @@ void EndpointAppPBX::out_setup(void)
 				goto check_anycall_intern;
 			}
 			/* directory.list */
-			if (e_callerinfo.id[0] && (e_ext.centrex || e_ext.display_name))
+			if (e_callerinfo.id[0] && e_ext.display_name)
 			{
 				dirname = parse_directory(e_callerinfo.id, e_callerinfo.ntype);
 				if (dirname)
@@ -1039,8 +1025,8 @@ void EndpointAppPBX::out_setup(void)
 			SCPY(message->param.setup.callerinfo.display, apply_callerid_display(message->param.setup.callerinfo.id, message->param.setup.callerinfo.itype, message->param.setup.callerinfo.ntype, message->param.setup.callerinfo.present, message->param.setup.callerinfo.screen, message->param.setup.callerinfo.extension, message->param.setup.callerinfo.name));
 //printf("\n\ndisplay = %s\n\n\n",message->param.setup.callerinfo.display);
 			/* use cnip, if enabld */
-			if (!e_ext.centrex)
-				message->param.setup.callerinfo.name[0] = '\0';
+	//		if (!e_ext.centrex)
+	//			message->param.setup.callerinfo.name[0] = '\0';
 			/* screen clip if prefix is required */
 			if (message->param.setup.callerinfo.id[0] && e_ext.clip_prefix[0])
 			{
@@ -1583,12 +1569,12 @@ void EndpointAppPBX::port_setup(struct port_list *portlist, int message_type, un
 
 		/* set volume of rx and tx */
 		if (param->setup.callerinfo.itype == INFO_ITYPE_ISDN_EXTENSION)
-		if (e_ext.txvol!=0 || e_ext.rxvol!=0)
+		if (e_ext.tx_gain!=0 || e_ext.rx_gain!=0)
 		{
 			message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_mISDNSIGNAL);
 			message->param.mISDNsignal.message = mISDNSIGNAL_VOLUME;
-			message->param.mISDNsignal.rxvol = e_ext.txvol;
-			message->param.mISDNsignal.txvol = e_ext.rxvol;
+			message->param.mISDNsignal.rx_gain = e_ext.tx_gain;
+			message->param.mISDNsignal.tx_gain = e_ext.rx_gain;
 			message_put(message);
 		}
 
@@ -2073,12 +2059,12 @@ void EndpointAppPBX::port_connect(struct port_list *portlist, int message_type,
 	new_state(EPOINT_STATE_CONNECT);
 
 	/* set volume of rx and tx */
-	if (e_ext.txvol!=0 || e_ext.rxvol!=0)
+	if (e_ext.tx_gain!=0 || e_ext.rx_gain!=0)
 	{
 		message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_mISDNSIGNAL);
 		message->param.mISDNsignal.message = mISDNSIGNAL_VOLUME;
-		message->param.mISDNsignal.rxvol = e_ext.txvol;
-		message->param.mISDNsignal.txvol = e_ext.rxvol;
+		message->param.mISDNsignal.rx_gain = e_ext.tx_gain;
+		message->param.mISDNsignal.tx_gain = e_ext.rx_gain;
 		message_put(message);
 	}
 
@@ -2453,13 +2439,13 @@ void EndpointAppPBX::port_notify(struct port_list *portlist, int message_type, u
 		case INFO_NOTIFY_USER_RESUMED:
 		/* set volume of rx and tx */
 		if (param->setup.callerinfo.itype == INFO_ITYPE_ISDN_EXTENSION)
-		if (e_ext.txvol!=0 || e_ext.rxvol!=0)
+		if (e_ext.tx_gain!=0 || e_ext.rx_gain!=0)
 		if (portlist)
 		{
 			message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_mISDNSIGNAL);
 			message->param.mISDNsignal.message = mISDNSIGNAL_VOLUME;
-			message->param.mISDNsignal.rxvol = e_ext.txvol;
-			message->param.mISDNsignal.txvol = e_ext.rxvol;
+			message->param.mISDNsignal.rx_gain = e_ext.tx_gain;
+			message->param.mISDNsignal.tx_gain = e_ext.rx_gain;
 			message_put(message);
 		}
 		/* set current tone */
@@ -3000,8 +2986,8 @@ void EndpointAppPBX::join_connect(struct port_list *portlist, int message_type,
 		SCPY(message->param.connectinfo.display, apply_callerid_display(message->param.connectinfo.id, message->param.connectinfo.itype, message->param.connectinfo.ntype, message->param.connectinfo.present, message->param.connectinfo.screen, message->param.connectinfo.extension, message->param.connectinfo.name));
 
 		/* use conp, if enabld */
-		if (!e_ext.centrex)
-			message->param.connectinfo.name[0] = '\0';
+//		if (!e_ext.centrex)
+//			message->param.connectinfo.name[0] = '\0';
 
 		/* send connect */
 		message_put(message);