- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13026 - freeswitch/trunk/src/mod/say/mod_say_ru
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: buklov Date: Wed Apr 15 05:25:40 2009 New Revision: 13026 Log: add ru_ip Modified: freeswitch/trunk/src/mod/say/mod_say_ru/mod_say_ru.c Modified: freeswitch/trunk/src/mod/say/mod_say_ru/mod_say_ru.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_ru/mod_say_ru.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_ru/mod_say_ru.c Wed Apr 15 05:25:40 2009 @@ -1440,6 +1440,43 @@ } +static switch_status_t ru_ip(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, + switch_input_args_t *args) +{ + char *a, *b, *c, *d; + if (!(a = switch_core_session_strdup(session, tosay))) { + return SWITCH_STATUS_FALSE; + } + + if (!(b = strchr(a, '.'))) { + return SWITCH_STATUS_FALSE; + } + + *b++ = '\0'; + + if (!(c = strchr(b, '.'))) { + return SWITCH_STATUS_FALSE; + } + + *c++ = '\0'; + + if (!(d = strchr(c, '.'))) { + return SWITCH_STATUS_FALSE; + } + + *d++ = '\0'; + + ru_say_count(session,a ,male,how_much,args); + say_file("digits/dot.wav"); + ru_say_count(session,b ,male,how_much,args); + say_file("digits/dot.wav"); + ru_say_count(session,c ,male,how_much,args); + say_file("digits/dot.wav"); + ru_say_count(session,d ,male,how_much,args); + return SWITCH_STATUS_SUCCESS; +} + + static switch_status_t ru_say(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args) { @@ -1469,7 +1506,7 @@ say_cb = ru_say_time; break; case SST_IP_ADDRESS: -// say_cb = ru_ip; + say_cb = ru_ip; break; case SST_NAME_SPELLED: case SST_NAME_PHONETIC:

1 0

[commit] r13025 - freeswitch/trunk/src/mod/say/mod_say_ru
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: buklov Date: Wed Apr 15 04:40:10 2009 New Revision: 13025 Log: change dollars and cents to rubles and kopecks Modified: freeswitch/trunk/src/mod/say/mod_say_ru/mod_say_ru.c Modified: freeswitch/trunk/src/mod/say/mod_say_ru/mod_say_ru.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_ru/mod_say_ru.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_ru/mod_say_ru.c Wed Apr 15 04:40:10 2009 @@ -1188,60 +1188,60 @@ switch_say_method_t method,switch_input_args_t *args) { char sbuf[16] = ""; - char *dollars = NULL; - char *cents = NULL; + char *rubles = NULL; + char *kopecks = NULL; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, " ru_say_money %s\n",tosay ); if (strlen(tosay) > 15 || !(tosay = strip_nonnumerics(tosay, sbuf, sizeof(sbuf)))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n"); return SWITCH_STATUS_GENERR; } - dollars = sbuf; + rubles = sbuf; - if ((cents = strchr(sbuf, '.'))) { - *cents++ = '\0'; - if (strlen(cents) > 2) { - cents[2] = '\0'; + if ((kopecks = strchr(sbuf, '.'))) { + *kopecks++ = '\0'; + if (strlen(kopecks) > 2) { + kopecks[2] = '\0'; } } if (sbuf[0] == '+') { - dollars++; + rubles++; } if (sbuf[0] == '-') { say_file("currency/minus.wav"); - dollars++; + rubles++; } - ru_say_count(session,dollars ,male,how_much,args); - int idollars = atoi(dollars)%100; - int idollar = atoi(dollars)%10; - if (idollars == 1 || (idollars > 20 && idollar == 1)) {/* рубль */ - say_file("currency/dollar.wav"); + ru_say_count(session,rubles ,male,how_much,args); + int irubles = atoi(rubles)%100; + int iruble = atoi(rubles)%10; + if (irubles == 1 || (irubles > 20 && iruble == 1)) {/* рубль */ + say_file("currency/ruble.wav"); } - else if ((idollars > 1 && idollars < 5) || (idollars > 20 && idollar > 1 && idollar < 5)) { /*рубля */ - say_file("currency/dollar1.wav"); + else if ((irubles > 1 && irubles < 5) || (irubles > 20 && iruble > 1 && iruble < 5)) { /*рубля */ + say_file("currency/ruble-a.wav"); } else { /*рублей */ - say_file("currency/dollar2.wav"); + say_file("currency/rubles.wav"); } - /* Say cents */ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, " %s\n",cents ); - ru_say_count(session,cents ,female,how_much,args); - int icents = atoi(cents)%100; - int icent = atoi(cents)%10; - if (icents == 1 || (icents > 20 && icent == 1)) + /* Say kopecks */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, " %s\n",kopecks ); + ru_say_count(session,kopecks ,female,how_much,args); + int ikopecks = atoi(kopecks)%100; + int ikopeck = atoi(kopecks)%10; + if (ikopecks == 1 || (ikopecks > 20 && ikopeck == 1)) { /* копейка */ - say_file("currency/cent.wav"); + say_file("currency/kopeck.wav"); } - else if ((icents > 1 && icents < 5) || (icents > 20 && icent > 1 && icent < 5)) + else if ((ikopecks > 1 && ikopecks < 5) || (ikopecks > 20 && ikopeck > 1 && ikopeck < 5)) { /* копейки */ - say_file("currency/cent1.wav"); + say_file("currency/kopeck-i.wav"); } else { /* копеек */ - say_file("currency/cents.wav"); + say_file("currency/kopecks.wav"); } return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r13024 - freeswitch/trunk/docs/phrase
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: buklov Date: Wed Apr 15 04:22:00 2009 New Revision: 13024 Log: rename currency Modified: freeswitch/trunk/docs/phrase/phrase_ru.xml Modified: freeswitch/trunk/docs/phrase/phrase_ru.xml ============================================================================== --- freeswitch/trunk/docs/phrase/phrase_ru.xml (original) +++ freeswitch/trunk/docs/phrase/phrase_ru.xml Wed Apr 15 04:22:00 2009 @@ -321,12 +321,12 @@ <prompt phrase="Долларов " filename= "dollars.wav"/> <prompt phrase="Минус " filename= "minus.wav"/> <prompt phrase="Отрицательный " filename= "negative.wav"/> - <prompt phrase="Копеек " filename= "kopx .wav"/> - <prompt phrase="Копейка " filename= "kop .wav"/> - <prompt phrase="Копейки " filename= "kops .wav"/> - <prompt phrase="Рубль " filename= "rubl .wav"/> - <prompt phrase="Рубля " filename= "rublx .wav"/> - <prompt phrase="Рублей " filename= "rubls .wav"/> + <prompt phrase="Копеек " filename= "kopeck-i.wav"/> + <prompt phrase="Копейка " filename= "kopeck.wav"/> + <prompt phrase="Копейки " filename= "kopecks.wav"/> + <prompt phrase="Рубль " filename= "ruble.wav"/> + <prompt phrase="Рубля " filename= "ruble-a.wav"/> + <prompt phrase="Рублей " filename= "rubles.wav"/> </currency> <time> <prompt phrase="до полудня " filename= "a-m.wav"/>

1 0

[commit] r13023 - freeswitch/trunk/build
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: mikej Date: Tue Apr 14 22:05:37 2009 New Revision: 13023 Log: we need DYNAMIC_LIB_EXTEN for mod_perl and others Modified: freeswitch/trunk/build/modmake.rules.in Modified: freeswitch/trunk/build/modmake.rules.in ============================================================================== --- freeswitch/trunk/build/modmake.rules.in (original) +++ freeswitch/trunk/build/modmake.rules.in Tue Apr 14 22:05:37 2009 @@ -29,6 +29,7 @@ DYLD_LIBRARY_PATH=@libdir@:$DYLD_LIBRARY_PATH LD_LIBRARY_PATH=@libdir@:$LD_LIBRARY_PATH OSARCH=`uname -s` +DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@ LIBTOOL_LIB_EXTEN = @LIBTOOL_LIB_EXTEN@ SOLINK = @SOLINK@

1 0

[commit] r13022 - freeswitch/trunk/scripts/contrib/jmesquita
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: jmesquita Date: Tue Apr 14 21:11:49 2009 New Revision: 13022 Log: Draft translation of phrase_pt_br.xml to ... obviously Portuguese Brazil Added: freeswitch/trunk/scripts/contrib/jmesquita/phrase_pt_br.xml Added: freeswitch/trunk/scripts/contrib/jmesquita/phrase_pt_br.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/jmesquita/phrase_pt_br.xml Tue Apr 14 21:11:49 2009 @@ -0,0 +1,297 @@ +<language> + <en> + <ascii> + <prompt phrase="Espaço" filename="32.wav"/> + <prompt phrase="Cerquilha" filename="35.wav"/> + <prompt phrase="Asterisco" filename="42.wav"/> + <prompt phrase="Ponto" filename="46.wav"/> + <prompt phrase="A" filename="97.wav"/> + <prompt phrase="B" filename="98.wav"/> + <prompt phrase="C" filename="99.wav"/> + <prompt phrase="D" filename="100.wav"/> + <prompt phrase="E" filename="101.wav"/> + <prompt phrase="F" filename="102.wav"/> + <prompt phrase="G" filename="103.wav"/> + <prompt phrase="H" filename="104.wav"/> + <prompt phrase="I" filename="105.wav"/> + <prompt phrase="J" filename="106.wav"/> + <prompt phrase="K" filename="107.wav"/> + <prompt phrase="L" filename="108.wav"/> + <prompt phrase="M" filename="109.wav"/> + <prompt phrase="N" filename="110.wav"/> + <prompt phrase="O" filename="111.wav"/> + <prompt phrase="P" filename="112.wav"/> + <prompt phrase="Q" filename="113.wav"/> + <prompt phrase="R" filename="114.wav"/> + <prompt phrase="S" filename="115.wav"/> + <prompt phrase="T" filename="116.wav"/> + <prompt phrase="U" filename="117.wav"/> + <prompt phrase="V" filename="118.wav"/> + <prompt phrase="W" filename="119.wav"/> + <prompt phrase="X" filename="120.wav"/> + <prompt phrase="Y" filename="121.wav"/> + <prompt phrase="Z" filename="122.wav"/> + </ascii> + <phonetic-ascii> + <prompt phrase="Espaço" filename="32.wav"/> + <prompt phrase="Ponto" filename="46.wav"/> + <prompt phrase="Alpha" filename="97.wav"/> + <prompt phrase="Bravo" filename="98.wav"/> + <prompt phrase="Charlie" filename="99.wav"/> + <prompt phrase="Delta" filename="100.wav"/> + <prompt phrase="Echo" filename="101.wav"/> + <prompt phrase="Foxtrot" filename="102.wav"/> + <prompt phrase="Golf" filename="103.wav"/> + <prompt phrase="Hotel" filename="104.wav"/> + <prompt phrase="India" filename="105.wav"/> + <prompt phrase="Juliet" filename="106.wav"/> + <prompt phrase="Kilo" filename="107.wav"/> + <prompt phrase="Lima" filename="108.wav"/> + <prompt phrase="Mike" filename="109.wav"/> + <prompt phrase="November" filename="110.wav"/> + <prompt phrase="Oscar" filename="111.wav"/> + <prompt phrase="Papa" filename="112.wav"/> + <prompt phrase="Quebec" filename="113.wav"/> + <prompt phrase="Romeo" filename="114.wav"/> + <prompt phrase="Sierra" filename="115.wav"/> + <prompt phrase="Tango" filename="116.wav"/> + <prompt phrase="Unifor" filename="117.wav"/> + <prompt phrase="Victor" filename="118.wav"/> + <prompt phrase="Whiskey" filename="119.wav"/> + <prompt phrase="Xray" filename="120.wav"/> + <prompt phrase="Yankee" filename="121.wav"/> + <prompt phrase="Zulu" filename="122.wav"/> + </phonetic-ascii> + <digits> + <prompt phrase="Zero" filename="0.wav"/> + <prompt phrase="Um" filename="1.wav"/> + <prompt phrase="Dois" filename="2.wav"/> + <prompt phrase="Três" filename="3.wav"/> + <prompt phrase="Quatro" filename="4.wav"/> + <prompt phrase="Cinco" filename="5.wav"/> + <prompt phrase="Seis" filename="6.wav"/> + <prompt phrase="Sete" filename="7.wav"/> + <prompt phrase="Oito" filename="8.wav"/> + <prompt phrase="Nove" filename="9.wav"/> + <prompt phrase="Dez" filename="10.wav"/> + <prompt phrase="Onze" filename="11.wav"/> + <prompt phrase="Doze" filename="12.wav"/> + <prompt phrase="Treze" filename="13.wav"/> + <prompt phrase="Quatorze" filename="14.wav"/> + <prompt phrase="Quinze" filename="15.wav"/> + <prompt phrase="Dezesseis" filename="16.wav"/> + <prompt phrase="Dezessete" filename="17.wav"/> + <prompt phrase="Dezoito" filename="18.wav"/> + <prompt phrase="Dezenove" filename="19.wav"/> + <prompt phrase="Vinte" filename="20.wav"/> + <prompt phrase="Trinta" filename="30.wav"/> + <prompt phrase="Quarenta" filename="40.wav"/> + <prompt phrase="Cinquenta" filename="50.wav"/> + <prompt phrase="Sessenta" filename="60.wav"/> + <prompt phrase="Setenta" filename="70.wav"/> + <prompt phrase="Oitenta" filename="80.wav"/> + <prompt phrase="Noventa" filename="90.wav"/> + <prompt phrase="Ponto" filename="dot.wav"/> + <prompt phrase="Primeiro" filename="h-1.wav"/> + <prompt phrase="Segundo" filename="h-2.wav"/> + <prompt phrase="Terceiro" filename="h-3.wav"/> + <prompt phrase="Quarto" filename="h-4.wav"/> + <prompt phrase="Quinto" filename="h-5.wav"/> + <prompt phrase="Sexto" filename="h-6.wav"/> + <prompt phrase="Sétimo" filename="h-7.wav"/> + <prompt phrase="Oitavo" filename="h-8.wav"/> + <prompt phrase="Nono" filename="h-9.wav"/> + <prompt phrase="Décimo" filename="h-10.wav"/> + <prompt phrase="Décimo primeiro" filename="h-11.wav"/> + <prompt phrase="Décimo segundo" filename="h-12.wav"/> + <prompt phrase="Décimo terceiro" filename="h-13.wav"/> + <prompt phrase="Décimo quarto" filename="h-14.wav"/> + <prompt phrase="Décimo quinto" filename="h-15.wav"/> + <prompt phrase="Décimo sexto" filename="h-16.wav"/> + <prompt phrase="Décimo sétimo" filename="h-17.wav"/> + <prompt phrase="Décimo oitavo" filename="h-18.wav"/> + <prompt phrase="Décimo nono" filename="h-19.wav"/> + <prompt phrase="Vigésimo" filename="h-20.wav"/> + <prompt phrase="Trigésimo" filename="h-30.wav"/> + <prompt phrase="Centésimo" filename="hundred.wav"/> + <prompt phrase="Milionésimo" filename="million.wav"/> + <prompt phrase="Ponto" filename="period.wav"/> + <prompt phrase="Ponto" filename="point.wav"/> + <prompt phrase="Cerquilha" filename="pound.wav"/> + <prompt phrase="Asterisco" filename="star.wav"/> + <prompt phrase="Mil" filename="thousand.wav"/> + </digits> + <currency> + <prompt phrase="E" filename="and.wav"/> + <prompt phrase="Centavos" filename="cent.wav"/> + <prompt phrase="Central" filename="central.wav"/> + <prompt phrase="Centavos por minuto" filename="cents-per-minute.wav"/> + <prompt phrase="Centavos" filename="cents.wav"/> + <prompt phrase="Dollar" filename="dollar.wav"/> + <prompt phrase="Dollares" filename="dollars.wav"/> + <prompt phrase="Menos" filename="minus.wav"/> + <prompt phrase="Negativo" filename="negative.wav"/> + </currency> + <time> + <prompt phrase="A.M." filename="a-m.wav"/> + <prompt phrase="At" filename="at.wav"/> + <prompt phrase="Domingo" filename="day-0.wav"/> + <prompt phrase="Segunda-feira" filename="day-1.wav"/> + <prompt phrase="Terça-feira" filename="day-2.wav"/> + <prompt phrase="Quarta-feira" filename="day-3.wav"/> + <prompt phrase="Quinta-feira" filename="day-4.wav"/> + <prompt phrase="Sexta-feira" filename="day-5.wav"/> + <prompt phrase="Sábado" filename="day-6.wav"/> + <prompt phrase="Hora" filename="hour.wav"/> + <prompt phrase="Horas" filename="hours.wav"/> + <prompt phrase="Minuto" filename="minute.wav"/> + <prompt phrase="Minutos" filename="minutes.wav"/> + <prompt phrase="Janeiro" filename="mon-0.wav"/> + <prompt phrase="Fevereiro" filename="mon-1.wav"/> + <prompt phrase="Março" filename="mon-2.wav"/> + <prompt phrase="Abril" filename="mon-3.wav"/> + <prompt phrase="Maio" filename="mon-4.wav"/> + <prompt phrase="Junho" filename="mon-5.wav"/> + <prompt phrase="Julho" filename="mon-6.wav"/> + <prompt phrase="Agosto" filename="mon-7.wav"/> + <prompt phrase="Setembro" filename="mon-8.wav"/> + <prompt phrase="Outubro" filename="mon-9.wav"/> + <prompt phrase="Novembro" filename="mon-10.wav"/> + <prompt phrase="Dezembro" filename="mon-11.wav"/> + <prompt phrase="Em ponto" filename="oclock.wav"/> + <prompt phrase="oh" filename="oh.wav"/> + <prompt phrase="P.M." filename="p-m.wav"/> + <prompt phrase="Segundo" filename="second.wav"/> + <prompt phrase="Segundos" filename="seconds.wav"/> + <prompt phrase="Hoje" filename="today.wav"/> + <prompt phrase="Amanhã" filename="tomorrow.wav"/> + <prompt phrase="Ontem" filename="yesterday.wav"/> + </time> + <voicemail> + <prompt phrase="The person at extension" filename="vm-person.wav"/> + <prompt phrase="marked urgent" filename="vm-marked-urgent.wav"/> + <prompt phrase="emailed" filename="vm-emailed.wav"/> + <prompt phrase="you have" filename="vm-you_have.wav"/> + <prompt phrase="please enter your i d, followed by" filename="vm-enter_id.wav"/> + <prompt phrase="please enter your password, followed by" filename="vm-enter_pass.wav"/> + <prompt phrase="login incorrect" filename="vm-fail_auth.wav"/> + <prompt phrase="welcome to your voicemail" filename="vm-hello.wav"/> + <prompt phrase="goodbye" filename="vm-goodbye.wav"/> + <prompt phrase="at the tone please record your name, press any key or stop talking to end the recording." filename="vm-record_name1.wav"/> + <prompt phrase="choose a greeting between 1 and 9" filename="vm-choose_greeting_choose.wav"/> + <prompt phrase="invalid value" filename="vm-choose_greeting_fail.wav"/> + <prompt phrase="too many failed attempts" filename="vm-abort.wav"/> + <prompt phrase="to change your password" filename="vm-change_password.wav"/> + <prompt phrase="record your greeting at the tone, press any key or stop talking to end the recording" filename="vm-record_greeting.wav"/> + <prompt phrase="record your message at the tone, press any key or stop talking to end the recording" filename="vm-record_message.wav"/> + <prompt phrase="is not available" filename="vm-play_greeting.wav"/> + <prompt phrase="urgent new" filename="vm-urgent-new.wav"/> + <prompt phrase="new" filename="vm-new.wav"/> + <prompt phrase="urgent saved" filename="vm-urgent-saved.wav"/> + <prompt phrase="saved" filename="vm-saved.wav"/> + <prompt phrase="message" filename="vm-message.wav"/> + <prompt phrase="messages" filename="vm-messages.wav"/> + <prompt phrase="press" filename="vm-press.wav"/> + <prompt phrase="to listen to new messages" filename="vm-listen_new.wav"/> + <prompt phrase="to listen to saved messages" filename="vm-listen_saved.wav"/> + <prompt phrase="for advanced options" filename="vm-advanced.wav"/> + <prompt phrase="to exit" filename="vm-to_exit.wav"/> + <prompt phrase="to record a greeting" filename="vm-record_greeting.wav"/> + <prompt phrase="to choose greeting" filename="vm-choose_greeting.wav"/> + <prompt phrase="to record your name" filename="vm-record_name2.wav"/> + <prompt phrase="for the main menu" filename="vm-main_menu.wav"/> + <prompt phrase="to listen to the recording" filename="vm-listen_to_recording.wav"/> + <prompt phrase="to save the recording" filename="vm-save_recording.wav"/> + <prompt phrase="to rerecord" filename="vm-rerecord.wav"/> + <prompt phrase="to mark this message urgent" filename="vm-mark-urgent.wav"/> + <prompt phrase="to continue" filename="vm-continue.wav"/> + <prompt phrase="to listen to the recording again" filename="vm-listen_to_recording_again.wav"/> + <prompt phrase="to delete the recording" filename="vm-delete_recording.wav"/> + <prompt phrase="to forward the recording to your email" filename="vm-forward_to_email.wav"/> + <prompt phrase="greeting" filename="vm-greeting.wav"/> + <prompt phrase="selected" filename="vm-selected.wav"/> + <prompt phrase="is not available" filename="vm-not_available.wav"/> + <prompt phrase="message number" filename="vm-message_number.wav"/> + <prompt phrase="deleted" filename="vm-deleted.wav"/> + <prompt phrase="Your recording is below the minimum acceptable length, please try again" filename="vm-too-small.wav"/> + <prompt phrase="in folder inbox" filename="vm-in_folder.wav"/> + <prompt phrase="to return the call now" filename="vm-return_call.wav"/> + <prompt phrase="urgent" filename="vm-urgent.wav"/> + </voicemail> + <conference> + <prompt phrase="NULL" filename="conf-ack.wav" type="tone"/> + <prompt phrase="NULL" filename="conf-nack.wav" type="tone"/> + <prompt phrase="You are now muted." filename="conf-muted.wav"/> + <prompt phrase="You are now unmuted." filename="conf-unmuted.wav"/> + <prompt phrase="You are currently the only person in this conference." filename="conf-alone.wav"/> + <prompt phrase="NULL" filename="conf-perpetual.wav" type="music"/> + <prompt phrase="NULL" filename="conf-enter.wav" type="tone"/> + <prompt phrase="NULL" filename="conf-exit.wav" type="tone"/> + <prompt phrase="You have been kicked from this conference." filename="conf-kicked.wav"/> + <prompt phrase="This conference is locked." filename="conf-locked.wav"/> + <prompt phrase="The conference is now locked." filename="conf-is-locked.wav"/> + <prompt phrase="The conference is now unlocked." filename="conf-is-unlocked.wav"/> + <prompt phrase="Please enter the conference pin number." filename="conf-pin.wav"/> + <prompt phrase="Invalid pin number, try again." filename="conf-bad-pin.wav"/> + <prompt phrase="goodbye" filename="conf-goodbye.wav"/> + <prompt phrase="Welcome to the conference." filename="conf-welcome.wav"/> + </conference> + <ivr> + <prompt phrase="Account number" filename="ivr-account_number.wav"/> + <prompt phrase="Connect to caller" filename="ivr-connect_to_caller.wav"/> + <prompt phrase="If you know your party's extension, please enter it now" filename="ivr-enter_ext_pound.wav"/> + <prompt phrase="Please enter an extension followed by the pound sign" filename="ivr-enter_ext.wav"/> + <prompt phrase="For this person" filename="ivr-for_this_person.wav"/> + <prompt phrase="Please hold while I connect your call" filename="ivr-hold_connect_call.wav"/> + <prompt phrase="I'm sorry" filename="ivr-im_sorry.wav"/> + <prompt phrase="Please" filename="ivr-please.wav"/> + <prompt phrase="Please return our call at" filename="ivr-please_return_our_call_at.wav"/> + <prompt phrase="Regarding reference number" filename="ivr-regarding_reference_number.wav"/> + <prompt phrase="This is a sample IVR submenu..." filename="ivr-sample_submenu.wav"/> + <prompt phrase="Please say your name after the tone" filename="ivr-say_name.wav"/> + <prompt phrase="Send this caller to voicemail" filename="ivr-send_to_voicemail.wav"/> + <prompt phrase="To speak to a customer service representative" filename="ivr-speak_to_a_customer_service_representative.wav"/> + <prompt phrase="Take a message" filename="ivr-take_a_message.wav"/> + <prompt phrase="Thank you" filename="ivr-thank_you.wav"/> + <prompt phrase="That was an invalid entry" filename="ivr-that_was_an_invalid_entry.wav"/> + <prompt phrase="This is a call from" filename="ivr-this_is_a_call_from.wav"/> + <prompt phrase="This IVR will let you test some of the features..." filename="ivr-this_ivr_will_let_you_test_features.wav"/> + <prompt phrase="To call the FreeSWITCH conference" filename="ivr-to_call_the_freeswitch_conference.wav"/> + <prompt phrase="To do a FreeSWITCH echo test" filename="ivr-to_do_a_freeswitch_echo_test.wav"/> + <prompt phrase="To do a fwd echo test" filename="ivr-to_do_a_fwd_echo_test.wav"/> + <prompt phrase="To hear a sample IVR submenu" filename="ivr-to_hear_sample_submenu.wav"/> + <prompt phrase="To hear screaming monkeys" filename="ivr-to_hear_screaming_monkeys.wav"/> + <prompt phrase="To list to music on hold" filename="ivr-to_listen_to_moh.wav"/> + <prompt phrase="To repeat these options" filename="ivr-to_repeat_these_options.wav"/> + <prompt phrase="To return to the previous menu" filename="ivr-to_return_to_previous_menu.wav"/> + <prompt phrase="To speak with an operator" filename="ivr-to_speak_with_an_operator.wav"/> + <prompt phrase="Welcome to FreeSWITCH, the future of telephony" filename="ivr-welcome_to_freeswitch.wav"/> + <prompt phrase="You may exit at any time by simply hanging up" filename="ivr-you_may_exit_by_hanging_up.wav"/> + <prompt phrase="or" filename ="ivr-or.wav"/> + <prompt phrase="not" filename ="ivr-not.wav"/> + <prompt phrase="call" filename ="ivr-call.wav"/> + <prompt phrase="You may" filename ="ivr-you_may.wav"/> + <prompt phrase="hello" filename="ivr-hello.wav"/> + <prompt phrase="Using your telephone keypad..." filename="ivr-use_telephone_keypad.wav"/> + <prompt phrase="please spell the name of the person you are trying to reach." filename="ivr-spell_name.wav"/> + <prompt phrase="Last name first" filename="ivr-last_name_first.wav"/> + <prompt phrase="First name first" filename="ivr-first_name_first.wav"/> + <prompt phrase="Press 1 for Q or Z." filename="ivr-press_one_q_or_z.wav"/> + <prompt phrase="Sales" filename="ivr-sales.wav"/> + <prompt phrase="Customer service" filename="ivr-customer_service.wav"/> + <prompt phrase="Technical support" filename="ivr-technical_support.wav"/> + <prompt phrase="Operator" filename="ivr-operator.wav"/> + </ivr> + <misc> + <prompt phrase="This call has been secured" filename="call_secured.wav"/> + <prompt phrase="Followed by pound" filename="followed.wav"/> + <prompt phrase="If you are this person" filename="if_you_are_this_person.wav"/> + <prompt phrase="If you would like to" filename="if_you_would_like_to.wav"/> + <prompt phrase="Provide reference number" filename="provide_reference_number.wav"/> + <prompt phrase="Please enter extension you want to transfer to" filename="transfer1.wav"/> + <prompt phrase="Transfer" filename="transfer2.wav"/> + <prompt phrase="We are trying to reach" filename="we_are_trying_to_reach.wav"/> + <prompt phrase="An error has occurred please contact the administrator" filename="error.wav"/> + </misc> + </en> +</language>

1 0

[commit] r13021 - in freeswitch/trunk: conf/autoload_configs src/mod/endpoints/mod_iax
by FreeSWITCH SVN 14 Apr '09

14 Apr '09

Author: anthm Date: Tue Apr 14 17:41:34 2009 New Revision: 13021 Log: make mod_iax async Modified: freeswitch/trunk/conf/autoload_configs/iax.conf.xml freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Modified: freeswitch/trunk/conf/autoload_configs/iax.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/iax.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/iax.conf.xml Tue Apr 14 17:41:34 2009 @@ -8,5 +8,7 @@ <param name="codec-prefs" value="PCMU@20i,PCMA,speex,L16"/> <param name="codec-master" value="us"/> <param name="codec-rates" value="8"/> +  + <param name="media-timeout" value="300"/> </settings> </configuration> Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Tue Apr 14 17:41:34 2009 @@ -79,14 +79,14 @@ int fd; int calls; switch_mutex_t *mutex; + int media_timeout; } globals; struct private_object { unsigned int flags; switch_codec_t read_codec; switch_codec_t write_codec; - switch_frame_t read_frame; - unsigned char databuf[SWITCH_RECOMMENDED_BUFFER_SIZE]; + switch_frame_t *read_frame; switch_frame_t cng_frame; unsigned char cng_databuf[10]; switch_core_session_t *session; @@ -97,6 +97,10 @@ unsigned short samprate; switch_mutex_t *mutex; switch_mutex_t *flag_mutex; + int cng_count; + switch_timer_t timer; + switch_queue_t *frame_queue; + int media_timeout; //switch_thread_cond_t *cond; }; @@ -224,6 +228,7 @@ unsigned int local_cap = 0, mixed_cap = 0, chosen = 0, leading = 0; int x, srate = 8000; uint32_t interval = 0; + const switch_codec_implementation_t *read_impl; if (globals.codec_string) { num_codecs = switch_loadable_module_get_codecs_sorted(codecs, SWITCH_MAX_CODECS, globals.codec_order, globals.codec_order_last); @@ -395,9 +400,7 @@ int rate; ms = tech_pvt->write_codec.implementation->microseconds_per_packet / 1000; rate = tech_pvt->write_codec.implementation->samples_per_second; - tech_pvt->read_frame.rate = rate; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Activate Codec %s/%d %d ms\n", dname, rate, ms); - tech_pvt->read_frame.codec = &tech_pvt->read_codec; switch_core_session_set_read_codec(tech_pvt->session, &tech_pvt->read_codec); switch_core_session_set_write_codec(tech_pvt->session, &tech_pvt->write_codec); switch_set_flag_locked(tech_pvt, TFLAG_CODEC); @@ -406,6 +409,16 @@ tech_pvt->codecs = local_cap; } + read_impl = tech_pvt->read_codec.implementation; + + switch_core_timer_init(&tech_pvt->timer, "soft", + read_impl->microseconds_per_packet / 1000, + read_impl->samples_per_packet, + switch_core_session_get_pool(tech_pvt->session)); + + tech_pvt->media_timeout = (read_impl->samples_per_second * globals.media_timeout) / read_impl->samples_per_packet; + + if (io == IAX_QUERY) { *format = tech_pvt->codec; *cababilities = local_cap; @@ -442,14 +455,13 @@ static void tech_init(private_t *tech_pvt, switch_core_session_t *session) { - tech_pvt->read_frame.data = tech_pvt->databuf; - tech_pvt->read_frame.buflen = sizeof(tech_pvt->databuf); tech_pvt->cng_frame.data = tech_pvt->cng_databuf; tech_pvt->cng_frame.buflen = sizeof(tech_pvt->cng_databuf); switch_set_flag((&tech_pvt->cng_frame), SFF_CNG); tech_pvt->cng_frame.datalen = 2; switch_mutex_init(&tech_pvt->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); + switch_queue_create(&tech_pvt->frame_queue, 50000, switch_core_session_get_pool(session)); switch_core_session_set_private(session, tech_pvt); tech_pvt->session = session; } @@ -492,6 +504,7 @@ static switch_status_t channel_on_destroy(switch_core_session_t *session) { private_t *tech_pvt = switch_core_session_get_private(session); + void *pop; if (tech_pvt) { if (switch_core_codec_ready(&tech_pvt->read_codec)) { @@ -501,6 +514,11 @@ if (!switch_core_codec_ready(&tech_pvt->write_codec)) { switch_core_codec_destroy(&tech_pvt->write_codec); } + + while (switch_queue_trypop(tech_pvt->frame_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) { + switch_frame_t *frame = (switch_frame_t *) pop; + switch_frame_free(&frame); + } } return SWITCH_STATUS_SUCCESS; @@ -585,10 +603,9 @@ { private_t *tech_pvt = switch_core_session_get_private(session); switch_byte_t *data; - int ms_count = 0; + void *pop; switch_assert(tech_pvt != NULL); - tech_pvt->read_frame.flags = SFF_NONE; *frame = NULL; while (switch_test_flag(tech_pvt, TFLAG_IO)) { @@ -606,41 +623,45 @@ return SWITCH_STATUS_FALSE; } - if (switch_test_flag(tech_pvt, TFLAG_IO) && switch_test_flag(tech_pvt, TFLAG_DTMF)) { - switch_clear_flag_locked(tech_pvt, TFLAG_DTMF); - *frame = &tech_pvt->cng_frame; - return SWITCH_STATUS_SUCCESS; - } + switch_core_timer_next(&tech_pvt->timer); - if (switch_test_flag(tech_pvt, TFLAG_IO) && switch_test_flag(tech_pvt, TFLAG_VOICE)) { - switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); - if (!tech_pvt->read_frame.datalen) { - continue; + + if (switch_queue_trypop(tech_pvt->frame_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) { + if (tech_pvt->read_frame) { + switch_frame_free(&tech_pvt->read_frame); } - *frame = &tech_pvt->read_frame; + + tech_pvt->read_frame = (switch_frame_t *) pop; + tech_pvt->read_frame->codec = &tech_pvt->read_codec; + *frame = tech_pvt->read_frame; + #ifdef BIGENDIAN if (switch_test_flag(tech_pvt, TFLAG_LINEAR)) { switch_swap_linear((*frame)->data, (int) (*frame)->datalen); } #endif + switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); + tech_pvt->cng_count = tech_pvt->media_timeout; return SWITCH_STATUS_SUCCESS; + } else { + if (tech_pvt->cng_count && --tech_pvt->cng_count == 0) { + break; + } + goto cng; } - switch_cond_next(); - if (++ms_count >= 30000) { - break; - } + } return SWITCH_STATUS_FALSE; cng: - data = (switch_byte_t *) tech_pvt->read_frame.data; + data = (switch_byte_t *) tech_pvt->cng_frame.data; data[0] = 65; data[1] = 0; - tech_pvt->read_frame.datalen = 2; - tech_pvt->read_frame.flags = SFF_CNG; - *frame = &tech_pvt->read_frame; + tech_pvt->cng_frame.datalen = 2; + tech_pvt->cng_frame.flags = SFF_CNG; + *frame = &tech_pvt->cng_frame; return SWITCH_STATUS_SUCCESS; } @@ -698,6 +719,18 @@ channel_answer_channel(session); } break; + + case SWITCH_MESSAGE_INDICATE_BRIDGE: + case SWITCH_MESSAGE_INDICATE_UNBRIDGE: + case SWITCH_MESSAGE_INDICATE_AUDIO_SYNC: + { + void *pop; + + while (switch_queue_trypop(tech_pvt->frame_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) { + switch_frame_t *frame = (switch_frame_t *) pop; + switch_frame_free(&frame); + } + } default: break; } @@ -850,6 +883,8 @@ return SWITCH_STATUS_TERM; } + globals.media_timeout = 300; + if ((settings = switch_xml_child(cfg, "settings"))) { for (param = switch_xml_child(settings, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); @@ -865,6 +900,11 @@ if (!strcasecmp(val, "us")) { switch_set_flag(&globals, GFLAG_MY_CODEC_PREFS); } + } else if (!strcmp(var, "media-timeout")) { + int mt = atoi(val); + if (mt > 0) { + globals.media_timeout = mt; + } } else if (!strcmp(var, "dialplan")) { set_global_dialplan(val); } else if (!strcmp(var, "codec-prefs")) { @@ -1096,9 +1136,10 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "sending silence\n"); break; case IAX_EVENT_VOICE: - if (tech_pvt && (tech_pvt->read_frame.datalen = iaxevent->datalen) != 0) { + if (tech_pvt && iaxevent->datalen) { if (channel && switch_channel_up(channel)) { int bytes = 0, frames = 1; + switch_frame_t *frame = NULL; if (!switch_test_flag(tech_pvt, TFLAG_CODEC) || !tech_pvt->read_codec.implementation || !switch_core_codec_ready(&tech_pvt->read_codec)) { @@ -1108,11 +1149,16 @@ if (tech_pvt->read_codec.implementation->encoded_bytes_per_packet) { bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_packet; - frames = (int) (tech_pvt->read_frame.datalen / bytes); + frames = (int) (iaxevent->datalen / bytes); } + + switch_frame_alloc(&frame, iaxevent->datalen); + + memcpy(frame->data, iaxevent->data, iaxevent->datalen); + frame->datalen = iaxevent->datalen; + switch_queue_push(tech_pvt->frame_queue, frame); + frame = NULL; - tech_pvt->read_frame.samples = frames * tech_pvt->read_codec.implementation->samples_per_packet; - memcpy(tech_pvt->read_frame.data, iaxevent->data, iaxevent->datalen); /* wake up the i/o thread */ switch_set_flag_locked(tech_pvt, TFLAG_VOICE); }

1 0

[commit] r13020 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by FreeSWITCH SVN 14 Apr '09

14 Apr '09

Author: mrene Date: Tue Apr 14 15:30:54 2009 New Revision: 13020 Log: Let session.destroy() take the cause as a string too Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Apr 14 15:30:54 2009 @@ -2233,6 +2233,9 @@ int32 i = 0; JS_ValueToInt32(cx, argv[0], &i); cause = i; + } else { + const char *cause_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + cause = switch_channel_str2cause(cause_name); } }

