[svn-commits] mmichelson: branch 1.4 r100673 - in /branches/1.4: ./ channels/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Mon Jan 28 14:55:56 2008
New Revision: 100673

URL: http://svn.digium.com/view/asterisk?view=rev&rev=100673
Log:
Undoing the deprecation of chan_vpb. It is alive and well.


Modified:
    branches/1.4/UPGRADE.txt
    branches/1.4/channels/chan_vpb.cc

Modified: branches/1.4/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/branches/1.4/UPGRADE.txt?view=diff&rev=100673&r1=100672&r2=100673
==============================================================================
--- branches/1.4/UPGRADE.txt (original)
+++ branches/1.4/UPGRADE.txt Mon Jan 28 14:55:56 2008
@@ -384,11 +384,6 @@
   channel and module locks (which frequently caused deadlocks). An example of
   how to do this using AEL dialplan is in doc/queues-with-callback-members.txt.
 
-The VPB channel:
-
-* chan_vpb has been deprecated in favor of using chan_zap in combination with
-  the Zaptel drivers provided by Voicetronix
-
 The G726-32 codec:
 
 * It has been determined that previous versions of Asterisk used the wrong codeword

Modified: branches/1.4/channels/chan_vpb.cc
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_vpb.cc?view=diff&rev=100673&r1=100672&r2=100673
==============================================================================
--- branches/1.4/channels/chan_vpb.cc (original)
+++ branches/1.4/channels/chan_vpb.cc Mon Jan 28 14:55:56 2008
@@ -2863,12 +2863,6 @@
 	int bal2 = -1; 
 	int bal3 = -1;
 	char * callerid = NULL;
-	static int deprecation_warning = 1;
-
-	if (deprecation_warning) {
-		ast_log(LOG_NOTICE, "chan_vpb has been deprecated in favor of chan_zap in combination with Voicetronix's Zaptel drivers\n");
-		deprecation_warning = 0;
-	}
 
 	cfg = ast_config_load(config);