[svn-commits] oej: branch oej/videocaps r61662 - in /team/oej/videocaps: ./ apps/ build_too...

svn-commits at lists.digium.com svn-commits at lists.digium.com
Mon Apr 16 05:58:45 MST 2007


Author: oej
Date: Mon Apr 16 07:58:41 2007
New Revision: 61662

URL: http://svn.digium.com/view/asterisk?view=rev&rev=61662
Log:
Restored this branch for SIPit20 testing

Added:
    team/oej/videocaps/build_tools/make_linker_eo_script
      - copied unchanged from r61661, trunk/build_tools/make_linker_eo_script
    team/oej/videocaps/cdr/cdr_sqlite3_custom.c
      - copied unchanged from r61661, trunk/cdr/cdr_sqlite3_custom.c
    team/oej/videocaps/configs/cdr_sqlite3_custom.conf
      - copied unchanged from r61661, trunk/configs/cdr_sqlite3_custom.conf
    team/oej/videocaps/configs/res_config_sqlite.conf
      - copied unchanged from r61661, trunk/configs/res_config_sqlite.conf
    team/oej/videocaps/doc/ael.tex
      - copied unchanged from r61661, trunk/doc/ael.tex
    team/oej/videocaps/doc/ajam.tex
      - copied unchanged from r61661, trunk/doc/ajam.tex
    team/oej/videocaps/doc/app-sms.tex
      - copied unchanged from r61661, trunk/doc/app-sms.tex
    team/oej/videocaps/doc/ast_appdocs.tex
      - copied unchanged from r61661, trunk/doc/ast_appdocs.tex
    team/oej/videocaps/doc/asterisk-conf.tex
      - copied unchanged from r61661, trunk/doc/asterisk-conf.tex
    team/oej/videocaps/doc/asterisk.tex
      - copied unchanged from r61661, trunk/doc/asterisk.tex
    team/oej/videocaps/doc/billing.tex
      - copied unchanged from r61661, trunk/doc/billing.tex
    team/oej/videocaps/doc/cdrdriver.tex
      - copied unchanged from r61661, trunk/doc/cdrdriver.tex
    team/oej/videocaps/doc/chaniax.tex
      - copied unchanged from r61661, trunk/doc/chaniax.tex
    team/oej/videocaps/doc/channelvariables.tex
      - copied unchanged from r61661, trunk/doc/channelvariables.tex
    team/oej/videocaps/doc/cliprompt.tex
      - copied unchanged from r61661, trunk/doc/cliprompt.tex
    team/oej/videocaps/doc/configuration.tex
      - copied unchanged from r61661, trunk/doc/configuration.tex
    team/oej/videocaps/doc/dundi.tex
      - copied unchanged from r61661, trunk/doc/dundi.tex
    team/oej/videocaps/doc/enum.tex
      - copied unchanged from r61661, trunk/doc/enum.tex
    team/oej/videocaps/doc/extensions.tex
      - copied unchanged from r61661, trunk/doc/extensions.tex
    team/oej/videocaps/doc/freetds.tex
      - copied unchanged from r61661, trunk/doc/freetds.tex
    team/oej/videocaps/doc/hardware.tex
      - copied unchanged from r61661, trunk/doc/hardware.tex
    team/oej/videocaps/doc/ices.tex
      - copied unchanged from r61661, trunk/doc/ices.tex
    team/oej/videocaps/doc/imapstorage.tex
      - copied unchanged from r61661, trunk/doc/imapstorage.tex
    team/oej/videocaps/doc/ip-tos.tex
      - copied unchanged from r61661, trunk/doc/ip-tos.tex
    team/oej/videocaps/doc/jitterbuffer.tex
      - copied unchanged from r61661, trunk/doc/jitterbuffer.tex
    team/oej/videocaps/doc/localchannel.tex
      - copied unchanged from r61661, trunk/doc/localchannel.tex
    team/oej/videocaps/doc/manager.tex
      - copied unchanged from r61661, trunk/doc/manager.tex
    team/oej/videocaps/doc/misdn.tex
      - copied unchanged from r61661, trunk/doc/misdn.tex
    team/oej/videocaps/doc/mp3.tex
      - copied unchanged from r61661, trunk/doc/mp3.tex
    team/oej/videocaps/doc/odbcstorage.tex
      - copied unchanged from r61661, trunk/doc/odbcstorage.tex
    team/oej/videocaps/doc/privacy.tex
      - copied unchanged from r61661, trunk/doc/privacy.tex
    team/oej/videocaps/doc/queuelog.tex
      - copied unchanged from r61661, trunk/doc/queuelog.tex
    team/oej/videocaps/doc/queues-with-callback-members.tex
      - copied unchanged from r61661, trunk/doc/queues-with-callback-members.tex
    team/oej/videocaps/doc/realtime.tex
      - copied unchanged from r61661, trunk/doc/realtime.tex
    team/oej/videocaps/doc/res_config_sqlite.txt
      - copied unchanged from r61661, trunk/doc/res_config_sqlite.txt
    team/oej/videocaps/doc/security.tex
      - copied unchanged from r61661, trunk/doc/security.tex
    team/oej/videocaps/doc/sla.tex
      - copied unchanged from r61661, trunk/doc/sla.tex
    team/oej/videocaps/main/minimime/   (props changed)
      - copied from r61661, trunk/main/minimime/
    team/oej/videocaps/main/minimime/Make.conf
      - copied unchanged from r61661, trunk/main/minimime/Make.conf
    team/oej/videocaps/main/minimime/Makefile
      - copied unchanged from r61661, trunk/main/minimime/Makefile
    team/oej/videocaps/main/minimime/mimeparser.h
      - copied unchanged from r61661, trunk/main/minimime/mimeparser.h
    team/oej/videocaps/main/minimime/mimeparser.l
      - copied unchanged from r61661, trunk/main/minimime/mimeparser.l
    team/oej/videocaps/main/minimime/mimeparser.tab.c
      - copied unchanged from r61661, trunk/main/minimime/mimeparser.tab.c
    team/oej/videocaps/main/minimime/mimeparser.tab.h
      - copied unchanged from r61661, trunk/main/minimime/mimeparser.tab.h
    team/oej/videocaps/main/minimime/mimeparser.y
      - copied unchanged from r61661, trunk/main/minimime/mimeparser.y
    team/oej/videocaps/main/minimime/mimeparser.yy.c
      - copied unchanged from r61661, trunk/main/minimime/mimeparser.yy.c
    team/oej/videocaps/main/minimime/minimime.c
      - copied unchanged from r61661, trunk/main/minimime/minimime.c
    team/oej/videocaps/main/minimime/mm.h
      - copied unchanged from r61661, trunk/main/minimime/mm.h
    team/oej/videocaps/main/minimime/mm_base64.c
      - copied unchanged from r61661, trunk/main/minimime/mm_base64.c
    team/oej/videocaps/main/minimime/mm_codecs.c
      - copied unchanged from r61661, trunk/main/minimime/mm_codecs.c
    team/oej/videocaps/main/minimime/mm_contenttype.c
      - copied unchanged from r61661, trunk/main/minimime/mm_contenttype.c
    team/oej/videocaps/main/minimime/mm_context.c
      - copied unchanged from r61661, trunk/main/minimime/mm_context.c
    team/oej/videocaps/main/minimime/mm_envelope.c
      - copied unchanged from r61661, trunk/main/minimime/mm_envelope.c
    team/oej/videocaps/main/minimime/mm_error.c
      - copied unchanged from r61661, trunk/main/minimime/mm_error.c
    team/oej/videocaps/main/minimime/mm_header.c
      - copied unchanged from r61661, trunk/main/minimime/mm_header.c
    team/oej/videocaps/main/minimime/mm_init.c
      - copied unchanged from r61661, trunk/main/minimime/mm_init.c
    team/oej/videocaps/main/minimime/mm_internal.h
      - copied unchanged from r61661, trunk/main/minimime/mm_internal.h
    team/oej/videocaps/main/minimime/mm_mem.c
      - copied unchanged from r61661, trunk/main/minimime/mm_mem.c
    team/oej/videocaps/main/minimime/mm_mem.h
      - copied unchanged from r61661, trunk/main/minimime/mm_mem.h
    team/oej/videocaps/main/minimime/mm_mimepart.c
      - copied unchanged from r61661, trunk/main/minimime/mm_mimepart.c
    team/oej/videocaps/main/minimime/mm_mimeutil.c
      - copied unchanged from r61661, trunk/main/minimime/mm_mimeutil.c
    team/oej/videocaps/main/minimime/mm_param.c
      - copied unchanged from r61661, trunk/main/minimime/mm_param.c
    team/oej/videocaps/main/minimime/mm_parse.c
      - copied unchanged from r61661, trunk/main/minimime/mm_parse.c
    team/oej/videocaps/main/minimime/mm_queue.h
      - copied unchanged from r61661, trunk/main/minimime/mm_queue.h
    team/oej/videocaps/main/minimime/mm_util.c
      - copied unchanged from r61661, trunk/main/minimime/mm_util.c
    team/oej/videocaps/main/minimime/mm_util.h
      - copied unchanged from r61661, trunk/main/minimime/mm_util.h
    team/oej/videocaps/main/minimime/mm_warnings.c
      - copied unchanged from r61661, trunk/main/minimime/mm_warnings.c
    team/oej/videocaps/main/minimime/strlcat.c
      - copied unchanged from r61661, trunk/main/minimime/strlcat.c
    team/oej/videocaps/main/minimime/strlcpy.c
      - copied unchanged from r61661, trunk/main/minimime/strlcpy.c
    team/oej/videocaps/main/minimime/sys/
      - copied from r61661, trunk/main/minimime/sys/
    team/oej/videocaps/main/minimime/sys/mm_queue.h
      - copied unchanged from r61661, trunk/main/minimime/sys/mm_queue.h
    team/oej/videocaps/main/minimime/test.sh
      - copied unchanged from r61661, trunk/main/minimime/test.sh
    team/oej/videocaps/main/minimime/tests/
      - copied from r61661, trunk/main/minimime/tests/
    team/oej/videocaps/main/minimime/tests/Makefile
      - copied unchanged from r61661, trunk/main/minimime/tests/Makefile
    team/oej/videocaps/main/minimime/tests/create.c
      - copied unchanged from r61661, trunk/main/minimime/tests/create.c
    team/oej/videocaps/main/minimime/tests/messages/
      - copied from r61661, trunk/main/minimime/tests/messages/
    team/oej/videocaps/main/minimime/tests/messages/test1.txt
      - copied unchanged from r61661, trunk/main/minimime/tests/messages/test1.txt
    team/oej/videocaps/main/minimime/tests/messages/test2.txt
      - copied unchanged from r61661, trunk/main/minimime/tests/messages/test2.txt
    team/oej/videocaps/main/minimime/tests/messages/test3.txt
      - copied unchanged from r61661, trunk/main/minimime/tests/messages/test3.txt
    team/oej/videocaps/main/minimime/tests/messages/test4.txt
      - copied unchanged from r61661, trunk/main/minimime/tests/messages/test4.txt
    team/oej/videocaps/main/minimime/tests/messages/test5.txt
      - copied unchanged from r61661, trunk/main/minimime/tests/messages/test5.txt
    team/oej/videocaps/main/minimime/tests/messages/test6.txt
      - copied unchanged from r61661, trunk/main/minimime/tests/messages/test6.txt
    team/oej/videocaps/main/minimime/tests/messages/test7.txt
      - copied unchanged from r61661, trunk/main/minimime/tests/messages/test7.txt
    team/oej/videocaps/main/minimime/tests/parse.c
      - copied unchanged from r61661, trunk/main/minimime/tests/parse.c
    team/oej/videocaps/pbx/ael/ael-test/ael-test18/
      - copied from r61661, trunk/pbx/ael/ael-test/ael-test18/
    team/oej/videocaps/pbx/ael/ael-test/ael-test18/extensions.ael
      - copied unchanged from r61661, trunk/pbx/ael/ael-test/ael-test18/extensions.ael
    team/oej/videocaps/pbx/ael/ael-test/ael-test19/
      - copied from r61661, trunk/pbx/ael/ael-test/ael-test19/
    team/oej/videocaps/pbx/ael/ael-test/ael-test19/extensions.ael
      - copied unchanged from r61661, trunk/pbx/ael/ael-test/ael-test19/extensions.ael
    team/oej/videocaps/pbx/ael/ael-test/ref.ael-test18
      - copied unchanged from r61661, trunk/pbx/ael/ael-test/ref.ael-test18
    team/oej/videocaps/pbx/ael/ael-test/ref.ael-test19
      - copied unchanged from r61661, trunk/pbx/ael/ael-test/ref.ael-test19
    team/oej/videocaps/res/res_config_sqlite.c
      - copied unchanged from r61661, trunk/res/res_config_sqlite.c
