You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/02/03 16:35:20 UTC
svn commit: r1240215 [4/4] - in
/incubator/openmeetings/trunk/singlewebapp/WebContent: languages/
openmeetings/swf10/ openmeetings/swf10/base/components/explorer/resources/
openmeetings/swf10/base/remote/ openmeetings/swf10/video/
src/base/hibernate/ s...
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml?rev=1240215&r1=1240214&r2=1240215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml Fri Feb 3 15:35:18 2012
@@ -22,7 +22,7 @@
<!--###############################################
This File is auto-generated by the LanguageEditor
to add new Languages or modify/customize it use the LanguageEditor
-see http://code.google.com/p/openmeetings/wiki/LanguageEditor for Details
+see http://incubator.apache.org/openmeetings/LanguageEditor.html for Details
###############################################-->
<language>
<string id="1" name="conference">
@@ -869,10 +869,10 @@ see http://code.google.com/p/openmeeting
<value>ÐомоÑÑ Ð¸ поддеÑжка</value>
</string>
<string id="282" name="dashboard_quickhomepageurl">
- <value>http://code.google.com/p/openmeetings/</value>
+ <value>http://incubator.apache.org/openmeetings/</value>
</string>
<string id="283" name="dashboard_quickmailinglisturl">
- <value>http://groups.google.com/group/openmeetings-user</value>
+ <value>http://incubator.apache.org/openmeetings/mail-lists.html</value>
</string>
<string id="284" name="dashboard_reportbugs">
<value>ÐÑибка?</value>
@@ -881,10 +881,10 @@ see http://code.google.com/p/openmeeting
<value>еÑе</value>
</string>
<string id="286" name="dashboard_quicklinkhomepagelabel">
- <value>ÐебÑÐ°Ð¹Ñ Ð¿ÑоекÑа (code.google.com/p/openmeetings/)</value>
+ <value>ÐебÑÐ°Ð¹Ñ Ð¿ÑоекÑа (http://incubator.apache.org/openmeetings)</value>
</string>
<string id="287" name="dashboard_quicklinkmailinglistlabel">
- <value>СпиÑок ÑлекÑÑоннÑÑ
адÑеÑов полÑзоваÑелей (groups.google.com/group/openmeetings-user)</value>
+ <value>СпиÑок ÑлекÑÑоннÑÑ
адÑеÑов полÑзоваÑелей (http://incubator.apache.org/openmeetings/mail-lists.html)</value>
</string>
<string id="288" name="login_rememberuser">
<value>ÐапомниÑÑ Ð¼ÐµÐ½Ñ</value>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml?rev=1240215&r1=1240214&r2=1240215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml Fri Feb 3 15:35:18 2012
@@ -22,7 +22,7 @@
<!--###############################################
This File is auto-generated by the LanguageEditor
to add new Languages or modify/customize it use the LanguageEditor
-see http://code.google.com/p/openmeetings/wiki/LanguageEditor for Details
+see http://incubator.apache.org/openmeetings/LanguageEditor.html for Details
###############################################-->
<language>
<string id="1" name="conference">
@@ -869,10 +869,10 @@ see http://code.google.com/p/openmeeting
<value>Pomoc a podpora</value>
</string>
<string id="282" name="dashboard_quickhomepageurl">
- <value>http://code.google.com/p/openmeetings/</value>
+ <value>http://incubator.apache.org/openmeetings/</value>
</string>
<string id="283" name="dashboard_quickmailinglisturl">
- <value>http://groups.google.com/group/openmeetings-user</value>
+ <value>http://incubator.apache.org/openmeetings/mail-lists.html</value>
</string>
<string id="284" name="dashboard_reportbugs">
<value>Nahlásiť chybu</value>
@@ -881,10 +881,10 @@ see http://code.google.com/p/openmeeting
<value>viac</value>
</string>
<string id="286" name="dashboard_quicklinkhomepagelabel">
- <value>Stránka projektu (code.google.com/p/openmeetings/)</value>
+ <value>Stránka projektu (http://incubator.apache.org/openmeetings)</value>
</string>
<string id="287" name="dashboard_quicklinkmailinglistlabel">
- <value>Zoznam použÃvateľov (groups.google.com/group/openmeetings-user)</value>
+ <value>Zoznam použÃvateľov (http://incubator.apache.org/openmeetings/mail-lists.html)</value>
</string>
<string id="288" name="login_rememberuser">
<value>Zapamätať prihlásenie</value>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml?rev=1240215&r1=1240214&r2=1240215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml Fri Feb 3 15:35:18 2012
@@ -22,7 +22,7 @@
<!--###############################################
This File is auto-generated by the LanguageEditor
to add new Languages or modify/customize it use the LanguageEditor
-see http://code.google.com/p/openmeetings/wiki/LanguageEditor for Details
+see http://incubator.apache.org/openmeetings/LanguageEditor.html for Details
###############################################-->
<language>
<string id="1" name="conference">
@@ -870,10 +870,10 @@ see http://code.google.com/p/openmeeting
<value>Ayuda y Soporte Técnico</value>
</string>
<string id="282" name="dashboard_quickhomepageurl">
- <value>http://code.google.com/p/openmeetings/</value>
+ <value>http://incubator.apache.org/openmeetings/</value>
</string>
<string id="283" name="dashboard_quickmailinglisturl">
- <value>http://groups.google.com/group/openmeetings-user</value>
+ <value>http://incubator.apache.org/openmeetings/mail-lists.html</value>
</string>
<string id="284" name="dashboard_reportbugs">
<value>Enviar "bug"</value>
@@ -882,10 +882,10 @@ see http://code.google.com/p/openmeeting
<value>más</value>
</string>
<string id="286" name="dashboard_quicklinkhomepagelabel">
- <value>Web del Proyecto (code.google.com/p/openmeetings/)</value>
+ <value>Web del Proyecto (http://incubator.apache.org/openmeetings)</value>
</string>
<string id="287" name="dashboard_quicklinkmailinglistlabel">
- <value>Lista de correo del Proyecto (groups.google.com/group/openmeetings-user)</value>
+ <value>Lista de correo del Proyecto (http://incubator.apache.org/openmeetings/mail-lists.html)</value>
</string>
<string id="288" name="login_rememberuser">
<value>Recordar</value>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml?rev=1240215&r1=1240214&r2=1240215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml Fri Feb 3 15:35:18 2012
@@ -22,7 +22,7 @@
<!--###############################################
This File is auto-generated by the LanguageEditor
to add new Languages or modify/customize it use the LanguageEditor
-see http://code.google.com/p/openmeetings/wiki/LanguageEditor for Details
+see http://incubator.apache.org/openmeetings/LanguageEditor.html for Details
###############################################-->
<language>
<string id="1" name="conference">
@@ -869,10 +869,10 @@ see http://code.google.com/p/openmeeting
<value>Hjälp och Support</value>
</string>
<string id="282" name="dashboard_quickhomepageurl">
- <value>http://code.google.com/p/openmeetings/</value>
+ <value>http://incubator.apache.org/openmeetings/</value>
</string>
<string id="283" name="dashboard_quickmailinglisturl">
- <value>http://groups.google.com/group/openmeetings-user</value>
+ <value>http://incubator.apache.org/openmeetings/mail-lists.html</value>
</string>
<string id="284" name="dashboard_reportbugs">
<value>Buggrapport</value>
@@ -881,10 +881,10 @@ see http://code.google.com/p/openmeeting
<value>mera</value>
</string>
<string id="286" name="dashboard_quicklinkhomepagelabel">
- <value>Projektets Webbsida (code.google.com/p/openmeetings/)</value>
+ <value>Projektets Webbsida (http://incubator.apache.org/openmeetings)</value>
</string>
<string id="287" name="dashboard_quicklinkmailinglistlabel">
- <value>Epostlista För Användare (groups.google.com/group/openmeetings-user)</value>
+ <value>Epostlista För Användare (http://incubator.apache.org/openmeetings/mail-lists.html)</value>
</string>
<string id="288" name="login_rememberuser">
<value>Kom Ihåg Inloggning</value>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml?rev=1240215&r1=1240214&r2=1240215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Fri Feb 3 15:35:18 2012
@@ -22,7 +22,7 @@
<!--###############################################
This File is auto-generated by the LanguageEditor
to add new Languages or modify/customize it use the LanguageEditor
-see http://code.google.com/p/openmeetings/wiki/LanguageEditor for Details
+see http://incubator.apache.org/openmeetings/LanguageEditor.html for Details
###############################################-->
<language>
<string id="1" name="conference">
@@ -869,10 +869,10 @@ see http://code.google.com/p/openmeeting
<value>à¸à¹à¸à¸¡à¸¹à¸¥à¸à¹à¸§à¸¢à¹à¸«à¸¥à¸·à¸à¹à¸¥à¸°à¸ªà¸à¸±à¸à¸ªà¸à¸¸à¸</value>
</string>
<string id="282" name="dashboard_quickhomepageurl">
- <value>http://code.google.com/p/openmeetings/</value>
+ <value>http://incubator.apache.org/openmeetings/</value>
</string>
<string id="283" name="dashboard_quickmailinglisturl">
- <value>http://groups.google.com/group/openmeetings-user</value>
+ <value>http://incubator.apache.org/openmeetings/mail-lists.html</value>
</string>
<string id="284" name="dashboard_reportbugs">
<value>รายà¸à¸²à¸à¹à¸«à¸à¸¸à¸à¸±à¸à¸à¹à¸à¸!</value>
@@ -881,10 +881,10 @@ see http://code.google.com/p/openmeeting
<value>à¹à¸à¸´à¹à¸¡à¹à¸à¸´à¸¡</value>
</string>
<string id="286" name="dashboard_quicklinkhomepagelabel">
- <value>à¹à¸§à¹à¸à¹à¸à¸à¹à¸à¸à¸à¹à¸à¸£à¸à¸à¸²à¸£ (code.google.com/p/openmeetings/)</value>
+ <value>à¹à¸§à¹à¸à¹à¸à¸à¹à¸à¸à¸à¹à¸à¸£à¸à¸à¸²à¸£ (http://incubator.apache.org/openmeetings)</value>
</string>
<string id="287" name="dashboard_quicklinkmailinglistlabel">
- <value>รายà¸à¸·à¹à¸à¸à¸µà¹à¸¡à¸¥à¹à¸à¸à¸à¸à¸¹à¹à¹à¸à¹ (groups.google.com/group/openmeetings-user)</value>
+ <value>รายà¸à¸·à¹à¸à¸à¸µà¹à¸¡à¸¥à¹à¸à¸à¸à¸à¸¹à¹à¹à¸à¹ (http://incubator.apache.org/openmeetings/mail-lists.html)</value>
</string>
<string id="288" name="login_rememberuser">
<value>à¸à¸³à¸à¸·à¹à¸à¸¥à¹à¸à¸à¸à¸´à¸</value>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml?rev=1240215&r1=1240214&r2=1240215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml Fri Feb 3 15:35:18 2012
@@ -21,7 +21,7 @@
<!--###############################################
This File is auto-generated by the LanguageEditor
to add new Languages or modify/customize it use the LanguageEditor
-see http://code.google.com/p/openmeetings/wiki/LanguageEditor for Details
+see http://incubator.apache.org/openmeetings/LanguageEditor.html for Details
###############################################-->
<language>
<string id="1" name="conference">
@@ -868,10 +868,10 @@ see http://code.google.com/p/openmeeting
<value>yardım ve Destek</value>
</string>
<string id="282" name="dashboard_quickhomepageurl">
- <value>http://code.google.com/p/openmeetings/</value>
+ <value>http://incubator.apache.org/openmeetings/</value>
</string>
<string id="283" name="dashboard_quickmailinglisturl">
- <value>http://groups.google.com/group/openmeetings-user</value>
+ <value>http://incubator.apache.org/openmeetings/mail-lists.html</value>
</string>
<string id="284" name="dashboard_reportbugs">
<value>Hata bildir!</value>
@@ -880,10 +880,10 @@ see http://code.google.com/p/openmeeting
<value>daha fazlası</value>
</string>
<string id="286" name="dashboard_quicklinkhomepagelabel">
- <value>Proje Web Sitesi (code.google.com/p/openmeetings/)</value>
+ <value>Proje Web Sitesi (http://incubator.apache.org/openmeetings)</value>
</string>
<string id="287" name="dashboard_quicklinkmailinglistlabel">
- <value>Kullanıcı E-Posta Listesi (groups.google.com/group/openmeetings-user)</value>
+ <value>Kullanıcı E-Posta Listesi (http://incubator.apache.org/openmeetings/mail-lists.html)</value>
</string>
<string id="288" name="login_rememberuser">
<value>Oturumu Hatırla</value>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml?rev=1240215&r1=1240214&r2=1240215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml Fri Feb 3 15:35:18 2012
@@ -22,7 +22,7 @@
<!--###############################################
This File is auto-generated by the LanguageEditor
to add new Languages or modify/customize it use the LanguageEditor
-see http://code.google.com/p/openmeetings/wiki/LanguageEditor for Details
+see http://incubator.apache.org/openmeetings/LanguageEditor.html for Details
###############################################-->
<language>
<string id="1" name="conference">
@@ -869,10 +869,10 @@ see http://code.google.com/p/openmeeting
<value>Ðопомога Ñ Ð¿ÑдÑÑимка</value>
</string>
<string id="282" name="dashboard_quickhomepageurl">
- <value>http://code.google.com/p/openmeetings/</value>
+ <value>http://incubator.apache.org/openmeetings/</value>
</string>
<string id="283" name="dashboard_quickmailinglisturl">
- <value>http://groups.google.com/group/openmeetings-user</value>
+ <value>http://incubator.apache.org/openmeetings/mail-lists.html</value>
</string>
<string id="284" name="dashboard_reportbugs">
<value>ÐовÑдомиÑи пÑо помилки!</value>
@@ -881,10 +881,10 @@ see http://code.google.com/p/openmeeting
<value>ÐÑлÑÑе</value>
</string>
<string id="286" name="dashboard_quicklinkhomepagelabel">
- <value>Ð¡Ð°Ð¹Ñ Ð¿ÑоекÑÑ (code.google.com/p/openmeetings/)</value>
+ <value>Ð¡Ð°Ð¹Ñ Ð¿ÑоекÑÑ (http://incubator.apache.org/openmeetings)</value>
</string>
<string id="287" name="dashboard_quicklinkmailinglistlabel">
- <value>User Mailing List (groups.google.com/group/openmeetings-user)</value>
+ <value>User Mailing List (http://incubator.apache.org/openmeetings/mail-lists.html)</value>
</string>
<string id="288" name="login_rememberuser">
<value>Ðапам'ÑÑаÑи вÑ
Ñд</value>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/library.lzx?rev=1240215&r1=1240214&r2=1240215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/library.lzx Fri Feb 3 15:35:18 2012
@@ -27,6 +27,10 @@
<resource name="explorer_resize_rsc" src="resizer.swf" />
+<resource name="btn_presenter_minimize" src="minimize_up.png" />
+<resource name="btn_presenter_maximize" src="maximize_up.png" />
+<resource name="btn_presenter_maximize2" src="maximize2_up.png" />
+
<resource name="btn_presenter_close">
<frame src="close_up.png" />
<frame src="close_mo.png" />
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/maximize2_up.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/maximize2_up.png?rev=1240215&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/maximize2_up.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/maximize_up.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/maximize_up.png?rev=1240215&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/maximize_up.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/minimize_up.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/minimize_up.png?rev=1240215&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/minimize_up.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/remote/rtmpConnection.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/remote/rtmpConnection.lzx?rev=1240215&r1=1240214&r2=1240215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/remote/rtmpConnection.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/remote/rtmpConnection.lzx Fri Feb 3 15:35:18 2012
@@ -60,6 +60,13 @@
s = 2;
break;
}
+
+ case "NetConnection.Connect.Closed": {
+ msg = stats.info.code;
+ this._nc = null;
+ s = 0;
+ break;
+ }
default: {
msg = stats.info.code;
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/hibAdapter.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/hibAdapter.lzx?rev=1240215&r1=1240214&r2=1240215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/hibAdapter.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/hibAdapter.lzx Fri Feb 3 15:35:18 2012
@@ -17,6 +17,8 @@
client.hibAdapter_setLabelObjectByHundred = this.hibAdapter_setLabelObjectByHundred;
client.setRoomValues = this.setRoomValues;
client.getRoomTypes = this.getRoomTypes;
+ client.disconnect = this.disconnect;
+ client.reconnectSuccess = this.reconnectSuccess;
var rtmpLC:LocalConnection = new LocalConnection();
rtmpLC.connect(canvas.rtmp_lc_name);
@@ -37,6 +39,17 @@
<method name="getRoomTypes" args="value">
canvas.roomTypesInitValues = value;
</method>
+
+ <method name="reconnectSuccess" args="connection_url">
+ if($debug) Debug.write("reconnectSuccess",connection_url);
+ canvas.thishib.setAttribute('src',connection_url);
+ canvas.thishib.connect();
+ </method>
+
+ <method name="disconnect" >
+ if($debug) Debug.write("Do disconnect");
+ canvas.thishib.disconnect();
+ </method>
</class>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/baseVideoObject.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/baseVideoObject.lzx?rev=1240215&r1=1240214&r2=1240215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/baseVideoObject.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/baseVideoObject.lzx Fri Feb 3 15:35:18 2012
@@ -115,30 +115,31 @@
<handler name="ony">
<![CDATA[
-
+ if ($debug) Debug.write("ony 1 ");
if (this.isInterview) {
return;
}
-
+ if ($debug) Debug.write("ony 2 ");
if (this.custom) {
return;
}
-
+ if ($debug) Debug.write("ony 3 ");
if (canvas.currentRoomObj.hideWhiteboard) {
return;
}
-
+ if ($debug) Debug.write("ony 4 ");
var bounds = this.getBounds();
var parentBounds = canvas.getBounds();
if ( bounds.y < 0 )
{
this.setAttribute('y',0);
}
-
+ if ($debug) Debug.write("ony 5 ");
if ( bounds.y > ( parentBounds.height - bounds.height ) )
{
this.setAttribute('y', parentBounds.height - bounds.height );
}
+ if ($debug) Debug.write("ony 6 ");
]]>
</handler>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/editRecordStreamSWF10.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/editRecordStreamSWF10.lzx?rev=1240215&r1=1240214&r2=1240215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/editRecordStreamSWF10.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/editRecordStreamSWF10.lzx Fri Feb 3 15:35:18 2012
@@ -144,12 +144,12 @@
var _camera = null;
if (valMic != null) {
_micro = Microphone.getMicrophone(valMic);
- _micro.codec = SoundCodec.SPEEX;
- _micro.framesPerPacket = 1;
- _micro.setSilenceLevel(0, 2000);
- _micro.gain = 50;
- // this has no effect if enhanced microphone is obtained
if (_micro != null) {
+ _micro.codec = SoundCodec.SPEEX;
+ _micro.framesPerPacket = 1;
+ _micro.setSilenceLevel(0, 2000);
+ _micro.gain = 50;
+ // this has no effect if enhanced microphone is obtained
//Microphone setUseEchoSupression(bool)
_micro.setUseEchoSuppression(true);
}
@@ -162,32 +162,17 @@
//Microphone.set
if ($debug) Debug.write("canvas.vaquality: ",canvas.vaquality, "canvas.microphoneRateBest: ",canvas.microphoneRateBest);
- if (canvas.vaquality=="best") {
- if (_micro != null) {
- _micro.rate = canvas.microphoneRateBest;
- }
- if (_camera != null) {
- if ($debug) Debug.write("_camera.setQuality BEST: ",this.isInterview,(canvas.bandwidthNeededBest*2),canvas.camQualityBest);
- if (this.isInterview) {
- _camera.setMode(videoview.width,videoview.height,24,true);
- if ($debug) Debug.warn("IS INTERVIEW ");
- _camera.setQuality(0,98);
- } else {
- _camera.setMode(videoview.width,videoview.height,canvas.framesPerSecond,true);
- if ($debug) Debug.warn("IS NO INTERVIEW ");
- _camera.setQuality(canvas.bandwidthNeededBest,canvas.camQualityBest);
- }
- }
- } else {
- if (_camera != null) {
- _camera.setMode(videoview.width,videoview.height,canvas.framesPerSecond,true);
- if ($debug) Debug.write("_camera.setQuality NORMAL: ",canvas.bandwidthNeededNormal,canvas.camQualityNormal);
- _camera.setQuality(canvas.bandwidthNeededNormal,canvas.camQualityNormal);
- }
- if (_micro != null) {
- _micro.setRate(canvas.microphoneRateNormal);
- //_micro.setSilenceLevel(canvas.loudnessAcitviation);
- }
+ if (_camera != null) {
+ if ($debug) Debug.write("_camera.setQuality BEST: ",this.isInterview,(canvas.bandwidthNeededBest*2),canvas.camQualityBest);
+ if (this.isInterview) {
+ _camera.setMode(videoview.width,videoview.height,24,true);
+ if ($debug) Debug.warn("IS INTERVIEW ");
+ _camera.setQuality(0,98);
+ } else {
+ _camera.setMode(videoview.width,videoview.height,canvas.framesPerSecond,true);
+ if ($debug) Debug.warn("IS NO INTERVIEW ");
+ _camera.setQuality(canvas.bandwidthNeededBest,canvas.camQualityBest);
+ }
}
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1240215&r1=1240214&r2=1240215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx Fri Feb 3 15:35:18 2012
@@ -136,6 +136,10 @@
canvas.lc.send(canvas.vid_lc_name, "reconnect", canvas.thishib.src);
</handler>
+ <handler name="ondisconnect">
+ canvas.lc.send(canvas.rtmp_lc_name, "disconnect", canvas.thishib.src);
+ </handler>
+
<method name="reconnectComplete">
if (this.reconnectionAction){
this.reconnectionAction = false;
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/remote/rtmpConnection.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/remote/rtmpConnection.lzx?rev=1240215&r1=1240214&r2=1240215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/remote/rtmpConnection.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/remote/rtmpConnection.lzx Fri Feb 3 15:35:18 2012
@@ -26,6 +26,7 @@
<event name="onconnect"/>
<event name="onerror"/>
+ <event name="ondisconnect" />
<!-- this attribute holds a reference to the current/last called netremoteCall,
in case of error you can debug that way which call did fail -->
@@ -94,6 +95,7 @@
</method>
<method name="disconnect">
+ this.ondisconnect.sendEvent();
canvas.currentNC = null;
this._nc.close();
</method>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/eventuserlist/eventUserList.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/eventuserlist/eventUserList.lzx?rev=1240215&r1=1240214&r2=1240215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/eventuserlist/eventUserList.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/eventuserlist/eventUserList.lzx Fri Feb 3 15:35:18 2012
@@ -77,6 +77,7 @@
<method name="reconnectSuccess">
if ($debug) Debug.warn("User Reloged In ",canvas.becomemoderator);
+ canvas.lc.send(canvas.rtmp_lc_name, "reconnectSuccess", canvas.thishib.src);
//set default values and get already availible streams
this.getRoomModeratorsByRoomId.doCall();
</method>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx?rev=1240215&r1=1240214&r2=1240215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx Fri Feb 3 15:35:18 2012
@@ -61,6 +61,7 @@
<method name="reconnectSuccess">
if ($debug) Debug.warn("User Reloged In ",canvas.becomemoderator);
+ canvas.lc.send(canvas.rtmp_lc_name, "reconnectSuccess", canvas.thishib.src);
//set default values and get already availible streams
this.getRoomModeratorsByRoomId.doCall();
</method>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx?rev=1240215&r1=1240214&r2=1240215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx Fri Feb 3 15:35:18 2012
@@ -64,6 +64,7 @@
<method name="reconnectSuccess">
if ($debug) Debug.write("User Reloged In");
+ canvas.lc.send(canvas.rtmp_lc_name, "reconnectSuccess", canvas.thishib.src);
//set default values and get already availible streams
this.getRoomModeratorsByRoomId.doCall();
</method>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx?rev=1240215&r1=1240214&r2=1240215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx Fri Feb 3 15:35:18 2012
@@ -72,6 +72,7 @@
<method name="reconnectSuccess">
if ($debug) Debug.warn("User Reloged In ",canvas.becomemoderator);
+ canvas.lc.send(canvas.rtmp_lc_name, "reconnectSuccess", canvas.thishib.src);
//set default values and get already availible streams
this.getRoomModeratorsByRoomId.doCall();
</method>