1 0

[commit] r13019 - freeswitch/trunk/docs/phrase
by FreeSWITCH SVN 14 Apr '09

14 Apr '09

Author: mcollins Date: Tue Apr 14 12:58:01 2009 New Revision: 13019 Log: Add stub phrase_es.xml; need to finish translating eng to span Added: freeswitch/trunk/docs/phrase/phrase_es.xml Added: freeswitch/trunk/docs/phrase/phrase_es.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/docs/phrase/phrase_es.xml Tue Apr 14 12:58:01 2009 @@ -0,0 +1,301 @@ + +<language> + <en> + <ascii> + <prompt phrase="Space" filename="32.wav"/> + <prompt phrase="Pound" filename="35.wav"/> + <prompt phrase="Star" filename="42.wav"/> + <prompt phrase="Dot" filename="46.wav"/> + <prompt phrase="A" filename="97.wav"/> + <prompt phrase="B" filename="98.wav"/> + <prompt phrase="C" filename="99.wav"/> + <prompt phrase="D" filename="100.wav"/> + <prompt phrase="E" filename="101.wav"/> + <prompt phrase="F" filename="102.wav"/> + <prompt phrase="G" filename="103.wav"/> + <prompt phrase="H" filename="104.wav"/> + <prompt phrase="I" filename="105.wav"/> + <prompt phrase="J" filename="106.wav"/> + <prompt phrase="K" filename="107.wav"/> + <prompt phrase="L" filename="108.wav"/> + <prompt phrase="M" filename="109.wav"/> + <prompt phrase="N" filename="110.wav"/> + <prompt phrase="O" filename="111.wav"/> + <prompt phrase="P" filename="112.wav"/> + <prompt phrase="Q" filename="113.wav"/> + <prompt phrase="R" filename="114.wav"/> + <prompt phrase="S" filename="115.wav"/> + <prompt phrase="T" filename="116.wav"/> + <prompt phrase="U" filename="117.wav"/> + <prompt phrase="V" filename="118.wav"/> + <prompt phrase="W" filename="119.wav"/> + <prompt phrase="X" filename="120.wav"/> + <prompt phrase="Y" filename="121.wav"/> + <prompt phrase="Z" filename="122.wav"/> + </ascii> + <phonetic-ascii> + <prompt phrase="Space" filename="32.wav"/> + <prompt phrase="Dot" filename="46.wav"/> + <prompt phrase="Alpha" filename="97.wav"/> + <prompt phrase="Bravo" filename="98.wav"/> + <prompt phrase="Charlie" filename="99.wav"/> + <prompt phrase="Delta" filename="100.wav"/> + <prompt phrase="Echo" filename="101.wav"/> + <prompt phrase="Foxtrot" filename="102.wav"/> + <prompt phrase="Golf" filename="103.wav"/> + <prompt phrase="Hotel" filename="104.wav"/> + <prompt phrase="India" filename="105.wav"/> + <prompt phrase="Juliet" filename="106.wav"/> + <prompt phrase="Kilo" filename="107.wav"/> + <prompt phrase="Lima" filename="108.wav"/> + <prompt phrase="Mike" filename="109.wav"/> + <prompt phrase="November" filename="110.wav"/> + <prompt phrase="Oscar" filename="111.wav"/> + <prompt phrase="Papa" filename="112.wav"/> + <prompt phrase="Quebec" filename="113.wav"/> + <prompt phrase="Romeo" filename="114.wav"/> + <prompt phrase="Sierra" filename="115.wav"/> + <prompt phrase="Tango" filename="116.wav"/> + <prompt phrase="Unifor" filename="117.wav"/> + <prompt phrase="Victor" filename="118.wav"/> + <prompt phrase="Whiskey" filename="119.wav"/> + <prompt phrase="Xray" filename="120.wav"/> + <prompt phrase="Yankee" filename="121.wav"/> + <prompt phrase="Zulu" filename="122.wav"/> + </phonetic-ascii> + <digits> + <prompt phrase="Cerro" filename="0.wav"/> + <prompt phrase="Uno" filename="1.wav"/> + <prompt phrase="Dos" filename="2.wav"/> + <prompt phrase="Tres" filename="3.wav"/> + <prompt phrase="Cuatro" filename="4.wav"/> + <prompt phrase="Cinqo" filename="5.wav"/> + <prompt phrase="Seis" filename="6.wav"/> + <prompt phrase="Siete" filename="7.wav"/> + <prompt phrase="Ocho" filename="8.wav"/> + <prompt phrase="Nueve" filename="9.wav"/> + <prompt phrase="Diez" filename="10.wav"/> + <prompt phrase="Once" filename="11.wav"/> + <prompt phrase="Doce" filename="12.wav"/> + <prompt phrase="Trece" filename="13.wav"/> + <prompt phrase="Catorce" filename="14.wav"/> + <prompt phrase="Quince" filename="15.wav"/> + <prompt phrase="Dieciséis" filename="16.wav"/> + <prompt phrase="Diecisiete " filename="17.wav"/> + <prompt phrase="Dieciocho " filename="18.wav"/> + <prompt phrase="Diecinueve " filename="19.wav"/> + <prompt phrase="Veinte " filename="20.wav"/> + <prompt phrase="Thirty" filename="30.wav"/> + <prompt phrase="Fourty" filename="40.wav"/> + <prompt phrase="Fifty" filename="50.wav"/> + <prompt phrase="Sixty" filename="60.wav"/> + <prompt phrase="Seventy" filename="70.wav"/> + <prompt phrase="Eighty" filename="80.wav"/> + <prompt phrase="Ninety" filename="90.wav"/> + <prompt phrase="Dot" filename="dot.wav"/> + <prompt phrase="First" filename="h-1.wav"/> + <prompt phrase="Second" filename="h-2.wav"/> + <prompt phrase="Third" filename="h-3.wav"/> + <prompt phrase="Fourth" filename="h-4.wav"/> + <prompt phrase="Fifth" filename="h-5.wav"/> + <prompt phrase="Sixth" filename="h-6.wav"/> + <prompt phrase="Seventh" filename="h-7.wav"/> + <prompt phrase="Eighth" filename="h-8.wav"/> + <prompt phrase="Nineth" filename="h-9.wav"/> + <prompt phrase="Tenth" filename="h-10.wav"/> + <prompt phrase="Eleventh" filename="h-11.wav"/> + <prompt phrase="Twelveth" filename="h-12.wav"/> + <prompt phrase="Thirteenth" filename="h-13.wav"/> + <prompt phrase="Fourteenth" filename="h-14.wav"/> + <prompt phrase="Fifteenth" filename="h-15.wav"/> + <prompt phrase="Sixteenth" filename="h-16.wav"/> + <prompt phrase="Seventeenth" filename="h-17.wav"/> + <prompt phrase="Eighteenth" filename="h-18.wav"/> + <prompt phrase="Nineteenth" filename="h-19.wav"/> + <prompt phrase="Twentieth" filename="h-20.wav"/> + <prompt phrase="Thirtieth" filename="h-30.wav"/> + <prompt phrase="Hundred" filename="hundred.wav"/> + <prompt phrase="Million" filename="million.wav"/> + <prompt phrase="Period" filename="period.wav"/> + <prompt phrase="Point" filename="point.wav"/> + <prompt phrase="Pound" filename="pound.wav"/> + <prompt phrase="Star" filename="star.wav"/> + <prompt phrase="Thousand" filename="thousand.wav"/> + </digits> + <currency> + <prompt phrase="And" filename="and.wav"/> + <prompt phrase="Cent" filename="cent.wav"/> + <prompt phrase="Central" filename="central.wav"/> + <prompt phrase="Cents per minute" filename="cents-per-minute.wav"/> + <prompt phrase="Cents" filename="cents.wav"/> + <prompt phrase="Dollar" filename="dollar.wav"/> + <prompt phrase="Dollars" filename="dollars.wav"/> + <prompt phrase="Minus" filename="minus.wav"/> + <prompt phrase="Negative" filename="negative.wav"/> + </currency> + <time> + <prompt phrase="A.M." filename="a-m.wav"/> + <prompt phrase="At" filename="at.wav"/> + <prompt phrase="Sunday" filename="day-0.wav"/> + <prompt phrase="Monday" filename="day-1.wav"/> + <prompt phrase="Tuesday" filename="day-2.wav"/> + <prompt phrase="Wednesday" filename="day-3.wav"/> + <prompt phrase="Thursday" filename="day-4.wav"/> + <prompt phrase="Friday" filename="day-5.wav"/> + <prompt phrase="Saturday" filename="day-6.wav"/> + <prompt phrase="Hour" filename="hour.wav"/> + <prompt phrase="Hours" filename="hours.wav"/> + <prompt phrase="Minute" filename="minute.wav"/> + <prompt phrase="Minutes" filename="minutes.wav"/> + <prompt phrase="January" filename="mon-0.wav"/> + <prompt phrase="Febuary" filename="mon-1.wav"/> + <prompt phrase="March" filename="mon-2.wav"/> + <prompt phrase="April" filename="mon-3.wav"/> + <prompt phrase="May" filename="mon-4.wav"/> + <prompt phrase="June" filename="mon-5.wav"/> + <prompt phrase="July" filename="mon-6.wav"/> + <prompt phrase="August" filename="mon-7.wav"/> + <prompt phrase="September" filename="mon-8.wav"/> + <prompt phrase="October" filename="mon-9.wav"/> + <prompt phrase="November" filename="mon-10.wav"/> + <prompt phrase="December" filename="mon-11.wav"/> + <prompt phrase="O'Clock" filename="oclock.wav"/> + <prompt phrase="oh" filename="oh.wav"/> + <prompt phrase="P.M." filename="p-m.wav"/> + <prompt phrase="Second" filename="second.wav"/> + <prompt phrase="Seconds" filename="seconds.wav"/> + <prompt phrase="Today" filename="today.wav"/> + <prompt phrase="Tomorrow" filename="tomorrow.wav"/> + <prompt phrase="Yesterday" filename="yesterday.wav"/> + </time> + <voicemail> + <prompt phrase="The person at extension" filename="vm-person.wav"/> + <prompt phrase="marked urgent" filename="vm-marked-urgent.wav"/> + <prompt phrase="emailed" filename="vm-emailed.wav"/> + <prompt phrase="you have" filename="vm-you_have.wav"/> + <prompt phrase="please enter your i d, followed by" filename="vm-enter_id.wav"/> + <prompt phrase="please enter your password, followed by" filename="vm-enter_pass.wav"/> + <prompt phrase="login incorrect" filename="vm-fail_auth.wav"/> + <prompt phrase="welcome to your voicemail" filename="vm-hello.wav"/> + <prompt phrase="goodbye" filename="vm-goodbye.wav"/> + <prompt phrase="at the tone please record your name, press any key or stop talking to end the recording." filename="vm-record_name1.wav"/> + <prompt phrase="choose a greeting between 1 and 9" filename="vm-choose_greeting_choose.wav"/> + <prompt phrase="invalid value" filename="vm-choose_greeting_fail.wav"/> + <prompt phrase="too many failed attempts" filename="vm-abort.wav"/> + <prompt phrase="to change your password" filename="vm-change_password.wav"/> + <prompt phrase="record your greeting at the tone, press any key or stop talking to end the recording" filename="vm-record_greeting.wav"/> + <prompt phrase="record your message at the tone, press any key or stop talking to end the recording" filename="vm-record_message.wav"/> + <prompt phrase="is not available" filename="vm-play_greeting.wav"/> + <prompt phrase="urgent new" filename="vm-urgent-new.wav"/> + <prompt phrase="new" filename="vm-new.wav"/> + <prompt phrase="urgent saved" filename="vm-urgent-saved.wav"/> + <prompt phrase="saved" filename="vm-saved.wav"/> + <prompt phrase="message" filename="vm-message.wav"/> + <prompt phrase="messages" filename="vm-messages.wav"/> + <prompt phrase="press" filename="vm-press.wav"/> + <prompt phrase="to listen to new messages" filename="vm-listen_new.wav"/> + <prompt phrase="to listen to saved messages" filename="vm-listen_saved.wav"/> + <prompt phrase="for advanced options" filename="vm-advanced.wav"/> + <prompt phrase="to exit" filename="vm-to_exit.wav"/> + <prompt phrase="to record a greeting" filename="vm-record_greeting.wav"/> + <prompt phrase="to choose greeting" filename="vm-choose_greeting.wav"/> + <prompt phrase="to record your name" filename="vm-record_name2.wav"/> + <prompt phrase="for the main menu" filename="vm-main_menu.wav"/> + <prompt phrase="to listen to the recording" filename="vm-listen_to_recording.wav"/> + <prompt phrase="to save the recording" filename="vm-save_recording.wav"/> + <prompt phrase="to rerecord" filename="vm-rerecord.wav"/> + <prompt phrase="to mark this message urgent" filename="vm-mark-urgent.wav"/> + <prompt phrase="to continue" filename="vm-continue.wav"/> + <prompt phrase="to listen to the recording again" filename="vm-listen_to_recording_again.wav"/> + <prompt phrase="to delete the recording" filename="vm-delete_recording.wav"/> + <prompt phrase="to forward the recording to your email" filename="vm-forward_to_email.wav"/> + <prompt phrase="greeting" filename="vm-greeting.wav"/> + <prompt phrase="selected" filename="vm-selected.wav"/> + <prompt phrase="is not available" filename="vm-not_available.wav"/> + <prompt phrase="message number" filename="vm-message_number.wav"/> + <prompt phrase="deleted" filename="vm-deleted.wav"/> + <prompt phrase="Your recording is below the minimum acceptable length, please try again" filename="vm-too-small.wav"/> + <prompt phrase="in folder inbox" filename="vm-in_folder.wav"/> + <prompt phrase="to return the call now" filename="vm-return_call.wav"/> + <prompt phrase="urgent" filename="vm-urgent.wav"/> + </voicemail> + <conference> + <prompt phrase="NULL" filename="conf-ack.wav" type="tone"/> + <prompt phrase="NULL" filename="conf-nack.wav" type="tone"/> + <prompt phrase="You are now muted." filename="conf-muted.wav"/> + <prompt phrase="You are now unmuted." filename="conf-unmuted.wav"/> + <prompt phrase="You are currently the only person in this conference." filename="conf-alone.wav"/> + <prompt phrase="NULL" filename="conf-perpetual.wav" type="music"/> + <prompt phrase="NULL" filename="conf-enter.wav" type="tone"/> + <prompt phrase="NULL" filename="conf-exit.wav" type="tone"/> + <prompt phrase="You have been kicked from this conference." filename="conf-kicked.wav"/> + <prompt phrase="This conference is locked." filename="conf-locked.wav"/> + <prompt phrase="The conference is now locked." filename="conf-is-locked.wav"/> + <prompt phrase="The conference is now unlocked." filename="conf-is-unlocked.wav"/> + <prompt phrase="Please enter the conference pin number." filename="conf-pin.wav"/> + <prompt phrase="Invalid pin number, try again." filename="conf-bad-pin.wav"/> + <prompt phrase="goodbye" filename="conf-goodbye.wav"/> + <prompt phrase="Welcome to the conference." filename="conf-welcome.wav"/> + </conference> + <ivr> + <prompt phrase="Account number" filename="ivr-account_number.wav"/> + <prompt phrase="Connect to caller" filename="ivr-connect_to_caller.wav"/> + <prompt phrase="If you know your party's extension, please enter it now" filename="ivr-enter_ext_pound.wav"/> + <prompt phrase="Please enter an extension followed by the pound sign" filename="ivr-enter_ext.wav"/> + <prompt phrase="For this person" filename="ivr-for_this_person.wav"/> + <prompt phrase="Please hold while I connect your call" filename="ivr-hold_connect_call.wav"/> + <prompt phrase="I'm sorry" filename="ivr-im_sorry.wav"/> + <prompt phrase="Please" filename="ivr-please.wav"/> + <prompt phrase="Please return our call at" filename="ivr-please_return_our_call_at.wav"/> + <prompt phrase="Regarding reference number" filename="ivr-regarding_reference_number.wav"/> + <prompt phrase="This is a sample IVR submenu..." filename="ivr-sample_submenu.wav"/> + <prompt phrase="Please say your name after the tone" filename="ivr-say_name.wav"/> + <prompt phrase="Send this caller to voicemail" filename="ivr-send_to_voicemail.wav"/> + <prompt phrase="To speak to a customer service representative" filename="ivr-speak_to_a_customer_service_representative.wav"/> + <prompt phrase="Take a message" filename="ivr-take_a_message.wav"/> + <prompt phrase="Thank you" filename="ivr-thank_you.wav"/> + <prompt phrase="That was an invalid entry" filename="ivr-that_was_an_invalid_entry.wav"/> + <prompt phrase="This is a call from" filename="ivr-this_is_a_call_from.wav"/> + <prompt phrase="This IVR will let you test some of the features..." filename="ivr-this_ivr_will_let_you_test_features.wav"/> + <prompt phrase="To call the FreeSWITCH conference" filename="ivr-to_call_the_freeswitch_conference.wav"/> + <prompt phrase="To do a FreeSWITCH echo test" filename="ivr-to_do_a_freeswitch_echo_test.wav"/> + <prompt phrase="To do a fwd echo test" filename="ivr-to_do_a_fwd_echo_test.wav"/> + <prompt phrase="To hear a sample IVR submenu" filename="ivr-to_hear_sample_submenu.wav"/> + <prompt phrase="To hear screaming monkeys" filename="ivr-to_hear_screaming_monkeys.wav"/> + <prompt phrase="To list to music on hold" filename="ivr-to_listen_to_moh.wav"/> + <prompt phrase="To repeat these options" filename="ivr-to_repeat_these_options.wav"/> + <prompt phrase="To return to the previous menu" filename="ivr-to_return_to_previous_menu.wav"/> + <prompt phrase="To speak with an operator" filename="ivr-to_speak_with_an_operator.wav"/> + <prompt phrase="Welcome to FreeSWITCH, the future of telephony" filename="ivr-welcome_to_freeswitch.wav"/> + <prompt phrase="You may exit at any time by simply hanging up" filename="ivr-you_may_exit_by_hanging_up.wav"/> + <prompt phrase="or" filename ="ivr-or.wav"/> + <prompt phrase="not" filename ="ivr-not.wav"/> + <prompt phrase="call" filename ="ivr-call.wav"/> + <prompt phrase="You may" filename ="ivr-you_may.wav"/> + <prompt phrase="hello" filename="ivr-hello.wav"/> + <prompt phrase="Using your telephone keypad..." filename="ivr-use_telephone_keypad.wav"/> + <prompt phrase="please spell the name of the person you are trying to reach." filename="ivr-spell_name.wav"/> + <prompt phrase="Last name first" filename="ivr-last_name_first.wav"/> + <prompt phrase="First name first" filename="ivr-first_name_first.wav"/> + <prompt phrase="Press 1 for Q or Z." filename="ivr-press_one_q_or_z.wav"/> + <prompt phrase="Sales" filename="ivr-sales.wav"/> + <prompt phrase="Customer service" filename="ivr-customer_service.wav"/> + <prompt phrase="Technical support" filename="ivr-technical_support.wav"/> + <prompt phrase="Operator" filename="ivr-operator.wav"/> + </ivr> + <misc> + <prompt phrase="This call has been secured" filename="call_secured.wav"/> + <prompt phrase="Followed by pound" filename="followed.wav"/> + <prompt phrase="If you are this person" filename="if_you_are_this_person.wav"/> + <prompt phrase="If you would like to" filename="if_you_would_like_to.wav"/> + <prompt phrase="Provide reference number" filename="provide_reference_number.wav"/> + <prompt phrase="Please enter extension you want to transfer to" filename="transfer1.wav"/> + <prompt phrase="Transfer" filename="transfer2.wav"/> + <prompt phrase="We are trying to reach" filename="we_are_trying_to_reach.wav"/> + <prompt phrase="An error has occurred please contact the administrator" filename="error.wav"/> + </misc> + </en> +</language>