Removed:
    team/oej/videocaps/doc/00README.1st
    team/oej/videocaps/doc/ael.txt
    team/oej/videocaps/doc/ajam.txt
    team/oej/videocaps/doc/app-sms.txt
    team/oej/videocaps/doc/apps.txt
    team/oej/videocaps/doc/asterisk-conf.txt
    team/oej/videocaps/doc/billing.txt
    team/oej/videocaps/doc/callingpres.txt
    team/oej/videocaps/doc/cdrdriver.txt
    team/oej/videocaps/doc/chaniax.txt
    team/oej/videocaps/doc/channels.txt
    team/oej/videocaps/doc/channelvariables.txt
    team/oej/videocaps/doc/cliprompt.txt
    team/oej/videocaps/doc/configuration.txt
    team/oej/videocaps/doc/cygwin.txt
    team/oej/videocaps/doc/dundi.txt
    team/oej/videocaps/doc/enum.txt
    team/oej/videocaps/doc/extconfig.txt
    team/oej/videocaps/doc/extensions.txt
    team/oej/videocaps/doc/freetds.txt
    team/oej/videocaps/doc/h323.txt
    team/oej/videocaps/doc/hardware.txt
    team/oej/videocaps/doc/iax.txt
    team/oej/videocaps/doc/ices.txt
    team/oej/videocaps/doc/imapstorage.txt
    team/oej/videocaps/doc/ip-tos.txt
    team/oej/videocaps/doc/jitterbuffer.txt
    team/oej/videocaps/doc/localchannel.txt
    team/oej/videocaps/doc/manager.txt
    team/oej/videocaps/doc/math.txt
    team/oej/videocaps/doc/misdn.txt
    team/oej/videocaps/doc/model.txt
    team/oej/videocaps/doc/mp3.txt
    team/oej/videocaps/doc/musiconhold-fpm.txt
    team/oej/videocaps/doc/mysql.txt
    team/oej/videocaps/doc/odbcstorage.txt
    team/oej/videocaps/doc/privacy.txt
    team/oej/videocaps/doc/queuelog.txt
    team/oej/videocaps/doc/queues-with-callback-members.txt
    team/oej/videocaps/doc/radius.txt
    team/oej/videocaps/doc/realtime.txt
    team/oej/videocaps/doc/security.txt
    team/oej/videocaps/doc/sla.txt
