[svn-commits] file: branch file/media r180379 - in /team/file/media: ./ apps/ bridges/ chan...

Thu Mar 5 12:50:08 CST 2009

Author: file
Date: Thu Mar  5 12:50:04 2009
New Revision: 180379

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=180379
Log:
Merged revisions 180369 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r180369 | file | 2009-03-05 14:18:27 -0400 (Thu, 05 Mar 2009) | 13 lines
  
  Merge phase 1 support for the new bridging architecture.
  
  This commit brings in the bridging core, bridging technologies,
  and the ConfBridge application.
  
  For usage information on the ConfBridge application please see
  the output of "core show application ConfBridge" from the CLI.
  
  For API documentation please see the doxygen page describing the
  architecture and the documentation for each API call.
  
  Review: http://reviewboard.digium.com/r/93/
........

Added:
    team/file/media/apps/app_confbridge.c
      - copied unchanged from r180369, trunk/apps/app_confbridge.c
    team/file/media/bridges/   (props changed)
      - copied from r180369, trunk/bridges/
    team/file/media/bridges/Makefile
      - copied unchanged from r180369, trunk/bridges/Makefile
    team/file/media/bridges/bridge_builtin_features.c
      - copied unchanged from r180369, trunk/bridges/bridge_builtin_features.c
    team/file/media/bridges/bridge_multiplexed.c
      - copied unchanged from r180369, trunk/bridges/bridge_multiplexed.c
    team/file/media/bridges/bridge_simple.c
      - copied unchanged from r180369, trunk/bridges/bridge_simple.c
    team/file/media/bridges/bridge_softmix.c
      - copied unchanged from r180369, trunk/bridges/bridge_softmix.c
    team/file/media/channels/chan_bridge.c
      - copied unchanged from r180369, trunk/channels/chan_bridge.c
    team/file/media/include/asterisk/bridging.h
      - copied unchanged from r180369, trunk/include/asterisk/bridging.h
    team/file/media/include/asterisk/bridging_features.h
      - copied unchanged from r180369, trunk/include/asterisk/bridging_features.h
    team/file/media/include/asterisk/bridging_technology.h
      - copied unchanged from r180369, trunk/include/asterisk/bridging_technology.h
    team/file/media/main/bridging.c
      - copied unchanged from r180369, trunk/main/bridging.c
Modified:
    team/file/media/   (props changed)
    team/file/media/CHANGES
    team/file/media/Makefile
    team/file/media/include/asterisk/channel.h
    team/file/media/main/Makefile

Propchange: team/file/media/
------------------------------------------------------------------------------

--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Mar  5 12:50:04 2009
@@ -1,1 +1,1 @@
-/trunk:1-180339
+/trunk:1-180372

Modified: team/file/media/CHANGES
URL: http://svn.digium.com/svn-view/asterisk/team/file/media/CHANGES?view=diff&rev=180379&r1=180378&r2=180379
==============================================================================
--- team/file/media/CHANGES (original)
+++ team/file/media/CHANGES Thu Mar  5 12:50:04 2009
@@ -117,6 +117,9 @@
    call origination from the dialplan.
  * Voicemail now permits setting the emailsubject and emailbody per mailbox,
    in addition to the setting in the "general" context.
+ * Added ConfBridge dialplan application which does conference bridges without
+   DAHDI. For information on its use, please see the output of
+   "core show application ConfBridge" from the CLI.
 
 Miscellaneous
 -------------

Modified: team/file/media/Makefile
URL: http://svn.digium.com/svn-view/asterisk/team/file/media/Makefile?view=diff&rev=180379&r1=180378&r2=180379
==============================================================================
--- team/file/media/Makefile (original)
+++ team/file/media/Makefile Thu Mar  5 12:50:04 2009
@@ -293,7 +293,7 @@
 #	value directly to ASTCFLAGS
 ASTCFLAGS+=$(MALLOC_DEBUG)$(OPTIONS)
 
-MOD_SUBDIRS:=channels pbx apps codecs formats cdr funcs tests main res $(LOCAL_MOD_SUBDIRS)
+MOD_SUBDIRS:=channels pbx apps codecs formats cdr bridges funcs tests main res $(LOCAL_MOD_SUBDIRS)
 OTHER_SUBDIRS:=utils agi
 SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
 SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)

Propchange: team/file/media/bridges/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Mar  5 12:50:04 2009
@@ -1,0 +1,11 @@
+*.a
+*.d
+*.eo
+*.eoo
+*.i
+*.makeopts
+*.moduleinfo
+*.s
+*.so
+modules.link
+

Modified: team/file/media/include/asterisk/channel.h
URL: http://svn.digium.com/svn-view/asterisk/team/file/media/include/asterisk/channel.h?view=diff&rev=180379&r1=180378&r2=180379
==============================================================================
--- team/file/media/include/asterisk/channel.h (original)
+++ team/file/media/include/asterisk/channel.h Thu Mar  5 12:50:04 2009
@@ -496,7 +496,13 @@
 
 	unsigned short transfercapability;		/*!< ISDN Transfer Capbility - AST_FLAG_DIGITAL is not enough */
 
-	char unused_old_dtmfq[AST_MAX_EXTENSION];			/*!< (deprecated, use readq instead) Any/all queued DTMF characters */
+	union {
+		char unused_old_dtmfq[AST_MAX_EXTENSION];			/*!< (deprecated, use readq instead) Any/all queued DTMF characters */
+		struct {
+			struct ast_bridge *bridge;                                      /*!< Bridge this channel is participating in */
+		};
+	};
+
 	char context[AST_MAX_CONTEXT];			/*!< Dialplan: Current extension context */
 	char exten[AST_MAX_EXTENSION];			/*!< Dialplan: Current extension number */
 	char macrocontext[AST_MAX_CONTEXT];		/*!< Macro: Current non-macro context. See app_macro.c */

Modified: team/file/media/main/Makefile
URL: http://svn.digium.com/svn-view/asterisk/team/file/media/main/Makefile?view=diff&rev=180379&r1=180378&r2=180379
==============================================================================
--- team/file/media/main/Makefile (original)
+++ team/file/media/main/Makefile Thu Mar  5 12:50:04 2009
@@ -29,7 +29,7 @@
 	strcompat.o threadstorage.o dial.o event.o adsistub.o audiohook.o \
 	astobj2.o hashtab.o global_datastores.o version.o \
 	features.o taskprocessor.o timing.o datastore.o xml.o xmldoc.o \
-	strings.o media.o
+	strings.o bridging.o media.o
 
 # we need to link in the objects statically, not as a library, because
 # otherwise modules will not have them available if none of the static


