<!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][14741] </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=14741">14741</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-09-02 11:55:17 -0500 (Wed, 02 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>add play-file-done conference event</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_conferencemod_conferencec">freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodapplicationsmod_conferencemod_conferencec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (14740 => 14741)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c 2009-09-02 16:34:49 UTC (rev 14740)
+++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c 2009-09-02 16:55:17 UTC (rev 14741)
</span><span class="lines">@@ -222,6 +222,7 @@
</span><span class="cx"> switch_memory_pool_t *pool;
</span><span class="cx"> uint32_t leadin;
</span><span class="cx"> struct conference_file_node *next;
</span><ins>+ char *file;
</ins><span class="cx"> } conference_file_node_t;
</span><span class="cx">
</span><span class="cx"> /* conference xml config sections */
</span><span class="lines">@@ -1041,6 +1042,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (file_sample_len <= 0) {
</span><ins>+ if (test_eflag(conference, EFLAG_PLAY_FILE) &&
+ switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+ conference_add_event_data(conference, event);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "play-file-done");
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "File", conference->fnode->file);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Async", "true");
+ switch_event_fire(&event);
+ }
+
</ins><span class="cx"> conference->fnode->done++;
</span><span class="cx"> } else {
</span><span class="cx"> has_file_data = 1;
</span><span class="lines">@@ -1057,6 +1067,14 @@
</span><span class="cx"> switch_core_file_read(&conference->async_fnode->fh, async_file_frame, &file_sample_len);
</span><span class="cx">
</span><span class="cx"> if (file_sample_len <= 0) {
</span><ins>+ if (test_eflag(conference, EFLAG_PLAY_FILE) &&
+ switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+ conference_add_event_data(conference, event);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "play-file-done");
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "File", conference->fnode->file);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Async", "true");
+ switch_event_fire(&event);
+ }
</ins><span class="cx"> conference->async_fnode->done++;
</span><span class="cx"> } else {
</span><span class="cx"> if (has_file_data) {
</span><span class="lines">@@ -2223,6 +2241,14 @@
</span><span class="cx">
</span><span class="cx"> if (file_sample_len <= 0) {
</span><span class="cx"> member->fnode->done++;
</span><ins>+
+ if (test_eflag(member->conference, EFLAG_PLAY_FILE) &&
+ switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
+ conference_add_event_data(member->conference, event);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "play-file-member-done");
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "File", member->fnode->file);
+ switch_event_fire(&event);
+ }
</ins><span class="cx"> } else { /* there is file node data to deliver */
</span><span class="cx"> write_frame.data = file_frame;
</span><span class="cx"> write_frame.datalen = (uint32_t) file_data_len;
</span><span class="lines">@@ -2677,6 +2703,8 @@
</span><span class="cx">
</span><span class="cx"> fnode->pool = pool;
</span><span class="cx"> fnode->async = async;
</span><ins>+ fnode->file = switch_core_strdup(fnode->pool, file);
+
</ins><span class="cx"> /* Queue the node */
</span><span class="cx"> switch_mutex_lock(conference->mutex);
</span><span class="cx">
</span><span class="lines">@@ -2771,6 +2799,7 @@
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx"> fnode->pool = pool;
</span><ins>+ fnode->file = switch_core_strdup(fnode->pool, file);
</ins><span class="cx"> /* Queue the node */
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_DEBUG, "Queueing file '%s' for play\n", file);
</span><span class="cx"> switch_mutex_lock(member->control_mutex);
</span><span class="lines">@@ -3525,6 +3554,7 @@
</span><span class="cx"> conference_add_event_data(conference, event);
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "play-file");
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "File", argv[2]);
</span><ins>+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Async", async ? "true" : "false");
</ins><span class="cx"> switch_event_fire(&event);
</span><span class="cx"> }
</span><span class="cx"> } else {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>