Modified:
    team/oej/videocaps/   (props changed)
    team/oej/videocaps/.cleancount
    team/oej/videocaps/CHANGES
    team/oej/videocaps/Makefile
    team/oej/videocaps/Makefile.moddir_rules
    team/oej/videocaps/Makefile.rules
    team/oej/videocaps/UPGRADE.txt
    team/oej/videocaps/acinclude.m4
    team/oej/videocaps/apps/   (props changed)
    team/oej/videocaps/apps/Makefile
    team/oej/videocaps/apps/app_amd.c
    team/oej/videocaps/apps/app_cdr.c
    team/oej/videocaps/apps/app_dial.c
    team/oej/videocaps/apps/app_directory.c
    team/oej/videocaps/apps/app_dumpchan.c
    team/oej/videocaps/apps/app_festival.c
    team/oej/videocaps/apps/app_followme.c
    team/oej/videocaps/apps/app_ices.c
    team/oej/videocaps/apps/app_macro.c
    team/oej/videocaps/apps/app_meetme.c
    team/oej/videocaps/apps/app_osplookup.c
    team/oej/videocaps/apps/app_page.c
    team/oej/videocaps/apps/app_queue.c
    team/oej/videocaps/apps/app_record.c
    team/oej/videocaps/apps/app_speech_utils.c
    team/oej/videocaps/apps/app_stack.c
    team/oej/videocaps/apps/app_voicemail.c
    team/oej/videocaps/apps/app_while.c
    team/oej/videocaps/build_tools/cflags.xml
    team/oej/videocaps/build_tools/make_buildopts_h
    team/oej/videocaps/build_tools/make_version_h
    team/oej/videocaps/build_tools/menuselect-deps.in
    team/oej/videocaps/build_tools/prep_tarball
    team/oej/videocaps/cdr/   (props changed)
    team/oej/videocaps/cdr/cdr_odbc.c
    team/oej/videocaps/cdr/cdr_pgsql.c
    team/oej/videocaps/cdr/cdr_radius.c
    team/oej/videocaps/cdr/cdr_sqlite.c
    team/oej/videocaps/channels/   (props changed)
    team/oej/videocaps/channels/chan_agent.c
    team/oej/videocaps/channels/chan_alsa.c
    team/oej/videocaps/channels/chan_features.c
    team/oej/videocaps/channels/chan_gtalk.c
    team/oej/videocaps/channels/chan_h323.c
    team/oej/videocaps/channels/chan_iax2.c
    team/oej/videocaps/channels/chan_jingle.c
    team/oej/videocaps/channels/chan_local.c
    team/oej/videocaps/channels/chan_mgcp.c
    team/oej/videocaps/channels/chan_misdn.c
    team/oej/videocaps/channels/chan_nbs.c
    team/oej/videocaps/channels/chan_oss.c
    team/oej/videocaps/channels/chan_phone.c
    team/oej/videocaps/channels/chan_sip.c
    team/oej/videocaps/channels/chan_skinny.c
    team/oej/videocaps/channels/chan_vpb.cc
    team/oej/videocaps/channels/chan_zap.c
    team/oej/videocaps/channels/iax2-parser.c
    team/oej/videocaps/channels/misdn/Makefile
    team/oej/videocaps/channels/misdn/chan_misdn_config.h
    team/oej/videocaps/channels/misdn/isdn_lib.c
    team/oej/videocaps/channels/misdn/isdn_lib.h
    team/oej/videocaps/channels/misdn_config.c
    team/oej/videocaps/codecs/   (props changed)
    team/oej/videocaps/codecs/codec_speex.c
    team/oej/videocaps/codecs/codec_zap.c
    team/oej/videocaps/configs/cdr.conf.sample
    team/oej/videocaps/configs/cdr_custom.conf.sample
    team/oej/videocaps/configs/dundi.conf.sample
    team/oej/videocaps/configs/extconfig.conf.sample
    team/oej/videocaps/configs/extensions.conf.sample
    team/oej/videocaps/configs/http.conf.sample
    team/oej/videocaps/configs/manager.conf.sample
    team/oej/videocaps/configs/sip.conf.sample
    team/oej/videocaps/configs/sip_notify.conf.sample
    team/oej/videocaps/configs/skinny.conf.sample
    team/oej/videocaps/configs/sla.conf.sample
    team/oej/videocaps/configs/voicemail.conf.sample
    team/oej/videocaps/configs/zapata.conf.sample
    team/oej/videocaps/configure
    team/oej/videocaps/configure.ac
    team/oej/videocaps/contrib/asterisk-ng-doxygen
    team/oej/videocaps/doc/PEERING
    team/oej/videocaps/doc/modules.txt
    team/oej/videocaps/doc/osp.txt
    team/oej/videocaps/doc/rtp-packetization.txt
    team/oej/videocaps/formats/   (props changed)
    team/oej/videocaps/formats/format_wav.c
    team/oej/videocaps/funcs/   (props changed)
    team/oej/videocaps/funcs/func_channel.c
    team/oej/videocaps/funcs/func_curl.c
    team/oej/videocaps/funcs/func_devstate.c
    team/oej/videocaps/funcs/func_realtime.c
    team/oej/videocaps/funcs/func_strings.c
    team/oej/videocaps/include/asterisk.h
    team/oej/videocaps/include/asterisk/ael_structs.h
    team/oej/videocaps/include/asterisk/autoconfig.h.in
    team/oej/videocaps/include/asterisk/cdr.h
    team/oej/videocaps/include/asterisk/channel.h
    team/oej/videocaps/include/asterisk/compat.h
    team/oej/videocaps/include/asterisk/config.h
    team/oej/videocaps/include/asterisk/dial.h
    team/oej/videocaps/include/asterisk/doxyref.h
    team/oej/videocaps/include/asterisk/frame.h
    team/oej/videocaps/include/asterisk/http.h
    team/oej/videocaps/include/asterisk/jabber.h
    team/oej/videocaps/include/asterisk/jingle.h
    team/oej/videocaps/include/asterisk/manager.h
    team/oej/videocaps/include/asterisk/module.h
    team/oej/videocaps/include/asterisk/options.h
    team/oej/videocaps/include/asterisk/pbx.h
    team/oej/videocaps/include/asterisk/rtp.h
    team/oej/videocaps/include/asterisk/speech.h
    team/oej/videocaps/include/asterisk/utils.h
    team/oej/videocaps/include/asterisk/zapata.h
    team/oej/videocaps/main/Makefile
    team/oej/videocaps/main/app.c
    team/oej/videocaps/main/ast_expr2.fl
    team/oej/videocaps/main/ast_expr2f.c
    team/oej/videocaps/main/asterisk.c
    team/oej/videocaps/main/callerid.c
    team/oej/videocaps/main/cdr.c
    team/oej/videocaps/main/channel.c
    team/oej/videocaps/main/cli.c
    team/oej/videocaps/main/config.c
    team/oej/videocaps/main/db.c
    team/oej/videocaps/main/dial.c
    team/oej/videocaps/main/dsp.c
    team/oej/videocaps/main/file.c
    team/oej/videocaps/main/http.c
    team/oej/videocaps/main/loader.c
    team/oej/videocaps/main/logger.c
    team/oej/videocaps/main/manager.c
    team/oej/videocaps/main/netsock.c
    team/oej/videocaps/main/pbx.c
    team/oej/videocaps/main/rtp.c
    team/oej/videocaps/main/say.c
    team/oej/videocaps/main/sched.c
    team/oej/videocaps/main/slinfactory.c
    team/oej/videocaps/main/strcompat.c
    team/oej/videocaps/makeopts.in
    team/oej/videocaps/pbx/   (props changed)
    team/oej/videocaps/pbx/ael/ael-test/ref.ael-test2
    team/oej/videocaps/pbx/ael/ael-test/ref.ael-test3
    team/oej/videocaps/pbx/ael/ael-test/ref.ael-test4
    team/oej/videocaps/pbx/ael/ael-test/ref.ael-test6
    team/oej/videocaps/pbx/ael/ael-test/ref.ael-test7
    team/oej/videocaps/pbx/ael/ael-test/ref.ael-vtest13
    team/oej/videocaps/pbx/ael/ael-test/ref.ael-vtest17
    team/oej/videocaps/pbx/ael/ael.flex
    team/oej/videocaps/pbx/ael/ael_lex.c
    team/oej/videocaps/pbx/pbx_ael.c
    team/oej/videocaps/pbx/pbx_config.c
    team/oej/videocaps/pbx/pbx_dundi.c
    team/oej/videocaps/res/   (props changed)
    team/oej/videocaps/res/res_crypto.c
    team/oej/videocaps/res/res_features.c
    team/oej/videocaps/res/res_jabber.c
    team/oej/videocaps/res/res_limit.c
    team/oej/videocaps/res/res_monitor.c
    team/oej/videocaps/res/res_odbc.c
    team/oej/videocaps/res/res_snmp.c
    team/oej/videocaps/res/res_speech.c
    team/oej/videocaps/sounds/Makefile
    team/oej/videocaps/utils/Makefile
    team/oej/videocaps/utils/ael_main.c

