[svn-commits] russell: branch group/chan_unistim r88330 - in /team/group/chan_unistim: ./ c...

SVN commits to the Digium repositories svn-commits at lists.digium.com
Fri Nov 2 15:35:32 CDT 2007


Author: russell
Date: Fri Nov  2 15:35:31 2007
New Revision: 88330

URL: http://svn.digium.com/view/asterisk?view=rev&rev=88330
Log:
a few final tweaks

Modified:
    team/group/chan_unistim/CHANGES
    team/group/chan_unistim/CREDITS
    team/group/chan_unistim/channels/chan_unistim.c
    team/group/chan_unistim/configs/unistim.conf.sample

Modified: team/group/chan_unistim/CHANGES
URL: http://svn.digium.com/view/asterisk/team/group/chan_unistim/CHANGES?view=diff&rev=88330&r1=88329&r2=88330
==============================================================================
--- team/group/chan_unistim/CHANGES (original)
+++ team/group/chan_unistim/CHANGES Fri Nov  2 15:35:31 2007
@@ -305,3 +305,6 @@
      It allows you to configure a prefix for auto-monitor recordings.
   * Added support for running your dialplan by writing one in lua.  See
      configs/extensions.lua.sample for examples of how to do this.
+ * Added a new channel driver, chan_unistim.  See doc/unistim.txt and
+    configs/unistim.conf.sample for details.  This new channel driver allows
+	you to use Nortel i2002, i2004, and i2050 phones with Asterisk.

Modified: team/group/chan_unistim/CREDITS
URL: http://svn.digium.com/view/asterisk/team/group/chan_unistim/CREDITS?view=diff&rev=88330&r1=88329&r2=88330
==============================================================================
--- team/group/chan_unistim/CREDITS (original)
+++ team/group/chan_unistim/CREDITS Fri Nov  2 15:35:31 2007
@@ -163,6 +163,10 @@
 Voop AS - Financial support for a lot of work with the SIP driver and the IAX
 	trunk MTU patch
 
+Cedric Hans - Development of chan_unistim
+  cedric.hans(AT)mlkj.net
+
+
 === OTHER CONTRIBUTIONS ===
 John Todd - Monkey sounds and associated teletorture prompt
 Michael Jerris - bug marshaling

Modified: team/group/chan_unistim/channels/chan_unistim.c
URL: http://svn.digium.com/view/asterisk/team/group/chan_unistim/channels/chan_unistim.c?view=diff&rev=88330&r1=88329&r2=88330
==============================================================================
--- team/group/chan_unistim/channels/chan_unistim.c (original)
+++ team/group/chan_unistim/channels/chan_unistim.c Fri Nov  2 15:35:31 2007
@@ -1045,7 +1045,7 @@
 
 /* status (icons) : 00 = nothing, 2x/3x = see parser.h, 4x/5x = blink fast, 6x/7x = blink slow */
 static void
-Sendfavorite(unsigned char pos, unsigned char status, struct unistimsession *pte,
+send_favorite(unsigned char pos, unsigned char status, struct unistimsession *pte,
 			 const char *text)
 {
 	BUFFSEND;
@@ -1073,10 +1073,10 @@
 	for (i = 0; i < 6; i++) {
 		if ((pte->device->softkeyicon[i] <= FAV_ICON_HEADPHONES_ONHOLD) &&
 			(pte->device->softkeylinepos != i))
-			Sendfavorite((unsigned char) i, pte->device->softkeyicon[i] + 1, pte,
+			send_favorite((unsigned char) i, pte->device->softkeyicon[i] + 1, pte,
 						 pte->device->softkeylabel[i]);
 		else
-			Sendfavorite((unsigned char) i, pte->device->softkeyicon[i], pte,
+			send_favorite((unsigned char) i, pte->device->softkeyicon[i], pte,
 						 pte->device->softkeylabel[i]);
 
 	}
@@ -1090,7 +1090,7 @@
 	int i;
 	/* Update the current phone */
 	if (pte->state != STATE_CLEANING)
-		Sendfavorite(pte->device->softkeylinepos, status, pte,
+		send_favorite(pte->device->softkeylinepos, status, pte,
 					 pte->device->softkeylabel[pte->device->softkeylinepos]);
 	/* Notify other phones if we're in their bookmark */
 	while (d) {
@@ -1099,7 +1099,7 @@
 				if (d->softkeyicon[i] != status) {      /* Avoid resending the same icon */
 					d->softkeyicon[i] = status;
 					if (d->session)
-						Sendfavorite(i, status + 1, d->session, d->softkeylabel[i]);
+						send_favorite(i, status + 1, d->session, d->softkeylabel[i]);
 				}
 			}
 		}
@@ -3123,7 +3123,7 @@
 	send_tone(pte, 0, 0);
 	send_select_output(pte, pte->device->output, pte->device->volume, MUTE_ON_DISCRET);
 	pte->device->lines->lastmsgssent = 0;
-	Sendfavorite(pte->device->softkeylinepos, FAV_ICON_ONHOOK_BLACK, pte,
+	send_favorite(pte->device->softkeylinepos, FAV_ICON_ONHOOK_BLACK, pte,
 				 pte->device->softkeylabel[pte->device->softkeylinepos]);
 	if (!ast_strlen_zero(pte->device->call_forward)) {
 		send_text(TEXT_LINE0, TEXT_NORMAL, pte, "Call forwarded to :");
@@ -3359,7 +3359,7 @@
 			char tmp[30];
 
 			for (i = 1; i < 6; i++)
-				Sendfavorite(i, 0, pte, "");
+				send_favorite(i, 0, pte, "");
 			send_text(TEXT_LINE0, TEXT_NORMAL, pte, "Sorry, this phone is not");
 			send_text(TEXT_LINE1, TEXT_NORMAL, pte, "registred in unistim.cfg");
 			strcpy(tmp, "MAC = ");
@@ -3943,6 +3943,7 @@
 
 	return 1;
 }
+
 static struct ast_frame *unistim_rtp_read(const struct ast_channel *ast,
 	const struct unistim_subchannel *sub)
 {
@@ -4390,7 +4391,7 @@
 		strcpy(pte->device->softkeylabel[pos], label);
 		strcpy(pte->device->softkeynumber[pos], number);
 		pte->device->softkeyicon[pos] = icon;
-		Sendfavorite(pos, icon, pte, label);
+		send_favorite(pos, icon, pte, label);
 		return 0;
 	}
 

Modified: team/group/chan_unistim/configs/unistim.conf.sample
URL: http://svn.digium.com/view/asterisk/team/group/chan_unistim/configs/unistim.conf.sample?view=diff&rev=88330&r1=88329&r2=88330
==============================================================================
--- team/group/chan_unistim/configs/unistim.conf.sample (original)
+++ team/group/chan_unistim/configs/unistim.conf.sample Fri Nov  2 15:35:31 2007
@@ -1,3 +1,7 @@
+;
+; chan_unistim configuration file.
+;
+
 [general]
 port=5000                    ; UDP port
 ;keepalive=120               ; in seconds, default = 120




More information about the svn-commits mailing list