[asterisk-commits] irroot: branch irroot/distrotech-customers-1.8 r326053 - in /team/irroot/dist...

[SVN commits to the Asterisk project]

Author: irroot
Date: Fri Jul  1 11:06:33 2011
New Revision: 326053

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=326053
Log:
Remove changes to CHANGES this is a backport / remove codec changes to chan_local

Modified:
    team/irroot/distrotech-customers-1.8/CHANGES
    team/irroot/distrotech-customers-1.8/channels/chan_local.c

Modified: team/irroot/distrotech-customers-1.8/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/CHANGES?view=diff&rev=326053&r1=326052&r2=326053
==============================================================================
--- team/irroot/distrotech-customers-1.8/CHANGES (original)
+++ team/irroot/distrotech-customers-1.8/CHANGES Fri Jul  1 11:06:33 2011
@@ -7,12 +7,6 @@
 === and the other UPGRADE files for older releases.
 ===
 ======================================================================
-
-res_fax
---------------------------
- * The ReceiveFAXStatus and SendFAXStatus manager events have been consolidated
-   into a FAXStatus event with an 'Operation' header that will be either
-   'send', 'receive', and 'gateway'.
 
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 1.6.2 to Asterisk 1.8 ----------------
@@ -83,9 +77,6 @@
    res_stun_monitor module support in chan_sip.
  * Addition of the 'auth_options_requests' option for turning on and off
    authentication for OPTIONS requests in chan_sip.
- * Add T38 support for REJECTED state where T.38 Negotiation is explicitly rejected.
- * Enable Optional SRTP by setting encryption=try
- * Add option encryption_taglen to set auth taglen only 32 and 80 are supported currently.
 
 
 IAX2 Changes
@@ -301,15 +292,6 @@
    supports sending the event arguments to 5 individual fields, although it
    will fallback to the previous data definition, if the new table layout is
    not found.
- * Added general option negative_penalty_invalid default off. when set
-   members are seen as invalid/logged out when there penalty is negative.
-   for realtime members when set remove from queue will set penalty to -1.
- * Added queue option autopausedelay when autopause is enabled it will be
-   delayed for this number of seconds since last successful call if there
-   was no prior call the agent will be autopaused immediately.
- * Added member option ignorebusy this when set and ringinuse is not
-   will allow per member control of multiple calls as ringinuse does for
-   the Queue.
 
 mISDN channel driver (chan_misdn) changes
 ----------------------------------------
@@ -531,9 +513,6 @@
    applications will be lost, and that if the 'fax' logger level is directed to
    the console, the 'core set verbose' and 'core set debug' CLI commands will
    have no effect on whether the messages appear on the console or not.
- * FAXOPT(faxgateway) will enable a framehook that will take care of T.38
-   negotiation on reciving a CED tone on a channel. this gateway is to allow
-   translation of Audio T.30 [alaw/ulaw] to IFP T.38 terminals.
 
 Miscellaneous
 -------------

Modified: team/irroot/distrotech-customers-1.8/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/channels/chan_local.c?view=diff&rev=326053&r1=326052&r2=326053
==============================================================================
--- team/irroot/distrotech-customers-1.8/channels/chan_local.c (original)
+++ team/irroot/distrotech-customers-1.8/channels/chan_local.c Fri Jul  1 11:06:33 2011
@@ -584,7 +584,6 @@
 static int local_write(struct ast_channel *ast, struct ast_frame *f)
 {
 	struct local_pvt *p = ast->tech_pvt;
-	struct ast_channel *bridge;
 	int res = -1;
 	int isoutbound;
 
@@ -599,20 +598,6 @@
 
 	if (isoutbound && f && (f->frametype == AST_FRAME_VOICE || f->frametype == AST_FRAME_VIDEO)) {
 		check_bridge(p);
-	} else if (!isoutbound) {
-		/* fixup formats nativeformat has changed we must adjust
-		 * ast is p->owner and is locked here*/
-		bridge = ast_bridged_channel(ast);
-		if (bridge && !(bridge->nativeformats & ast->nativeformats)) {
-			ast->nativeformats = bridge->nativeformats;
-			ast_set_read_format(ast, ast->readformat);
-			ast_set_write_format(ast, ast->writeformat);
-			ast_channel_lock(p->chan);
-			p->chan->nativeformats = bridge->nativeformats;
-			ast_set_read_format(p->chan, p->chan->readformat);
-			ast_set_write_format(p->chan, p->chan->writeformat);
-			ast_channel_unlock(p->chan);
-		}
 	}
 
 	if (!ast_test_flag(p, LOCAL_ALREADY_MASQED)) {