Propchange: team/oej/videocaps/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/oej/videocaps/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/oej/videocaps/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/oej/videocaps/
------------------------------------------------------------------------------
    svnmerge-blocked = /branches/1.4:61042,61044

Modified: team/oej/videocaps/.cleancount
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/.cleancount?view=diff&rev=61662&r1=61661&r2=61662
==============================================================================
--- team/oej/videocaps/.cleancount (original)
+++ team/oej/videocaps/.cleancount Mon Apr 16 07:58:41 2007
@@ -1,1 +1,1 @@
-29
+30

Modified: team/oej/videocaps/CHANGES
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/CHANGES?view=diff&rev=61662&r1=61661&r2=61662
==============================================================================
--- team/oej/videocaps/CHANGES (original)
+++ team/oej/videocaps/CHANGES Mon Apr 16 07:58:41 2007
@@ -1,9 +1,11 @@
-Changes since Asterisk 1.4-beta was branched:
+-------------------------------------------------------------------------------
+--- Functionality changes since Asterisk 1.4-beta was branched ----------------
+-------------------------------------------------------------------------------
+
+Miscellaneous 
+-------------
+
   * Added the bindaddr option to gtalk.conf.
-  * Added the ability to specify arguments to the Dial application when using
-    the DUNDi switch in the dialplan.
-  * Added the ability to customize which sound files are used for some of the
-    prompts within the Voicemail application by changing them in voicemail.conf
   * Argument support for Gosub application
   * Ability to set process limits without restarting Asterisk
   * SS7 support in chan_zap (via libss7 library)
