Undoing the deprecation of chan_vpb. It is alive and well.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@100673 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/UPGRADE.txt b/UPGRADE.txt
index a6ec2838bcf946c1cd98439e0059ef31c2330e19..3f6e0aa1e55e5bc3e538720dc209f5847e826289 100644 (file)
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -384,11 +384,6 @@ The Agent channel:
   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

diff --git a/channels/chan_vpb.cc b/channels/chan_vpb.cc
index 223eae02f68123554a1906c5b2d62219ddf3e9eb..c12af7ccf0d59b055e669d28ac93d76e85b3902d 100644 (file)
--- a/channels/chan_vpb.cc
+++ b/channels/chan_vpb.cc
@@ -2863,12 +2863,6 @@ int load_module()
        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);