1 0

[commit] r13018 - freeswitch/trunk/src/mod/endpoints/mod_loopback
by FreeSWITCH SVN 14 Apr '09

14 Apr '09

Author: anthm Date: Tue Apr 14 12:29:38 2009 New Revision: 13018 Log: flush queued frames on audio sync event Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Tue Apr 14 12:29:38 2009 @@ -688,6 +688,25 @@ default: break; } + + switch (msg->message_id) { + case SWITCH_MESSAGE_INDICATE_BRIDGE: + case SWITCH_MESSAGE_INDICATE_UNBRIDGE: + case SWITCH_MESSAGE_INDICATE_AUDIO_SYNC: + { + void *pop; + + while (switch_queue_trypop(tech_pvt->frame_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) { + switch_frame_t *frame = (switch_frame_t *) pop; + switch_frame_free(&frame); + } + } + break; + default: + break; + } + + return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r13017 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 14 Apr '09

14 Apr '09

Author: anthm Date: Tue Apr 14 11:55:10 2009 New Revision: 13017 Log: move rtp stats up to where they will be more useful Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Apr 14 11:55:10 2009 @@ -411,6 +411,9 @@ *tech_pvt->sofia_private->uuid = '\0'; } + + sofia_glue_set_rtp_stats(tech_pvt); + switch_mutex_unlock(tech_pvt->sofia_mutex); return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Tue Apr 14 11:55:10 2009 @@ -854,3 +854,4 @@ int sofia_get_loglevel(const char *name); sofia_cid_type_t sofia_cid_name2type(const char *name); void sofia_glue_tech_set_local_sdp(private_object_t *tech_pvt, const char *sdp_str, switch_bool_t dup); +void sofia_glue_set_rtp_stats(private_object_t *tech_pvt); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Tue Apr 14 11:55:10 2009 @@ -1723,6 +1723,17 @@ } } +void sofia_glue_set_rtp_stats(private_object_t *tech_pvt) +{ + if (tech_pvt->rtp_session) { + set_stats(tech_pvt->rtp_session, tech_pvt, "audio"); + } + + if (tech_pvt->video_rtp_session) { + set_stats(tech_pvt->video_rtp_session, tech_pvt, "video"); + } +} + void sofia_glue_deactivate_rtp(private_object_t *tech_pvt) { int loops = 0; @@ -1734,14 +1745,12 @@ } if (tech_pvt->rtp_session) { - set_stats(tech_pvt->rtp_session, tech_pvt, "audio"); switch_rtp_destroy(&tech_pvt->rtp_session); } else if (tech_pvt->local_sdp_audio_port) { switch_rtp_release_port(tech_pvt->profile->rtpip, tech_pvt->local_sdp_audio_port); } if (tech_pvt->video_rtp_session) { - set_stats(tech_pvt->video_rtp_session, tech_pvt, "video"); switch_rtp_destroy(&tech_pvt->video_rtp_session); } else if (tech_pvt->local_sdp_video_port) { switch_rtp_release_port(tech_pvt->profile->rtpip, tech_pvt->local_sdp_video_port);

1 0