@@ -61,6 +63,11 @@
   * Added 'o' and 'X' options to Chanspy.
   * Added the parkedcallreparking option to features.conf
   * SMDI is now enabled in voicemail using the smdienable option.
+  * Added zap show version CLI command to chan_zap.
+  * Added a new CDR module, cdr_sqlite3_custom.
+  * Added a new realtime configuration module, res_config_sqlite
+  * Added a new dialplan application, Bridge, which allows you to bridge the
+    calling channel to any other active channel on the system.
 
 AMI - The manager (TCP/TLS/HTTP)
 --------------------------------
@@ -69,12 +76,21 @@
      CallerIDNum is used for number and CallerIDName for name.
   * enable https support for builtin web server.
      See configs/http.conf.sample for details.
+  * Added a new action, GetConfigJSON, which can return the contents of an
+    Asterisk configuration file in JSON format.  This is intended to help
+    improve the performance of AJAX applications using the manager interface
+    over HTTP.
+  * SIP and IAX manager events now use "ChannelType" in all cases where we 
+    indicate channel driver. Previously, we used a mixture of "Channel"
+    and "ChannelDriver" headers.
+  * Added a "Bridge" action which allows you to bridge any two channels that
+    are currently active on the system.
 
 Dialplan functions
 ------------------
   * Added the DEVSTATE() dialplan function which allows retrieving any device
     state in the dialplan, as well as creating custom device states that are
-	controllable from the dialplan.
+    controllable from the dialplan.
   * Extend CALLERID() function with "pres" and "ton" parameters to
      fetch string representation of calling number presentation indicator
      and numeric representation of type of calling number value.
@@ -89,18 +105,34 @@
 -----------
   * The default SIP useragent= identifier now includes the Asterisk version
   * A new option, match_auth_username in sip.conf changes the matching of incoming requests.
