<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][14386] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=14386">14386</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-07-27 13:44:30 -0500 (Mon, 27 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>mod_voicemail: add option to move to next and previous message(<a href="http://jira.freeswitch.org/browse/MODAPP-313">MODAPP-313</a>)
<!--<param name="previous-message-key" value=""/>-->
<!--<param name="previous-message-key" value=""/>--></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkconfautoload_configsvoicemailconfxml">freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_voicemailmod_voicemailc">freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkconfautoload_configsvoicemailconfxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml (14385 => 14386)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml 2009-07-27 18:00:26 UTC (rev 14385)
+++ freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml 2009-07-27 18:44:30 UTC (rev 14386)
</span><span class="lines">@@ -33,6 +33,8 @@
</span><span class="cx"> <param name="ff-key" value="6"/>
</span><span class="cx"> <param name="rew-key" value="4"/>
</span><span class="cx"> <param name="skip-greet-key" value="#"/>
</span><ins>+ <!--<param name="previous-message-key" value=""/>-->
+ <!--<param name="next-message-key" value=""/>-->
</ins><span class="cx"> <param name="record-silence-threshold" value="200"/>
</span><span class="cx"> <param name="record-silence-hits" value="2"/>
</span><span class="cx"> <param name="web-template-file" value="web-vm.tpl"/>
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_voicemailmod_voicemailc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (14385 => 14386)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c 2009-07-27 18:00:26 UTC (rev 14385)
+++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c 2009-07-27 18:44:30 UTC (rev 14386)
</span><span class="lines">@@ -67,6 +67,11 @@
</span><span class="cx"> PFLAG_DESTROY = 1 << 0
</span><span class="cx"> } vm_flags_t;
</span><span class="cx">
</span><ins>+typedef enum {
+ VM_MOVE_NEXT,
+ VM_MOVE_PREV
+} msg_move_t;
+
</ins><span class="cx"> #define VM_PROFILE_CONFIGITEM_COUNT 100
</span><span class="cx">
</span><span class="cx"> struct vm_profile {
</span><span class="lines">@@ -99,6 +104,8 @@
</span><span class="cx"> char restart_key[2];
</span><span class="cx"> char ff_key[2];
</span><span class="cx"> char rew_key[2];
</span><ins>+ char prev_msg_key[2];
+ char next_msg_key[2];
</ins><span class="cx"> char urgent_key[2];
</span><span class="cx"> char operator_key[2];
</span><span class="cx"> char vmain_key[2];
</span><span class="lines">@@ -498,6 +505,10 @@
</span><span class="cx"> &profile->ff_key, "6", &config_dtmf, NULL, NULL);
</span><span class="cx"> SWITCH_CONFIG_SET_ITEM(profile->config[i++], "rew-key", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
</span><span class="cx"> &profile->rew_key, "4", &config_dtmf, NULL, NULL);
</span><ins>+ SWITCH_CONFIG_SET_ITEM(profile->config[i++], "previous-message-key", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
+ &profile->prev_msg_key, "", &config_dtmf, NULL, NULL);
+ SWITCH_CONFIG_SET_ITEM(profile->config[i++], "next-message-key", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
+ &profile->next_msg_key, "", &config_dtmf, NULL, NULL);
</ins><span class="cx"> SWITCH_CONFIG_SET_ITEM(profile->config[i++], "urgent-key", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
</span><span class="cx"> &profile->urgent_key, "*", &config_dtmf, NULL, NULL);
</span><span class="cx"> SWITCH_CONFIG_SET_ITEM(profile->config[i++], "operator-key", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
</span><span class="lines">@@ -870,7 +881,7 @@
</span><span class="cx">
</span><span class="cx"> if (!cc->noexit
</span><span class="cx"> && (dtmf->digit == *cc->profile->delete_file_key || dtmf->digit == *cc->profile->save_file_key
</span><del>- || dtmf->digit == *cc->profile->terminator_key)) {
</del><ins>+ || dtmf->digit == *cc->profile->prev_msg_key || dtmf->digit == *cc->profile->next_msg_key)) {
</ins><span class="cx"> *cc->buf = dtmf->digit;
</span><span class="cx"> return SWITCH_STATUS_BREAK;
</span><span class="cx"> }
</span><span class="lines">@@ -906,6 +917,10 @@
</span><span class="cx"> switch_core_file_seek(fh, &pos, samps, SEEK_CUR);
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><ins>+ if (!cc->noexit && dtmf->digit == *cc->profile->terminator_key) {
+ *cc->buf = dtmf->digit;
+ return SWITCH_STATUS_BREAK;
+ }
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="lines">@@ -1214,6 +1229,7 @@
</span><span class="cx"> int index;
</span><span class="cx"> int want;
</span><span class="cx"> msg_type_t type;
</span><ins>+ msg_move_t move;
</ins><span class="cx"> };
</span><span class="cx"> typedef struct listen_callback listen_callback_t;
</span><span class="cx">
</span><span class="lines">@@ -1478,8 +1494,11 @@
</span><span class="cx"> } else {
</span><span class="cx"> TRY_CODE(vm_macro_get(session, VM_LISTEN_FILE_CHECK_MACRO, key_buf, input, sizeof(input), 1, "", &term, profile->digit_timeout));
</span><span class="cx"> }
</span><del>-
- if (!strcmp(input, profile->listen_file_key)) {
</del><ins>+ if (!strcmp(input, profile->prev_msg_key)) {
+ cbt->move = VM_MOVE_PREV;
+ } else if (!strcmp(input, profile->next_msg_key)) {
+ cbt->move = VM_MOVE_NEXT;
+ } else if (!strcmp(input, profile->listen_file_key)) {
</ins><span class="cx"> goto play_file;
</span><span class="cx"> } else if (!strcmp(input, profile->callback_key)) {
</span><span class="cx"> switch_core_session_execute_exten(session, cbt->cid_number, profile->callback_dialplan, profile->callback_context);
</span><span class="lines">@@ -1824,6 +1843,7 @@
</span><span class="cx"> &total_new_urgent_messages, &total_saved_urgent_messages);
</span><span class="cx"> memset(&cbt, 0, sizeof(cbt));
</span><span class="cx"> cbt.email = vm_email;
</span><ins>+ cbt.move = VM_MOVE_NEXT;
</ins><span class="cx"> switch (play_msg_type) {
</span><span class="cx"> case MSG_NEW:
</span><span class="cx"> {
</span><span class="lines">@@ -1849,8 +1869,16 @@
</span><span class="cx"> cbt.index = 0;
</span><span class="cx"> cbt.want = cur_message;
</span><span class="cx"> cbt.type = play_msg_type;
</span><ins>+ cbt.move = VM_MOVE_NEXT;
</ins><span class="cx"> vm_execute_sql_callback(profile, profile->mutex, sql, listen_callback, &cbt);
</span><span class="cx"> status = listen_file(session, profile, &cbt);
</span><ins>+ if (cbt.move == VM_MOVE_PREV) {
+ if (cur_message <= 0) {
+ cur_message = -1;
+ } else {
+ cur_message -= 2;
+ }
+ }
</ins><span class="cx"> if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) {
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>