<!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][14457] </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=14457">14457</a></dd>
<dt>Author</dt> <dd>seven</dd>
<dt>Date</dt> <dd>2009-08-01 23:22:20 -0500 (Sat, 01 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>reconnect on disconnect, add shutdown FS button</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribsevenREADME">freeswitch/trunk/contrib/seven/README</a></li>
<li><a href="#freeswitchtrunkcontribsevenfsairFreeSWITCHAirair">freeswitch/trunk/contrib/seven/fsair/FreeSWITCH-Air.air</a></li>
<li><a href="#freeswitchtrunkcontribsevenfsairsrcfsairas">freeswitch/trunk/contrib/seven/fsair/src/fsair.as</a></li>
<li><a href="#freeswitchtrunkcontribsevenfsairsrcfsairmxml">freeswitch/trunk/contrib/seven/fsair/src/fsair.mxml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribsevenREADME"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/seven/README (14456 => 14457)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/seven/README 2009-08-01 20:00:18 UTC (rev 14456)
+++ freeswitch/trunk/contrib/seven/README 2009-08-02 04:22:20 UTC (rev 14457)
</span><span class="lines">@@ -1 +1 @@
</span><del>-Currently blank...
</del><ins>+fsair - FreeSWITCH Air http://wiki.freeswitch.org/wiki/FsAir
</ins></span></pre></div>
<a id="freeswitchtrunkcontribsevenfsairFreeSWITCHAirair"></a>
<div class="binary"><h4>Modified: freeswitch/trunk/contrib/seven/fsair/FreeSWITCH-Air.air</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="freeswitchtrunkcontribsevenfsairsrcfsairas"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/seven/fsair/src/fsair.as (14456 => 14457)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/seven/fsair/src/fsair.as 2009-08-01 20:00:18 UTC (rev 14456)
+++ freeswitch/trunk/contrib/seven/fsair/src/fsair.as 2009-08-02 04:22:20 UTC (rev 14457)
</span><span class="lines">@@ -12,11 +12,18 @@
</span><span class="cx">
</span><span class="cx"> var ring_win:MessageWindow = new MessageWindow();
</span><span class="cx">
</span><ins>+ var connect_timer:Timer = new Timer(2000);
+ var re_connect_timer:Timer = new Timer(2000);
+
</ins><span class="cx"> function initApp():void {
</span><span class="cx"> trace(NativeApplication.nativeApplication.runtimeVersion);
</span><span class="cx"> ringBox.visible = false;
</span><span class="cx"> getSettings();
</span><span class="cx"> esl = new ESL(esl_pass.text);
</span><ins>+
+ connect_timer.addEventListener(TimerEvent.TIMER, post_connect);
+ re_connect_timer.addEventListener(TimerEvent.TIMER, re_connect);
+
</ins><span class="cx"> connect();
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -40,9 +47,7 @@
</span><span class="cx"> esl.addEventCallback("CUSTOM|portaudio::ringing", onRing);
</span><span class="cx"> esl.addEventCallback("CHANNEL_HANGUP|-", onHangup);
</span><span class="cx">
</span><del>- var timer:Timer = new Timer(2000);
- timer.addEventListener(TimerEvent.TIMER, post_connect);
- timer.start();
</del><ins>+ connect_timer.start();
</ins><span class="cx"> msg("timer started");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -54,8 +59,31 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function re_connect(event:TimerEvent):void {
+
+ event.target.stop();
+
+ event.target.delay += 2000;
+
+ if (event.target.delay > 120000) {
+ event.target.delay = 2000;
+ }
+
+ msg("Connect faild. will reconnect in " + event.target.delay + " seconds" );
+ connect();
+
+ }
+
</ins><span class="cx"> function post_connect(event:TimerEvent):void {
</span><ins>+
</ins><span class="cx"> event.target.stop();
</span><ins>+
+ if (!esl.connected) {
+ event.target.stop();
+ re_connect_timer.start();
+ return;
+ }
+
</ins><span class="cx"> msg("timer stoped");
</span><span class="cx"> initDevList();
</span><span class="cx"> // esl.esl_event("ALL");
</span><span class="lines">@@ -91,11 +119,20 @@
</span><span class="cx"> }
</span><span class="cx"> function ioErrorHandler(event:IOErrorEvent):void {
</span><span class="cx"> msg(event.type + ' ' + event.toString());
</span><del>- setTitle('IOError');
</del><ins>+ setTitle('IOError');
+
+ if (!esl.connected) {
+ connect();
+ }
</ins><span class="cx"> }
</span><span class="cx"> function securityErrorHandler(event:SecurityErrorEvent):void {
</span><span class="cx"> msg(event.type + ' ' + event.toString());
</span><del>- setTitle('SecurityError');
</del><ins>+ setTitle('SecurityError');
+
+ if (!esl.connected) {
+ connect();
+ }
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onRing(eslev:ESL_event):void {
</span><span class="lines">@@ -303,4 +340,13 @@
</span><span class="cx"> esl_port.text = _get_settings("esl_port") || "8021";
</span><span class="cx"> esl_pass.text = _get_settings("esl_pass") || "ClueCon";
</span><span class="cx"> }
</span><ins>+
+ function runFS():void {
+
+ }
+
+ function shutdownFS():void {
+ esl.api("fsctl shutdown");
+ }
+
</ins><span class="cx">
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="freeswitchtrunkcontribsevenfsairsrcfsairmxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/seven/fsair/src/fsair.mxml (14456 => 14457)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/seven/fsair/src/fsair.mxml 2009-08-01 20:00:18 UTC (rev 14456)
+++ freeswitch/trunk/contrib/seven/fsair/src/fsair.mxml 2009-08-02 04:22:20 UTC (rev 14457)
</span><span class="lines">@@ -62,7 +62,8 @@
</span><span class="cx"> <mx:Button x="271" y="182" label="Save" click="saveSettings()"/>
</span><span class="cx"> <mx:Label x="175" y="80" text="Password" width="58"/>
</span><span class="cx"> <mx:TextInput x="175" y="106" width="71" text="ClueCon" id="esl_pass"/>
</span><del>-
</del><ins>+ <mx:Button x="10" y="182" label="Shutdown FS" click="shutdownFS()"/>
+
</ins><span class="cx"> </mx:Canvas>
</span><span class="cx"> <mx:Panel label="Logs" width="100%" height="100%" layout="absolute">
</span><span class="cx"> <mx:TextArea width="326" height="196" id="logBox" x="0" y="2"/>
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>