-    If set, and the incoming request carries authentication info,
-    the username to match in the users list is taken from the Digest header
-    rather than from the From: field. This feature is considered experimental.
+     If set, and the incoming request carries authentication info,
+     the username to match in the users list is taken from the Digest header
+     rather than from the From: field. This feature is considered experimental.
   * The "musiconhold" and "musicclass" settings in sip.conf are now removed,
-    since they where replaced by "mohsuggest" and "mohinterpret" in version 1.4
+     since they where replaced by "mohsuggest" and "mohinterpret" in version 1.4
   * The "localmask" setting was removed in version 1.2 and the reminder about it
-    being removed is now also removed.
+     being removed is now also removed.
   * A new option "busy-level" for setting a level of calls where asterisk reports
-    a device as busy, to separate it from call-limit
+     a device as busy, to separate it from call-limit
   * A new realtime family called "sipregs" is now supported to store SIP registration
-    data. If this family is defined, "sippeers" will be used for configuration and
-    "sipregs" for registrations. If it's not defined, "sippeers" will be used for
-    registration data, as before.
+     data. If this family is defined, "sippeers" will be used for configuration and
+     "sipregs" for registrations. If it's not defined, "sippeers" will be used for
+     registration data, as before.
   * The SIPPEER function have new options for port address, call and pickup groups
   * Added support for T.140 realtime text in SIP/RTP
+
+DUNDi changes
+-------------
+  * Added the ability to specify arguments to the Dial application when using
+     the DUNDi switch in the dialplan.
+  * Added the ability to set weights for responses dynamically.  This can be
+     done using a global variable or a dialplan function.  Using the SHELL()
+     function would allow you to have an external script set the weight for
+     each response.
+
+Voicemail Changes
+-----------------
+  * Added the ability to customize which sound files are used for some of the
+     prompts within the Voicemail application by changing them in voicemail.conf
+  * Added the ability for the "voicemail show users" CLI command to show users
+    configured by the dynamic realtime configuration method.

Modified: team/oej/videocaps/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/Makefile?view=diff&rev=61662&r1=61661&r2=61662
==============================================================================
--- team/oej/videocaps/Makefile (original)
+++ team/oej/videocaps/Makefile Mon Apr 16 07:58:41 2007
@@ -46,6 +46,7 @@
 export ASTCONFPATH
 export NOISY_BUILD
 export MENUSELECT_CFLAGS
+export AST_DEVMODE
 export CC
 export CXX
 export AR
@@ -63,6 +64,8 @@
 export NCURSES_DIR
 export TERMCAP_DIR
 export TINFO_DIR
+export GTK2_LIB
+export GTK2_INCLUDE
 
 # even though we could use '-include makeopts' here, use a wildcard
 # lookup anyway, so that make won't try to build makeopts if it doesn't
@@ -673,14 +676,42 @@
 
 menuconfig: menuselect
 
+gmenuconfig: gmenuselect
+
 menuselect: menuselect/menuselect menuselect-tree
 	- at menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
 
+gmenuselect: menuselect/gmenuselect menuselect-tree
+	- at menuselect/gmenuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
+
 menuselect/menuselect: makeopts menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
 	@CC="$(HOST_CC)" LD="" AR="" RANLIB="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
+
+menuselect/gmenuselect: makeopts menuselect/menuselect.c menuselect/menuselect_gtk.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
+	@CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" $(MAKE) -C menuselect _gmenuselect CONFIGURE_SILENT="--silent"
 
 menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml
 	@echo "Generating input for menuselect ..."
 	@build_tools/prep_moduledeps > $@
 
