Changeset 28128


Ignore:
Timestamp:
2011-08-30T02:22:55+02:00 (5 years ago)
Author:
mazilo
Message:

updated to latest git version, added HU lang support, and minor fixes to the Makefile

Location:
packages/net/freeswitch
Files:
19 added
9 edited

Legend:

Unmodified
Added
Removed
  • packages/net/freeswitch/Makefile

    r27928 r28128  
    1212PKG_VERSION:=1.0.7 
    1313PKG_RELEASE:=1 
    14 PKG_REV:=46f097c1b94f43e5dad2c0b9592e921ae6933665 
     14 
     15 
     16# 
     17# The latest FS git hash in PKG_REV can be obtained from http://fisheye.freeswitch.org 
     18# 
     19PKG_REV:=f697e5aa37e0aae56ce7d07ce74080fe809ddf25 
    1520PKG_SOURCE_VERSION:=$(PKG_REV) 
    16  
    17  
    18 # 
    19 # The latest FS git hash in PKG_REV can be obtained from http://fisheye.freeswitch.org 
    20 # 
    2121PKG_SOURCE_PROTO:=git 
    2222PKG_SOURCE_URL:=git://git.$(PKG_NAME).org/$(PKG_NAME).git 
    2323PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) 
    24 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_git-$(shell echo $(PKG_REV)|cut -b -9).tar.bz2 
     24PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)_git-$(shell echo $(PKG_REV)|cut -b -9).tar.bz2 
    2525PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) 
    2626 
     
    142142 
    143143PKG_CONFIG_DEPENDS:= \ 
     144        CONFIG_FS_SOFIA_WITH_GNUTLS \ 
     145        CONFIG_FS_SOFIA_WITH_IPV6 \ 
    144146        CONFIG_FS_SOFIA_WITH_ODBC \ 
     147        CONFIG_FS_SOFIA_WITH_OPT \ 
     148        CONFIG_FS_SOFIA_WITH_SCTP \ 
     149        CONFIG_FS_SOFIA_WITH_ZRTP_GIT \ 
     150        CONFIG_FS_SOFIA_WITHOUT_MYSQL \ 
    145151        $(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-mod-%,$(FS_MOD_AVAILABLE)) \ 
    146152 
     
    162168$(call Package/$(PKG_NAME)/Default) 
    163169  TITLE:=FreeSWITCH open source telephony platform 
    164   DEPENDS:= +libopenssl +libreadline +libncurses +libpthread +libstdcpp 
     170  DEPENDS:= +libreadline +libncurses +libpthread +libstdcpp 
    165171  MENU:=1 
    166172endef 
     
    175181 
    176182define Package/$(PKG_NAME)/config 
     183    config FS_SOFIA_WITH_IPV6 
     184    depends on PACKAGE_$(PKG_NAME) 
     185    bool "Compile with IPV6 support" 
     186    default y 
     187    help 
     188            Compile $(PKG_NAME) with IPV6 Support. 
     189 
     190    config FS_SOFIA_WITH_OPT 
     191    depends on PACKAGE_$(PKG_NAME) 
     192    bool "Compile with optimization" 
     193    default y 
     194    help 
     195            Compile $(PKG_NAME) with optimization enabled. 
     196 
     197    config FS_SOFIA_WITHOUT_MYSQL 
     198    depends on PACKAGE_$(PKG_NAME) 
     199    bool "Compile without MySQL" 
     200    default y 
     201    help 
     202            Compile $(PKG_NAME) without MySQL. 
     203endef 
     204 
     205 
     206define Package/$(PKG_NAME)-mod-dingaling/config 
     207    config FS_SOFIA_WITH_GNUTLS 
     208    depends on PACKAGE_$(PKG_NAME)-mod-dingaling 
     209    bool "Compile with GNU TLS (Requires libgnutls-openssl)" 
     210    default y 
     211    select PACKAGE_libgnutls-openssl 
     212    help 
     213            Compile $(PKG_NAME)-mod-dingaling with GNU TLS Support (Requires libgnutls-openssl package). 
     214endef 
     215 
     216 
     217define Package/$(PKG_NAME)-mod-sofia/config 
    177218    config FS_SOFIA_WITH_ODBC 
    178     depends on PACKAGE_$(PKG_NAME) 
    179     bool "Compile $(PKG_NAME)-mod-sofia with ODBC support (Requires unixodbc_svn)" 
     219    depends on PACKAGE_$(PKG_NAME)-mod-sofia 
     220    bool "Compile with ODBC support (BROKEN: Requires unixodbc_svn)" 
    180221    default n 
    181222    select PACKAGE_unixodbc_svn 
    182223    help 
    183224            Compile $(PKG_NAME)-mod-sofia with ODBC Support (Requires unixodbc_svn package). 
     225 
     226    config FS_SOFIA_WITH_SCTP 
     227    depends on PACKAGE_$(PKG_NAME)-mod-sofia 
     228    bool "Compile with SCTP support (BROKEN)" 
     229    default n 
     230    select PACKAGE_sctp 
     231    help 
     232            Compile $(PKG_NAME)-mod-sofia with SCTP (Stream Control Transfer Protocol) support. 
     233 
     234    config FS_SOFIA_WITH_ZRTP_GIT 
     235    depends on PACKAGE_$(PKG_NAME)-mod-sofia 
     236    bool "Compile with ZRTP support (BROKEN: Requires libzrtpcpp)" 
     237    default n 
     238    select PACKAGE_libzrtpcpp 
     239    help 
     240            Compile $(PKG_NAME)-mod-sofia with ZRTP Support (Requires libzrtpcpp package). 
    184241endef 
    185242 
     
    262319$(call Package/$(PKG_NAME)/Default) 
    263320  TITLE:=FreeSWITCH minimal package collection 
     321  DEFAULT:=y 
    264322  DEPENDS:= $(PKG_NAME) \ 
    265323                +$(PKG_NAME)-config-minimal \ 
     
    371429FS_TARGET_CFLAGS:= ${TARGET_CFLAGS} -DLUA_USE_LINUX $(FPIC) -std=gnu99 -Wno-format 
    372430FS_TARGET_CXXFLAGS:= ${TARGET_CXXFLAGS} -DLUA_USE_LINUX $(FPIC) -Wno-format 
    373 FS_TARGET_CPPFLAGS:= -I. -I./lua ${TARGET_CPPFLAGS} 
     431FS_TARGET_CPPFLAGS:= -I. -I./lua $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-erlang-event),-I$(STAGING_DIR_HOST)/lib/erlang/lib/erl_interface-3.6/include) $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-json-cdr),-Wno-error) ${TARGET_CPPFLAGS} 
    374432 
    375433 
     
    383441        --sysconfdir="/etc/$(PKG_NAME)" \ 
    384442        --with-modinstdir="/usr/lib/$(PKG_NAME)" \ 
    385         --enable-ipv6 \ 
    386         --enable-optimization \ 
    387443        --with-random="/dev/urandom" \ 
    388         --without-mysql \ 
     444        $(if $(CONFIG_FS_SOFIA_WITHOUT_MYSQL),--without-mysql) \ 
     445        $(call autoconf_bool,CONFIG_FS_SOFIA_WITH_IPV6,ipv6) \ 
     446        $(call autoconf_bool,CONFIG_FS_SOFIA_WITH_OPT,optimization) \ 
    389447        $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-celt),--with-ogg="$(STAGING_DIR)/usr",--without-iogg) \ 
    390448        $(if ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-curl)|$(CONFIG_PACKAGE_$(PKG_NAME)-mod-xml-cdr)|$(CONFIG_PACKAGE_$(PKG_NAME)-mod-xml-curl)),--with-libcurl="$(STAGING_DIR)/usr",--without-libcurl) \ 
    391         $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-dingaling),--with-openssl="$(STAGING_DIR)/usr",--without-openssl) \ 
     449        $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-dingaling)|$(CONFIG_FS_SOFIA_WITH_GNUTLS),--with-libgnutls="$(STAGING_DIR)/usr") \ 
    392450        $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-java),--with-java="$(STAGING_DIR)/usr",--without-java) \ 
    393         $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-spandsp),--enable-builtin-tiff,) \ 
    394         --$(if $(CONFIG_FS_SOFIA_WITH_ODBC),en,dis)able-core-odbc-support --with-odbc="$(STAGING_DIR)/usr" \ 
     451        $(call autoconf_bool,CONFIG_PACKAGE_$(PKG_NAME)-mod-spandsp,builtin-tiff) \ 
     452        $(call autoconf_bool,CONFIG_FS_SOFIA_WITH_SCTP,sctp) \ 
     453        $(call autoconf_bool,CONFIG_FS_SOFIA_WITH_ZRTP_GIT,zrtp) \ 
     454        $(call autoconf_bool,CONFIG_FS_SOFIA_WITH_ODBC,core-odbc-support) \ 
     455        $(if $(CONFIG_FS_SOFIA_WITH_ODBC),--with-odbc="$(STAGING_DIR)/usr") \ 
    395456 
    396457 
     
    419480        HOST_CXX="/usr/bin/g++" \ 
    420481        CROSS_COMPILE="1" \ 
     482        ax_cv_c_compiler_vendor="gnu" \ 
    421483        ac_cv_dev_urandom="yes" \ 
    422484        ac_cv_file_dbd_apr_dbd_mysql_c="no" \ 
     
    432494        apr_cv_type_rwlock_t="yes" \ 
    433495        ac_cv_path_LIBGNUTLS_CONFIG="no" \ 
     496        $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-perl),ac_cv_path_PERL="yes",) \ 
    434497        libzmq_cv_cxx_werror_flag="" \ 
    435498 
     
    612675 
    613676# 
    614 # $(eval $(call BuildPlugin,Name,Title,Inter Depends,Extra Depends)) 
     677# $(eval $(call BuildPlugin,Name,Title,Files,Inter Depends,Extra Depends)) 
    615678# 
    616679$(eval $(call BuildPlugin,alsa,Alsa endpoint,mod_alsa,,)) 
     
    637700$(eval $(call BuildPlugin,dialplan-directory,Dialplan directory,mod_dialplan_directory,,)) 
    638701$(eval $(call BuildPlugin,dialplan-xml,Dialplan-XML interface,mod_dialplan_xml,,)) 
    639 $(eval $(call BuildPlugin,dingaling,Jabber interface,mod_dingaling,,+libgnutls-openssl))  
     702$(eval $(call BuildPlugin,dingaling,Jabber interface,mod_dingaling,,))  
    640703$(eval $(call BuildPlugin,directory,application mod_directory,mod_directory,,)) 
    641704$(eval $(call BuildPlugin,distributor,application mod_distributor,mod_distributor,,)) 
     
    698761$(eval $(call BuildPlugin,sndfile,Multi-Format file transcoder,mod_sndfile,,)) 
    699762$(eval $(call BuildPlugin,snipe-hunt,application mod_snipe_hunt,mod_snipe_hunt,,)) 
     763$(eval $(call BuildPlugin,snmp,Simple Network Management Protocol,mod_snmp,,+libnetsnmp)) 
    700764$(eval $(call BuildPlugin,snom,SNOM specific features,mod_snom,,)) 
    701 $(eval $(call BuildPlugin,snmp,Simple Network Management Protocol,mod_snmp,,+libnetsnmp)) 
    702765$(eval $(call BuildPlugin,sofia,SIP,mod_sofia,,)) 
    703766$(eval $(call BuildPlugin,spandsp,Span DSP,mod_spandsp,,+libjpeg)) 
  • packages/net/freeswitch/files/etc.packages/say-de/lang/de/de.xml

    r22775 r28128  
    11<include> 
    2   <language name="de" sound-path="/snds" tts-engine="cepstral" tts-voice="david"> 
    3     <X-PRE-PROCESS cmd="include" data="demo/demo.xml"/> 
    4     <!--voicemail_de_tts is purely implemented with tts, we need a files based implementation too --> 
    5     <X-PRE-PROCESS cmd="include" data="vm/tts.xml"/> 
     2  <language name="de" sound-prefix="/snds" tts-engine="cepstral" tts-voice="david"> 
     3    <phrases> 
     4      <macros> 
     5        <X-PRE-PROCESS cmd="include" data="demo/demo.xml"/> 
     6        <!--voicemail_de_tts is purely implemented with tts, we need a files based implementation too --> 
     7        <X-PRE-PROCESS cmd="include" data="vm/tts.xml"/> 
     8      </macros> 
     9    </phrases> 
    610  </language> 
    711</include> 
  • packages/net/freeswitch/files/etc.packages/say-en/lang/en/dir/sounds.xml

    r22775 r28128  
    1 <include><!--This line will be ignored it's here to validate the xml and is optional --> 
    2         <macro name="directory_intro"> 
    3                 <input pattern="^(last_name)" break_on_match="false"> 
    4                         <match> 
    5                                 <action function="play-file" data="directory/dir-enter-person.wav"/> 
    6                                 <action function="play-file" data="directory/dir-last_name.wav"/> 
    7                         </match> 
    8                 </input> 
    9                 <input pattern="^(first_name)" break_on_match="false"> 
    10                         <match> 
    11                 <action function="play-file" data="directory/dir-enter-person.wav"/> 
    12                 <action function="play-file" data="directory/dir-first_name.wav"/> 
    13                         </match> 
    14                 </input> 
    15                 <input pattern="^(last_name):([0-9#*])$" break_on_match="false"> 
    16                         <match> 
    17                                 <action function="play-file" data="directory/dir-to_search_by.wav"/> 
    18                                 <action function="play-file" data="directory/dir-first_name.wav"/> 
    19                                 <action function="play-file" data="directory/dir-press.wav"/> 
    20                                 <action function="say" data="$2" method="pronounced" type="name_spelled"/> 
    21                         </match> 
    22                 </input> 
    23                 <input pattern="^(first_name):([0-9#*])$" break_on_match="false"> 
    24                         <match> 
    25                                 <action function="play-file" data="directory/dir-to_search_by.wav"/> 
    26                                 <action function="play-file" data="directory/dir-last_name.wav"/> 
    27                                 <action function="play-file" data="directory/dir-press.wav"/> 
    28                                 <action function="say" data="$2" method="pronounced" type="name_spelled"/> 
    29                         </match> 
    30                 </input> 
    31         </macro> 
     1<include> 
    322 
    33         <macro name="directory_min_search_digits"> 
    34                 <input pattern="^(.*)$"> 
    35                         <match> 
    36                                 <action function="play-file" data="directory/dir-specify_mininum_first.wav"/> 
    37                                 <action function="say" data="$1" method="pronounced" type="items"/> 
    38                                 <action function="play-file" data="directory/dir-letters_of_person_name.wav"/> 
    39                         </match> 
    40                 </input> 
    41         </macro> 
     3  <macro name="directory_intro"> 
     4    <input pattern="^(last_name)" break_on_match="false"> 
     5      <match> 
     6        <action function="play-file" data="directory/dir-enter_person.wav"/> 
     7        <action function="play-file" data="directory/dir-last_name.wav"/> 
     8      </match> 
     9    </input> 
     10    <input pattern="^(first_name)" break_on_match="false"> 
     11      <match> 
     12        <action function="play-file" data="directory/dir-enter_person.wav"/> 
     13        <action function="play-file" data="directory/dir-first_name.wav"/> 
     14      </match> 
     15    </input> 
     16    <input pattern="^(last_name):([0-9#*])$" break_on_match="false"> 
     17      <match> 
     18        <action function="play-file" data="directory/dir-to_search_by.wav"/> 
     19        <action function="play-file" data="directory/dir-first_name.wav"/> 
     20        <action function="play-file" data="voicemail/vm-press.wav"/> 
     21        <action function="say" data="$2" method="pronounced" type="name_spelled"/> 
     22      </match> 
     23    </input> 
     24    <input pattern="^(first_name):([0-9#*])$" break_on_match="false"> 
     25      <match> 
     26        <action function="play-file" data="directory/dir-to_search_by.wav"/> 
     27        <action function="play-file" data="directory/dir-last_name.wav"/> 
     28        <action function="play-file" data="voicemail/vm-press.wav"/> 
     29        <action function="say" data="$2" method="pronounced" type="name_spelled"/> 
     30      </match> 
     31    </input> 
     32  </macro> 
    4233 
    43         <macro name="directory_result_count"> 
    44                 <input pattern="^0$" break_on_match="true"> 
    45                         <match> 
    46                                 <action function="play-file" data="directory/dir-no_match_entry.wav"/> 
    47                         </match> 
    48                 </input> 
    49                 <input pattern="^(.*)$"> 
    50                         <match> 
    51                                 <action function="say" data="$1" method="pronounced" type="items"/> 
    52                                 <action function="play-file" data="directory/dir-result_match.wav"/> 
    53                         </match> 
    54                 </input> 
    55         </macro> 
     34  <macro name="directory_min_search_digits"> 
     35    <input pattern="^(.*)$"> 
     36      <match> 
     37        <action function="play-file" data="directory/dir-specify_mininum.wav"/> 
     38        <action function="say" data="$1" method="pronounced" type="items"/> 
     39        <action function="play-file" data="directory/dir-letters_of_person_name.wav"/> 
     40      </match> 
     41    </input> 
     42  </macro> 
    5643 
    57         <macro name="directory_result_count_too_large"> 
    58                 <input pattern="^(.*)$"> 
    59                         <match> 
    60                                 <action function="play-file" data="directory/dir-to_many_result.wav"/> 
    61                         </match> 
    62                 </input> 
     44  <macro name="directory_result_count"> 
     45    <input pattern="^0$" break_on_match="true"> 
     46      <match> 
     47        <action function="play-file" data="directory/dir-no_matching_results.wav"/> 
     48      </match> 
     49    </input> 
     50    <input pattern="^(.*)$"> 
     51      <match> 
     52        <action function="say" data="$1" method="pronounced" type="items"/> 
     53        <action function="play-file" data="directory/dir-result_match.wav"/> 
     54      </match> 
     55    </input> 
     56  </macro> 
    6357 
    64         </macro> 
     58  <macro name="directory_result_count_too_large"> 
     59    <input pattern="^(.*)$"> 
     60      <match> 
     61        <action function="play-file" data="directory/dir-too_many_result.wav"/> 
     62      </match> 
     63    </input> 
     64  </macro> 
    6565 
    66         <macro name="directory_result_last"> 
    67                 <input pattern="^(.*)$"> 
    68                         <match> 
    69                                 <action function="play-file" data="directory/dir-no_more_result.wav"/> 
    70                         </match> 
    71                 </input> 
     66  <macro name="directory_result_last"> 
     67    <input pattern="^(.*)$"> 
     68      <match> 
     69        <action function="play-file" data="directory/dir-no_more_results.wav"/> 
     70      </match> 
     71    </input> 
     72  </macro> 
    7273 
    73         </macro> 
     74  <macro name="directory_result_item"> 
     75    <input pattern="^(.*)$"> 
     76      <match> 
     77        <action function="play-file" data="directory/dir-result_number.wav"/> 
     78        <action function="say" data="$1" method="pronounced" type="items"/> 
     79      </match> 
     80    </input> 
     81  </macro> 
    7482 
    75         <macro name="directory_result_item"> 
    76                 <input pattern="^(.*)$"> 
    77                         <match> 
    78                                 <action function="play-file" data="directory/dir-result_number.wav"/> 
    79                                 <action function="say" data="$1" method="pronounced" type="items"/> 
    80                         </match> 
    81                 </input> 
    82         </macro> 
     83  <macro name="directory_result_at"> 
     84    <input pattern="^(.*)$"> 
     85      <match> 
     86        <action function="play-file" data="directory/dir-at_extension.wav"/> 
     87        <action function="say" data="$1" method="pronounced" type="name_spelled"/> 
     88      </match> 
     89    </input> 
     90  </macro> 
    8391 
    84         <macro name="directory_result_at"> 
    85                 <input pattern="^(.*)$"> 
    86                         <match> 
    87                                 <action function="play-file" data="directory/dir-at_extension.wav"/> 
    88                                 <action function="say" data="$1" method="pronounced" type="name_spelled"/> 
    89                         </match> 
    90                 </input> 
    91         </macro> 
     92  <macro name="directory_result_menu"> 
     93    <input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$"> 
     94      <match> 
     95        <action function="play-file" data="directory/dir-to_select_entry.wav"/> 
     96        <action function="play-file" data="voicemail/vm-press.wav"/> 
     97        <action function="say" data="$1" method="pronounced" type="name_spelled"/> 
     98        <action function="play-file" data="directory/dir-for_next.wav"/> 
     99        <action function="play-file" data="voicemail/vm-press.wav"/> 
     100        <action function="say" data="$2" method="pronounced" type="name_spelled"/> 
     101        <action function="play-file" data="directory/dir-for_prev.wav"/> 
     102        <action function="play-file" data="voicemail/vm-press.wav"/> 
     103        <action function="say" data="$3" method="pronounced" type="name_spelled"/> 
     104        <action function="play-file" data="directory/dir-start_new_search.wav"/> 
     105        <action function="play-file" data="voicemail/vm-press.wav"/> 
     106        <action function="say" data="$4" method="pronounced" type="name_spelled"/> 
     107      </match> 
     108    </input> 
     109  </macro> 
    92110 
    93         <macro name="directory_result_menu"> 
    94                 <input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$"> 
    95                         <match> 
    96                                 <action function="play-file" data="directory/dir-to_select_entry.wav"/> 
    97                                 <action function="play-file" data="directory/dir-press.wav"/> 
    98                                 <action function="say" data="$1" method="pronounced" type="name_spelled"/> 
    99                                 <action function="play-file" data="directory/dir-for_next.wav"/> 
    100                                 <action function="play-file" data="directory/dir-press.wav"/> 
    101                                 <action function="say" data="$2" method="pronounced" type="name_spelled"/> 
    102                                 <action function="play-file" data="directory/dir-for_prev.wav"/> 
    103                                 <action function="play-file" data="directory/dir-press.wav"/> 
    104                                 <action function="say" data="$3" method="pronounced" type="name_spelled"/> 
    105                                 <action function="play-file" data="directory/dir-to_make_new_search.wav"/> 
    106                                 <action function="play-file" data="directory/dir-press.wav"/> 
    107                                 <action function="say" data="$4" method="pronounced" type="name_spelled"/> 
     111  <macro name="directory_result_say_name"> 
     112    <input pattern="^(.*)$"> 
     113      <match> 
     114        <action function="say" data="$1" method="pronounced" type="name_spelled"/> 
     115      </match> 
     116    </input> 
     117  </macro> 
    108118 
    109                         </match> 
    110                 </input> 
    111         </macro> 
    112  
    113         <macro name="directory_result_say_name"> 
    114                 <input pattern="^(.*)$"> 
    115                         <match> 
    116                                 <action function="say" data="$1" method="pronounced" type="name_spelled"/> 
    117                         </match> 
    118                 </input> 
    119         </macro> 
    120  
    121 </include><!--This line will be ignored it's here to validate the xml and is optional --> 
     119</include> 
  • packages/net/freeswitch/files/etc.packages/say-en/lang/en/dir/tts.xml

    r22775 r28128  
    1 <include><!--This line will be ignored it's here to validate the xml and is optional --> 
     1<include> 
    22 
    3         <macro name="directory_intro"> 
    4                 <input pattern="^(last_name)" break_on_match="false"> 
    5                         <match> 
    6                                 <action function="speak-text" data="Please enter the first few digit of the person last name"/> 
    7                         </match> 
    8                 </input> 
    9                 <input pattern="^(first_name)" break_on_match="false"> 
    10                         <match> 
    11                                 <action function="speak-text" data="Please enter the first few digit of the person first name"/> 
    12                         </match> 
    13                 </input> 
    14                 <input pattern="^(last_name):([0-9#*])$" break_on_match="false"> 
    15                         <match> 
    16                                 <action function="speak-text" data="to search by first name, press $2"/> 
    17                         </match> 
    18                 </input> 
    19                 <input pattern="^(first_name):([0-9#*])$" break_on_match="false"> 
    20                         <match> 
    21                                 <action function="speak-text" data="to search by last name, press $2"/> 
    22                         </match> 
    23                 </input> 
    24         </macro> 
     3  <macro name="directory_intro"> 
     4    <input pattern="^(last_name)" break_on_match="false"> 
     5      <match> 
     6        <action function="speak-text" data="Please enter the first few digit of the person last name"/> 
     7      </match> 
     8    </input> 
     9    <input pattern="^(first_name)" break_on_match="false"> 
     10      <match> 
     11        <action function="speak-text" data="Please enter the first few digit of the person first name"/> 
     12      </match> 
     13    </input> 
     14    <input pattern="^(last_name):([0-9#*])$" break_on_match="false"> 
     15      <match> 
     16        <action function="speak-text" data="to search by first name, press $2"/> 
     17      </match> 
     18    </input> 
     19    <input pattern="^(first_name):([0-9#*])$" break_on_match="false"> 
     20      <match> 
     21        <action function="speak-text" data="to search by last name, press $2"/> 
     22      </match> 
     23    </input> 
     24  </macro> 
    2525 
    26         <macro name="directory_min_search_digits"> 
    27                 <input pattern="^(.*)$"> 
    28                         <match> 
    29                                 <action function="speak-text" data="You need to specify a minimum the first $1 letters of the person name, try again."/> 
    30                         </match> 
    31                 </input> 
    32         </macro> 
     26  <macro name="directory_min_search_digits"> 
     27    <input pattern="^(.*)$"> 
     28      <match> 
     29        <action function="speak-text" data="You need to specify a minimum the first $1 letters of the person name, try again."/> 
     30      </match> 
     31    </input> 
     32  </macro> 
    3333 
    34         <macro name="directory_result_count"> 
    35                 <input pattern="^0$" break_on_match="true"> 
    36                         <match> 
    37                                 <action function="speak-text" data="Your search match no user on this system, try again."/> 
    38                         </match> 
    39                 </input> 
    40                 <input pattern="^(.*)$"> 
    41                         <match> 
    42                                 <action function="speak-text" data="$1 result match your search"/> 
    43                         </match> 
    44                 </input> 
    45         </macro> 
     34  <macro name="directory_result_count"> 
     35    <input pattern="^0$" break_on_match="true"> 
     36      <match> 
     37        <action function="speak-text" data="Your search match no user on this system, try again."/> 
     38      </match> 
     39    </input> 
     40    <input pattern="^(.*)$"> 
     41      <match> 
     42        <action function="speak-text" data="$1 result match your search"/> 
     43      </match> 
     44    </input> 
     45  </macro> 
    4646 
    47         <macro name="directory_result_count_too_large"> 
    48                 <input pattern="^(.*)$"> 
    49                         <match> 
    50                                 <action function="speak-text" data="Your search returned too many result, please try again"/> 
    51                         </match> 
    52                 </input> 
     47  <macro name="directory_result_count_too_large"> 
     48    <input pattern="^(.*)$"> 
     49      <match> 
     50        <action function="speak-text" data="Your search returned too many result, please try again"/> 
     51      </match> 
     52    </input> 
     53  </macro> 
    5354 
    54         </macro> 
     55  <macro name="directory_result_last"> 
     56    <input pattern="^(.*)$"> 
     57      <match> 
     58        <action function="speak-text" data="No more result"/> 
     59      </match> 
     60    </input> 
     61  </macro> 
    5562 
    56         <macro name="directory_result_last"> 
    57                 <input pattern="^(.*)$"> 
    58                         <match> 
    59                                 <action function="speak-text" data="No more result"/> 
    60                         </match> 
    61                 </input> 
     63  <macro name="directory_result_item"> 
     64    <input pattern="^(.*)$"> 
     65      <match> 
     66        <action function="speak-text" data="Result number $1"/> 
     67      </match> 
     68    </input> 
     69  </macro> 
    6270 
    63         </macro> 
     71  <macro name="directory_result_menu"> 
     72    <input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$"> 
     73      <match> 
     74        <action function="speak-text" data="To select this entry press $1, for the next entry press $2, for the previous entry press $3, to make a new search press $4"/> 
     75      </match> 
     76    </input> 
     77  </macro> 
    6478 
    65         <macro name="directory_result_item"> 
    66                 <input pattern="^(.*)$"> 
    67                         <match> 
    68                                 <action function="speak-text" data="Result number $1"/> 
    69                         </match> 
    70                 </input> 
    71         </macro> 
     79  <macro name="directory_result_at"> 
     80    <input pattern="^(.*)$"> 
     81      <match> 
     82        <action function="speak-text" data="at extension $1"/> 
     83      </match> 
     84    </input> 
     85  </macro> 
    7286 
    73         <macro name="directory_result_menu"> 
    74                 <input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$"> 
    75                         <match> 
    76                                 <action function="speak-text" data="To select this entry press $1, for the next entry press $2, for the previous entry press $3, to make a new search press $4"/> 
    77                         </match> 
    78                 </input> 
    79         </macro> 
     87  <macro name="directory_result_say_name"> 
     88    <input pattern="^(.*)$"> 
     89      <match> 
     90        <action function="speak-text" data="$1"/> 
     91      </match> 
     92    </input> 
     93  </macro> 
    8094 
    81         <macro name="directory_result_at"> 
    82                 <input pattern="^(.*)$"> 
    83                         <match> 
    84                                 <action function="speak-text" data="at extension $1"/> 
    85                         </match> 
    86                 </input> 
    87         </macro> 
    88         <macro name="directory_result_say_name"> 
    89                 <input pattern="^(.*)$"> 
    90                         <match> 
    91                                 <action function="speak-text" data="$1"/> 
    92                         </match> 
    93                 </input> 
    94         </macro> 
    95  
    96 </include><!--This line will be ignored it's here to validate the xml and is optional --> 
     95</include> 
  • packages/net/freeswitch/files/etc.packages/say-en/lang/en/en.xml

    r22775 r28128  
    11<include> 
    2   <language name="en" sound-path="$${sounds_dir}/en/us/callie" tts-engine="cepstral" tts-voice="callie"> 
    3     <X-PRE-PROCESS cmd="include" data="demo/*.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml --> 
    4     <!--voicemail_en_tts is purely implemented with tts, we have the files based one that is the default. --> 
    5     <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral --> 
    6     <X-PRE-PROCESS cmd="include" data="dir/sounds.xml"/>  <!-- dir/tts.xml if you want to use tts and have cepstral --> 
     2  <language name="en" say-module="en" sound-prefix="$${sounds_dir}/en/us/callie" tts-engine="cepstral" tts-voice="callie"> 
     3    <phrases> 
     4      <macros> 
     5        <X-PRE-PROCESS cmd="include" data="demo/*.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml --> 
     6        <!--voicemail_en_tts is purely implemented with tts, we have the files based one that is the default. --> 
     7        <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral --> 
     8        <X-PRE-PROCESS cmd="include" data="dir/sounds.xml"/>  <!-- dir/tts.xml if you want to use tts and have cepstral --> 
     9        <X-PRE-PROCESS cmd="include" data="ivr/*.xml"/>  <!-- IVR and custom phrases go here --> 
     10      </macros> 
     11    </phrases> 
    712  </language> 
    813</include> 
  • packages/net/freeswitch/files/etc.packages/say-en/lang/en/vm/sounds.xml

    r22775 r28128  
    7272    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$"> 
    7373      <match> 
    74         <action function="play-file" data="voicemail/vm-press.wav"/> 
    75         <action function="say" data="$1" method="pronounced" type="name_spelled"/> 
     74        <!-- To listen to new messages --> 
    7675        <action function="play-file" data="voicemail/vm-listen_new.wav"/> 
    7776        <action function="play-file" data="voicemail/vm-press.wav"/> 
    78         <action function="say" data="$2" method="pronounced" type="name_spelled"/> 
     77        <action function="say" data="$1" method="pronounced" type="name_spelled"/> 
     78        <action function="execute" data="sleep(100)"/> 
     79 
     80        <!-- To listen to saved messages --> 
    7981        <action function="play-file" data="voicemail/vm-listen_saved.wav"/> 
    8082        <action function="play-file" data="voicemail/vm-press.wav"/> 
     83        <action function="say" data="$2" method="pronounced" type="name_spelled"/> 
     84        <action function="execute" data="sleep(100)"/> 
     85 
     86        <!-- For advanced options --> 
     87        <action function="play-file" data="voicemail/vm-advanced.wav"/> 
     88        <action function="play-file" data="voicemail/vm-press.wav"/> 
    8189        <action function="say" data="$3" method="pronounced" type="name_spelled"/> 
    82         <action function="play-file" data="voicemail/vm-advanced.wav"/> 
     90        <action function="execute" data="sleep(100)"/> 
     91 
     92        <!-- To exit --> 
     93        <action function="play-file" data="voicemail/vm-to_exit.wav"/> 
    8394        <action function="play-file" data="voicemail/vm-press.wav"/> 
    8495        <action function="say" data="$4" method="pronounced" type="name_phonetic"/> 
    85         <action function="play-file" data="voicemail/vm-to_exit.wav"/> 
    8696      </match> 
    8797    </input> 
     
    91101    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$"> 
    92102      <match> 
    93         <action function="play-file" data="voicemail/vm-press.wav"/> 
    94         <action function="say" data="$1" method="pronounced" type="name_spelled"/> 
     103        <!-- To record a greeting --> 
    95104        <action function="play-file" data="voicemail/vm-to_record_greeting.wav"/> 
    96105        <action function="play-file" data="voicemail/vm-press.wav"/> 
    97         <action function="say" data="$2" method="pronounced" type="name_spelled"/> 
     106        <action function="say" data="$1" method="pronounced" type="name_spelled"/> 
     107        <action function="execute" data="sleep(100)"/> 
     108 
     109        <!-- To choose greeting --> 
    98110        <action function="play-file" data="voicemail/vm-choose_greeting.wav"/> 
    99111        <action function="play-file" data="voicemail/vm-press.wav"/> 
     112        <action function="say" data="$2" method="pronounced" type="name_spelled"/> 
     113        <action function="execute" data="sleep(100)"/> 
     114 
     115        <!-- To record your name --> 
     116        <action function="play-file" data="voicemail/vm-record_name2.wav"/> 
     117        <action function="play-file" data="voicemail/vm-press.wav"/> 
    100118        <action function="say" data="$3" method="pronounced" type="name_spelled"/> 
    101         <action function="play-file" data="voicemail/vm-record_name2.wav"/> 
     119        <action function="execute" data="sleep(100)"/> 
     120 
     121        <!-- To change password --> 
     122        <action function="play-file" data="voicemail/vm-change_password.wav"/> 
    102123        <action function="play-file" data="voicemail/vm-press.wav"/> 
    103124        <action function="say" data="$4" method="pronounced" type="name_spelled"/> 
    104         <action function="play-file" data="voicemail/vm-change_password.wav"/> 
     125        <action function="execute" data="sleep(100)"/> 
     126 
     127        <!-- To return to main menu --> 
     128        <action function="play-file" data="voicemail/vm-main_menu.wav"/> 
    105129        <action function="play-file" data="voicemail/vm-press.wav"/> 
    106130        <action function="say" data="$5" method="pronounced" type="name_spelled"/> 
    107         <action function="play-file" data="voicemail/vm-main_menu.wav"/> 
    108131      </match> 
    109132    </input> 
  • packages/net/freeswitch/files/etc.packages/say-fr/lang/fr/fr.xml

    r22775 r28128  
    11<include> 
    2   <language name="fr" sound-path="/snds" tts-engine="cepstral" tts-voice="david"> 
    3     <X-PRE-PROCESS cmd="include" data="demo/demo.xml"/> 
    4     <!--voicemail_fr_tts is purely implemented with tts, we need a files based implementation too --> 
    5         <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/> 
    6         <X-PRE-PROCESS cmd="include" data="dir/sounds.xml"/>  <!-- dir/tts.xml if you want to use tts and have cepstral --> 
     2  <language name="fr" say-module="fr" sound-prefix="$${sounds_dir}/fr/ca/june" tts-engine="cepstral" tts-voice="david"> 
     3    <phrases> 
     4      <macros> 
     5        <X-PRE-PROCESS cmd="include" data="demo/demo.xml"/> 
     6        <!--voicemail_fr_tts is purely implemented with tts, we need a files based implementation too --> 
     7        <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/> 
     8        <X-PRE-PROCESS cmd="include" data="dir/sounds.xml"/>  <!-- dir/tts.xml if you want to use tts and have cepstral --> 
     9      </macros> 
     10    </phrases> 
    711  </language> 
    812</include> 
  • packages/net/freeswitch/files/etc.packages/say-ru/lang/ru/ru.xml

    r22775 r28128  
    22<!--тестПвые файлы Вы звукПвые файлы ЌПжМП взять тут svn co http://svn.freeswitch.ru/bbv/mod_say_ru/ru/  --> 
    33<include> 
    4   <language name="ru" sound-path="$${sounds_dir}/ru/RU/elena" tts-engine="cepstral" tts-voice="elena"> 
    5     <X-PRE-PROCESS cmd="include" data="demo/*.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml --> 
    6     <!--voicemail_en_tts is purely implemented with tts, we have the files based one that is the default. --> 
    7     <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral --> 
     4  <language name="ru" sound-prefix="$${sounds_dir}/ru/RU/elena" tts-engine="cepstral" tts-voice="elena"> 
     5    <phrases> 
     6      <macros> 
     7        <X-PRE-PROCESS cmd="include" data="demo/*.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml --> 
     8        <!--voicemail_en_tts is purely implemented with tts, we have the files based one that is the default. --> 
     9        <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral --> 
     10      </macros> 
     11    </phrases> 
    812  </language> 
    913</include> 
  • packages/net/freeswitch/files/etc.packages/voicemail/autoload_configs/voicemail.conf.xml

    r22784 r28128  
    3434      <param name="rew-key" value="4"/> 
    3535      <param name="skip-greet-key" value="#"/> 
    36       <!--<param name="previous-message-key" value=""/>--> 
    37       <!--<param name="next-message-key" value=""/>--> 
    38       <!--<param name="skip-info-key" value=""/>--> 
     36      <param name="previous-message-key" value="1"/> 
     37      <param name="next-message-key" value="3"/> 
     38      <param name="skip-info-key" value="*"/> 
     39      <param name="repeat-message-key" value="0"/> 
    3940      <param name="record-silence-threshold" value="200"/> 
    4041      <param name="record-silence-hits" value="2"/> 
    4142      <param name="web-template-file" value="web-vm.tpl"/> 
     43      <param name="db-password-override" value="false"/> 
     44      <param name="allow-empty-password-auth" value="true"/> 
    4245      <!-- if you need to change the sample rate of the recorded files e.g. gmail voicemail player --> 
    4346      <!--<param name="record-sample-rate" value="11025"/>--> 
Note: See TracChangeset for help on using the changeset viewer.