-.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)
+asterisk.pdf: doc/asterisk.pdf
+
+doc/asterisk.pdf: $(wildcard doc/*.tex)
+ifeq ($(findstring rubber,$(RUBBER)),)
+	@echo "**********************************************"
+	@echo "** You must install the \"rubber\" tool      ***"
+	@echo "** to generate the Asterisk reference PDF. ***"
+	@echo "**********************************************"
+else
+	@echo "**********************************************"
+	@echo "** The Asterisk reference PDF will now be  ***"
+	@echo "** generated.  When complete, it will be   ***"
+	@echo "** located at doc/asterisk.pdf.            ***"	
+	@echo "**********************************************"
+	@cp doc/asterisk.tex doc/asterisk.tex.orig
+	@sed -i -e 's/ASTERISKVERSION/$(ASTERISKVERSION)/' doc/asterisk.tex
+	@cd doc && $(RUBBER) --pdf asterisk.tex
+	@mv doc/asterisk.tex.orig doc/asterisk.tex
+endif
+
+.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) menuselect.makeopts

Modified: team/oej/videocaps/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/Makefile.moddir_rules?view=diff&rev=61662&r1=61661&r2=61662
==============================================================================
--- team/oej/videocaps/Makefile.moddir_rules (original)
+++ team/oej/videocaps/Makefile.moddir_rules Mon Apr 16 07:58:41 2007
@@ -12,7 +12,9 @@
 #
 
 ifneq ($(findstring MALLOC_DEBUG,$(MENUSELECT_CFLAGS)),)
+ ifeq ($(findstring astmm.h,$(ASTCFLAGS)),)
   ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/astmm.h
+ endif
 endif
 
 ifeq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)
@@ -34,11 +36,13 @@
 $(LOADABLE_MODS:%=%.so): LIBS+=$(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_LIB))
 $(LOADABLE_MODS:%=%.so): ASTLDFLAGS+=$(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_LDFLAGS))
 
+$(EMBEDDED_MODS:%=%.o): ASTCFLAGS+=-DEMBEDDED_MODULE=$*
+
 $(addsuffix .so,$(filter $(LOADABLE_MODS),$(C_MODS))): %.so: %.o
 $(addsuffix .so,$(filter $(LOADABLE_MODS),$(CC_MODS))): %.so: %.oo
 
-modules.link: $(addsuffix .o,$(filter $(EMBEDDED_MODS),$(C_MODS)))
-modules.link: $(addsuffix .oo,$(filter $(EMBEDDED_MODS),$(CC_MODS)))
+modules.link: $(addsuffix .eo,$(filter $(EMBEDDED_MODS),$(C_MODS)))
+modules.link: $(addsuffix .eoo,$(filter $(EMBEDDED_MODS),$(CC_MODS)))
 
 .PHONY: clean uninstall _all
 
@@ -64,11 +68,11 @@
 
 modules.link:
 	@rm -f $@
-	@for file in $(patsubst %,$(SUBDIR)/%,$(filter %.o,$^)); do echo "INPUT (../$${file})" >> $@; done
-	@for file in $(patsubst %,$(SUBDIR)/%,$(filter-out %.o,$^)); do echo "INPUT (../$${file})" >> $@; done
+	@for file in $(patsubst %,$(SUBDIR)/%,$(filter %.eo %.eoo,$^)); do echo "INPUT (../$${file})" >> $@; done
+	@for file in $(patsubst %,$(SUBDIR)/%,$(filter-out %.eo %.eoo,$^)); do echo "INPUT (../$${file})" >> $@; done
 
 clean::
-	rm -f *.so *.o *.oo
+	rm -f *.so *.o *.oo *.eo *.eoo
 	rm -f .*.o.d .*.oo.d
 	rm -f modules.link
 

Modified: team/oej/videocaps/Makefile.rules
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/Makefile.rules?view=diff&rev=61662&r1=61661&r2=61662
==============================================================================
--- team/oej/videocaps/Makefile.rules (original)
+++ team/oej/videocaps/Makefile.rules Mon Apr 16 07:58:41 2007
@@ -44,6 +44,22 @@
 	$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS)
 endif
 
+%.o: %.i
+	$(ECHO_PREFIX) echo "   [CC] $< -> $@"
+ifeq ($(AST_DEVMODE),yes)
+	$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
+else
+	$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS)
+endif
+
+%.i: %.c
+	$(ECHO_PREFIX) echo "   [CC] $< -> $@"
+ifeq ($(AST_DEVMODE),yes)
+	$(CMD_PREFIX) $(CC) -o $@ -E $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
+else
+	$(CMD_PREFIX) $(CC) -o $@ -E $< $(PTHREAD_CFLAGS) $(ASTCFLAGS)
+endif
+
 %.o: %.s
 	$(ECHO_PREFIX) echo "   [AS] $< -> $@"
 ifeq ($(AST_DEVMODE),yes)
@@ -76,6 +92,18 @@
 	$(ECHO_PREFIX) echo "   [LDXX] $^ -> $@"
 	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $^ $(PTHREAD_LIBS) $(LIBS)
 
+%.eo: %.o
+	$(ECHO_PREFIX) echo "   [EMBED] $< -> $@"
+	$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/make_linker_eo_script $* > .$@.ld
+	$(CMD_PREFIX) $(LD) -r -T .$@.ld -o $@ $<
+	$(CMD_PREFIX) rm -f .$@.ld
+
+%.eoo: %.o
+	$(ECHO_PREFIX) echo "   [EMBED] $< -> $@"
+	$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/make_linker_eo_script $* > .$@.ld
+	$(CMD_PREFIX) $(LD) -r -T .$@.ld -o $@ $<
+	$(CMD_PREFIX) rm -f .$@.ld
+
 %: %.o
 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
 	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $^ $(PTHREAD_LIBS) $(LIBS)

Modified: team/oej/videocaps/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/UPGRADE.txt?view=diff&rev=61662&r1=61661&r2=61662
==============================================================================
--- team/oej/videocaps/UPGRADE.txt (original)
+++ team/oej/videocaps/UPGRADE.txt Mon Apr 16 07:58:41 2007
@@ -36,3 +36,17 @@
   performs mostly a 'ChanExists' sort of function.
 * SetCallerPres() has been replaced with the CALLERPRES() dialplan function
   and is now deprecated.
+
+CDR:
+
+* The cdr_sqlite module has been marked as deprecated in favor of
+  cdr_sqlite3_custom.  It will potentially be removed from the tree
+  after Asterisk 1.6 is released.
+
+Formats:
+
+* format_wav: The GAIN preprocessor definition and source code that used it
+  is removed.  This change was made in response to user complaints of
+  choppiness or the clipping of loud signal peaks.  To increasing the volume
+  of voicemail messages, use the 'volgain' option in voicemail.conf
+

Modified: team/oej/videocaps/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/acinclude.m4?view=diff&rev=61662&r1=61661&r2=61662
==============================================================================
--- team/oej/videocaps/acinclude.m4 (original)
+++ team/oej/videocaps/acinclude.m4 Mon Apr 16 07:58:41 2007
@@ -568,7 +568,7 @@
 fi
 if test "x$ac_cv_func_fork_works" = xcross; then
   case $host in
-    *-*-amigaos* | *-*-msdosdjgpp* | *-*-uclinux* )
+    *-*-amigaos* | *-*-msdosdjgpp* | *-*-uclinux* | *-*-linux-uclibc* )
       # Override, as these systems have only a dummy fork() stub
       ac_cv_func_fork_works=no
       ;;

Propchange: team/oej/videocaps/apps/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Apr 16 07:58:41 2007
@@ -2,3 +2,5 @@
 *.a
 *.so
 modules.link
+*.eo
+*.eoo

Modified: team/oej/videocaps/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/apps/Makefile?view=diff&rev=61662&r1=61661&r2=61662
==============================================================================
--- team/oej/videocaps/apps/Makefile (original)
+++ team/oej/videocaps/apps/Makefile Mon Apr 16 07:58:41 2007
@@ -21,11 +21,14 @@
   LOADABLE_MODS:=
 endif
 
+MENUSELECT_OPTS_app_directory:=$(MENUSELECT_OPTS_app_voicemail)
 ifneq ($(findstring ODBC_STORAGE,$(MENUSELECT_OPTS_app_voicemail)),)
 MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_ODBC_STORAGE)
+MENUSELECT_DEPENDS_app_directory+=$(MENUSELECT_DEPENDS_ODBC_STORAGE)
 endif
 ifneq ($(findstring IMAP_STORAGE,$(MENUSELECT_OPTS_app_voicemail)),)
 MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_IMAP_STORAGE)
+MENUSELECT_DEPENDS_app_directory+=$(MENUSELECT_DEPENDS_IMAP_STORAGE)
 endif
 
 ifeq (SunOS,$(shell uname))

Modified: team/oej/videocaps/apps/app_amd.c
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/apps/app_amd.c?view=diff&rev=61662&r1=61661&r2=61662
==============================================================================
--- team/oej/videocaps/apps/app_amd.c (original)
+++ team/oej/videocaps/apps/app_amd.c Mon Apr 16 07:58:41 2007
@@ -18,6 +18,14 @@
  * A license has been granted to Digium (via disclaimer) for the use of
  * this code.
  */
+
+/*! \file
+ *
+ * \brief Answering machine detection
+ *
+ * \author Claude Klimos (claude.klimos at aheeva.com)
+ */
+
 
 #include "asterisk.h"
  

Modified: team/oej/videocaps/apps/app_cdr.c
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/apps/app_cdr.c?view=diff&rev=61662&r1=61661&r2=61662
==============================================================================
--- team/oej/videocaps/apps/app_cdr.c (original)
+++ team/oej/videocaps/apps/app_cdr.c Mon Apr 16 07:58:41 2007
@@ -51,8 +51,7 @@
 	u = ast_module_user_add(chan);
 
 	if (chan->cdr) {
-		ast_cdr_free(chan->cdr);
-		chan->cdr = NULL;
+		ast_set_flag(chan->cdr, AST_CDR_FLAG_POST_DISABLED);
 	}
 
 	ast_module_user_remove(u);

Modified: team/oej/videocaps/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/apps/app_dial.c?view=diff&rev=61662&r1=61661&r2=61662
==============================================================================
--- team/oej/videocaps/apps/app_dial.c (original)
+++ team/oej/videocaps/apps/app_dial.c Mon Apr 16 07:58:41 2007
@@ -92,7 +92,10 @@
 "ends the call.\n"
 "  The optional URL will be sent to the called party if the channel supports it.\n"
 "  If the OUTBOUND_GROUP variable is set, all peer channels created by this\n"
-"application will be put into that group (as in Set(GROUP()=...).\n\n"
+"application will be put into that group (as in Set(GROUP()=...).\n"
+"  If the OUTBOUND_GROUP_ONCE variable is set, all peer channels created by this\n"
+"application will be put into that group (as in Set(GROUP()=...). Unlike OUTBOUND_GROUP,\n"
+"however, the variable will be unset after use.\n\n"
 "  Options:\n"
 "    A(x) - Play an announcement to the called party, using 'x' as the file.\n"
 "    C    - Reset the CDR for this call.\n"
@@ -238,7 +241,7 @@
 	OPT_CALLEE_PARK =	(1 << 25),
 	OPT_CALLER_PARK =	(1 << 26),
 	OPT_IGNORE_FORWARDING = (1 << 27),
-} dial_exec_option_flags;
+};
 
 #define DIAL_STILLGOING			(1 << 30)
 #define DIAL_NOFORWARDHTML		(1 << 31)
@@ -255,7 +258,7 @@
 	OPT_ARG_OPERMODE,
 	/* note: this entry _MUST_ be the last one in the enum */
 	OPT_ARG_ARRAY_SIZE,
-} dial_exec_option_args;
+};
 
 AST_APP_OPTIONS(dial_exec_options, {
 	AST_APP_OPTION_ARG('A', OPT_ANNOUNCE, OPT_ARG_ANNOUNCE),
@@ -428,6 +431,7 @@
 	struct cause_args *num, struct ast_flags *peerflags, int single)
 {
 	char tmpchan[256];
+	struct ast_channel *original = o->chan;
 	struct ast_channel *c = o->chan; /* the winner */
 	struct ast_channel *in = num->chan; /* the input channel */
 	char *stuff;
@@ -458,12 +462,13 @@
 		} else {
 			/* Setup parameters */
 			c = o->chan = ast_request(tech, in->nativeformats, stuff, &cause);
-			if (!c)
-				ast_log(LOG_NOTICE, "Unable to create local channel for call forward to '%s/%s' (cause = %d)\n", tech, stuff, cause);
-			else {
+			if (c) {
+				if (single)
+					ast_channel_make_compatible(o->chan, in);
 				ast_channel_inherit_variables(in, o->chan);
 				ast_set_capabilities(o->chan, &in->channelcaps);
-			}
+			} else
+				ast_log(LOG_NOTICE, "Unable to create local channel for call forward to '%s/%s' (cause = %d)\n", tech, stuff, cause);
 		}
 	} else {

[... 34771 lines stripped ...]


More information about the svn-commits mailing list