Author: sebawagner
Date: Tue Feb 21 17:46:31 2012
New Revision: 1291937
URL: http://svn.apache.org/viewvc?rev=1291937&view=rev
Log:
Fixes: OPENMEETINGS-66 Whiteboard Video Player basic functionality with new
Audio/Video components
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/lzrecorder/
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/lzrecorder/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/lzrecorder/playBackVideoStream.lzx
- copied unchanged from r1291756,
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/playBackVideoStream.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/whiteboard/
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/whiteboard/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/whiteboard/playBackWhiteboardVideo.lzx
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/playBackVideoStream.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChat.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawObject.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/drawViewNew.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/imageForDrawView.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/swfResourceView.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewMain.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/roomAccessMessage.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/library.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx?rev=1291937&r1=1291936&r2=1291937&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx
Tue Feb 21 17:46:31 2012
@@ -276,7 +276,7 @@ function parseDateToStringTime(dateObj){
return d+'.'+mo+'.'+y+' '+h+':'+m;
}
-function parseDateToStringTimeSecunds(dateObj){
+function parseDateToStringTimeSeconds(dateObj){
// if($debug) Debug.write("FUNC/parseDateToStringTime",dateObj);
if (dateObj==null) return "";
var d = dateObj.getDate();
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=1291937&r1=1291936&r2=1291937&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
Tue Feb 21 17:46:31 2012
@@ -1948,7 +1948,7 @@
new lz.chatParticipants(parentObj,{
user_id:value.user_id,
publicSID:value.publicSID,
- connectedSince:canvas.getLabelName(1133)+'
'+parseDateToStringTimeSecunds(value.connectedSince),
+ connectedSince:canvas.getLabelName(1133)+'
'+parseDateToStringTimeSeconds(value.connectedSince),
username:value.firstname+", "+value.lastname
});
}
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChat.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChat.lzx?rev=1291937&r1=1291936&r2=1291937&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChat.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChat.lzx
Tue Feb 21 17:46:31 2012
@@ -76,7 +76,7 @@
user_id:value.overallList[i].user_id,
publicSID:value.overallList[i].publicSID,
picture_uri:value.overallList[i].picture_uri,
- connectedSince:canvas.getLabelName(1133)+'
'+parseDateToStringTimeSecunds(value.overallList[i].connectedSince),
+ connectedSince:canvas.getLabelName(1133)+'
'+parseDateToStringTimeSeconds(value.overallList[i].connectedSince),
username:value.overallList[i].firstname+"
"+value.overallList[i].lastname
});
}
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx?rev=1291937&r1=1291936&r2=1291937&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx
Tue Feb 21 17:46:31 2012
@@ -267,6 +267,7 @@
if (this.boundingref!=null) this.boundingref.removeIt();
while (this.subviews.length > 1) {
+ this.subviews[1].prepareForDelete.sendEvent();
this.subviews[1].destroy();
}
while (this.basdrawredoView.subviews.length > 0) {
@@ -461,13 +462,16 @@
<method name="deleteItemByNameSync" args="objName">
<![CDATA[
if ($debug) Debug.write("deleteItemByNameSync :: ",objName);
- this[objName].destroy();
- if (this.boundingref!=null) this.boundingref.removeIt();
+ this[objName].prepareForDelete.sendEvent();
+ this[objName].destroy();
+ if (this.boundingref!=null) this.boundingref.removeIt();
+
var pos = -1;
for (var eg=0;eg<this.layers.length;eg++){
if (this.layers[eg]['name']==objName) {
pos = eg;
//Debug.write("Found Object in Layer: ",eg);
+ this.layers[eg].prepareForDelete.sendEvent();
this.layers[eg].destroy();
}
}
@@ -581,6 +585,7 @@
this.layers.push(this.currentlayer);
this.baseactionobjectList.push(lastActionObject);
//Remove this View
+ lastelement.prepareForDelete.sendEvent();
lastelement.destroy();
this.checkStepLayers();
this.onsharedMessage('redo',lastActionObject);
@@ -620,6 +625,7 @@
this.redolayers.push(this.currentlayer);
this.baseredoactionobjectList.push(lastActionObject);
//Remove this View
+ lastelement.prepareForDelete.sendEvent();
lastelement.destroy();
this.checkStepLayers();
this.onsharedMessage('undo',lastActionObject);
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawObject.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawObject.lzx?rev=1291937&r1=1291936&r2=1291937&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawObject.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawObject.lzx
Tue Feb 21 17:46:31 2012
@@ -746,7 +746,7 @@
var tName = 'flv'+this.getCounter();
- this.currentlayer = new lz.whiteboardVideoPlayer(parent.parent,{
+ this.currentlayer = new lz.whiteboardVideoPlayer(this,{
name:tName,
fileExplorerItemId:fileExplorerItemId,
title:fileName,
@@ -800,7 +800,7 @@
if ($debug) Debug.write("drawFlvToHistory PLAY ::
",lastActionObject[3]);
- this.currentlayer = new lz.whiteboardVideoPlayer(parent.parent,{
+ this.currentlayer = new lz.whiteboardVideoPlayer(this,{
name:lastActionObject[lastActionObject.length-1],
fileExplorerItemId:lastActionObject[1],
title:lastActionObject[2],
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/drawViewNew.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/drawViewNew.lzx?rev=1291937&r1=1291936&r2=1291937&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/drawViewNew.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/drawViewNew.lzx
Tue Feb 21 17:46:31 2012
@@ -55,6 +55,8 @@
<attribute name="initwidth" value="0" type="number" />
<attribute name="initheight" value="0" type="number" />
+ <event name="prepareForDelete" />
+
<handler name="oninit">
this.initwidth=this.width;
this.initheight=this.height;
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/imageForDrawView.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/imageForDrawView.lzx?rev=1291937&r1=1291936&r2=1291937&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/imageForDrawView.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/imageForDrawView.lzx
Tue Feb 21 17:46:31 2012
@@ -22,6 +22,8 @@
<class name="imageForDrawView" extends="image" stretches="both">
+ <event name="prepareForDelete" />
+
<attribute name="downloadurl" value="" type="string" />
<attribute name="alterModus" value="true" type="boolean" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/swfResourceView.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/swfResourceView.lzx?rev=1291937&r1=1291936&r2=1291937&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/swfResourceView.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/swfResourceView.lzx
Tue Feb 21 17:46:31 2012
@@ -21,6 +21,8 @@
<library>
<class name="swfResourceView" extends="view" >
+
+ <event name="prepareForDelete" />
<attribute name="refObj" value="null" />
<attribute name="alterModus" value="true" type="boolean" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx?rev=1291937&r1=1291936&r2=1291937&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
Tue Feb 21 17:46:31 2012
@@ -21,15 +21,16 @@
<library>
<class name="whiteboardVideoPlayer" extends="guiPresenter"
- docking="false" resizeable="false" closable="true" minimizable="false"
+ docking="false" resizeable="false" closable="false" minimizable="false"
x="0" y="0" width="${ parent.width }" height="${ parent.height }">
<attribute name="fileExplorerItemId" value="0" type="number" />
- <attribute name="timerDelegate" value="null" />
<attribute name="timerDelegateStarted" value="false" type="boolean" />
- <attribute name="deltaInSeconds" value="0" type="number" />
+ <attribute name="deltaInSeconds" value="0" type="number" />
+
+ <attribute name="currentTime" value="0" type="number" />
<attribute name="recordingName" value="" type="string" />
@@ -40,20 +41,55 @@
<attribute name="flv_width" value="0" type="number" />
<attribute name="flv_height" value="0" type="number" />
-
+
<handler name="oninit">
- this.timerDelegate = new LzDelegate( this, "calcProgressBar" );
if ($debug) Debug.write("whiteboardVideoPlayer ::
",this.fileExplorerItemId);
this.recordingName = "UPLOADFLV_" + this.fileExplorerItemId +
".flv";
-
+ calcVideoWidthHeight();
this.copyFileToCurrentRoom.doCall();
+
+ var t = this;
+ canvas.videoComp_lc.stopRecordingStream = function(tName) {
+ if ($debug) Debug.write("LC stopRecordingStream",tName,(t.name ==
tName));
+ if (t.name == tName) {
+ t.stopStream();
+ }
+ }
+ canvas.videoComp_lc.metaWhiteboardPlaybackStream =
function(tName,duration) {
+ if ($debug) Debug.write("LC
metaWhiteboardPlaybackStream",tName,duration,(t.name == tName));
+ if (t.name == tName) {
+ t.deltaInSeconds = duration;
+ t.setDuration();
+ }
+ }
+ canvas.videoComp_lc.updateWhiteboardStreamTime = function(tName,time) {
+ //if ($debug) Debug.write("LC
metaWhiteboardPlaybackStream",tName,time,(t.name == tName));
+ if (t.name == tName) {
+ t.currentTime = time;
+ t.calcProgressBar();
+ }
+ }
+
+ </handler>
+
+ <handler name="prepareForDelete" args="tRef">
+ if ($debug) Debug.write("--- prepareForDelete ");
+ this.stopStream();
</handler>
<handler name="onclose">
this.stopStreamPlay();
</handler>
+ <handler name="onwidth">
+ calcVideoWidthHeight();
+ </handler>
+
+ <handler name="onheight">
+ calcVideoWidthHeight();
+ </handler>
+
<!--
public Long copyFileToCurrentRoom(String SID, Long flvFileExplorerId)
-->
@@ -117,11 +153,8 @@
if (!this.timerDelegateStarted) {
this.timerDelegateStarted = true;
- lz.Timer.addTimer( this.timerDelegate , 1000 );
}
- this._content._videostream.bringToFront();
-
if ($debug) Debug.write("PLAY STREAM
",this.recordingName);
var tObjectDimension = calcVideoWidthHeight();
@@ -129,6 +162,11 @@
if ($debug) Debug.write("SEND
",this.recordingName,0,tObjectDimension.x,tObjectDimension.y,tObjectDimension.width,tObjectDimension.height);
//
this._content._videostream.playStream(this.recordingName,0,tObjectDimension.x,tObjectDimension.y,tObjectDimension.width,tObjectDimension.height);
+
+ var tx =
this.getAttributeRelative("x",canvas)+tObjectDimension.x+this._content.x;
+ var ty =
this.getAttributeRelative("y",canvas)+tObjectDimension.y+this._content.y;
+
+ canvas.lc.send(canvas.rtmp_lc_name,
"playbackWhiteboardVideo",this.name,this.recordingName,0,tx,ty,tObjectDimension.width,tObjectDimension.height);
}
]]>
</method>
@@ -146,73 +184,74 @@
//max height of container is new height of video;
//calc new width and x-position of video
- var newHeight = this.height;
+ var newHeight = this._content.height;
var newWidth = ratio * newHeight;
- var newx = (this.width - newWidth) / 2;
+ var newx = (this._content.width - newWidth) / 2;
var newy = 0;
- if ($debug)
Debug.write("calcVideoWidthHeight",ratio,this.width,this.height,newWidth,newHeight,newx,newy);
+ if ($debug)
Debug.write("calcVideoWidthHeight",ratio,this._content.width,this._content.height,newWidth,newHeight,newx,newy);
- if (newWidth > this.width) {
- newWidth = this.width;
+ if (newWidth > this._content.width) {
+ newWidth = this._content.width;
newHeight = newWidth / ratio;
newx = 0;
- newy = (this.height - newHeight) / 2;
+ newy = (this._content.height - newHeight) / 2;
}
var t = {'x':newx,'y':newy,'width':newWidth,'height':newHeight};
if ($debug) Debug.write("t",t);
+ this._content._preview.setAttribute("x",newx);
+ this._content._preview.setAttribute("y",newy);
+ this._content._preview.setAttribute("width",newWidth);
+ this._content._preview.setAttribute("height",newHeight);
+
return {'x':newx,'y':newy,'width':newWidth,'height':newHeight};
]]>
</method>
+ <method name="setDuration">
+ <![CDATA[
+ if ($debug) Debug.write("setDuration ",this.deltaInSeconds);
+ var tString = "";
+ if (this.deltaInSeconds > 60) {
+ var minutes = Math.floor(this.deltaInSeconds/60);
+ var restSeconds = Math.round(this.deltaInSeconds) - ( minutes *
60 );
+ tString = minutes + " min " + restSeconds + " sec";
+ } else {
+ tString = Math.round(this.deltaInSeconds) + " sec";
+ }
+ this._progress._progressbar._duration.setAttribute("text",tString);
+ ]]>
+ </method>
+
<method name="calcProgressBar">
<![CDATA[
-
- //if ($debug)
Debug.write("this._content._videostream._ns",this._content._videostream._ns);
-
- var flvTime = this._content._videostream._ns.time;
-
+ if ($debug) Debug.write("calcProgressBar ",this.currentTime);
this._progress._progressbar._pointer.setAttribute("visibility","visible");
-
var tString = "";
-
- if (flvTime > 60) {
-
- var minutes = Math.floor(flvTime/60);
-
- var restSeconds = Math.round(flvTime) - ( minutes * 60 );
-
+ if (this.currentTime > 60) {
+ var minutes = Math.floor(this.currentTime/60);
+ var restSeconds = Math.round(this.currentTime) - ( minutes *
60 );
tString = minutes + " min " + restSeconds + " sec";
-
} else {
-
- tString = Math.round(flvTime) + " sec";
-
+ tString = Math.round(this.currentTime) + " sec";
}
-
this._progress._progressbar._time.setAttribute("text",tString);
-
- var tNewX = Math.round((this._progress._progressbar.width /
this.deltaInSeconds) * flvTime);
-
+ var tNewX = Math.round((this._progress._progressbar.width /
this.deltaInSeconds) * this.currentTime);
this._progress._progressbar._pointer.setAttribute("x",tNewX);
-
- lz.Timer.addTimer( this.timerDelegate , 1000 );
-
]]>
</method>
<method name="stopStream">
if (this.timerDelegateStarted) {
this.timerDelegateStarted = false;
- lz.Timer.removeTimer( this.timerDelegate );
}
this._progress._progressbar._time.setAttribute("text","");
this._progress._progressbar._pointer.setAttribute("x",0);
- this._content._preview.bringToFront();
- this._content._videostream.stop();
+ if ($debug) Debug.write("SEND stopWhiteboardVideo ",this.name);
+ canvas.lc.send(canvas.rtmp_lc_name, "stopWhiteboardVideo",this.name);
</method>
<method name="toggleStream">
@@ -221,10 +260,10 @@
}
</method>
- <view name="_content" height="${ parent.height-62 }"
+ <view name="_content" height="${ parent.height-62 }" bgcolor="0x000000"
y="22" x="1" width="${ parent.width-1 }">
- <view name="_preview" width="${parent.width}"
height="${parent.height}" bgcolor="0x000000">
+ <view name="_preview" width="0" height="0" >
<image name="imagePreview" stretches="both"
width="${parent.width}" height="${parent.height}" />
<handler name="onclick">
@@ -237,20 +276,6 @@
</view>
</view>
- <baseVideoStream name="_videostream" bgcolor="0x000000" y="0"
- width="${ parent.width }" height="${ parent.height }">
- <handler name="onPlayStatus" args="info">
- if ($debug) Debug.write("onPlayStatus ",info);
- if (info.code == "NetStream.Play.Complete" ) {
- parent.parent.stopStream();
- }
- </handler>
- <handler name="onMetaData" args="info">
- if ($debug) Debug.warn("onMetaData ",info);
- parent.parent.deltaInSeconds = Number(info.duration);
- </handler>
- </baseVideoStream>
-
</view>
<view name="_progress" height="18" y="${ parent.height - 40 }" width="${
parent.width-2 }"
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewMain.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewMain.lzx?rev=1291937&r1=1291936&r2=1291937&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewMain.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewMain.lzx
Tue Feb 21 17:46:31 2012
@@ -70,7 +70,7 @@
for (var i = 0;i<value.length;i++) {
tLogString += headerMessage
- +
parseDateToStringTimeSecunds(value[i].inserted)
+ +
parseDateToStringTimeSeconds(value[i].inserted)
+ '<br/>'
+ value[i].msgType
+ '<br/>'
@@ -157,7 +157,7 @@
hasFailed = true;
tLogString += headerMessage
- +
parseDateToStringTimeSecunds(recording.flvRecordingLog[i].inserted)
+ +
parseDateToStringTimeSeconds(recording.flvRecordingLog[i].inserted)
+ '<br/>'
+
recording.flvRecordingLog[i].msgType
+ '<br/>'
@@ -167,7 +167,7 @@
}
this.recordingLog += headerMessage
- +
parseDateToStringTimeSecunds(recording.flvRecordingLog[i].inserted)
+ +
parseDateToStringTimeSeconds(recording.flvRecordingLog[i].inserted)
+ '<br/>'
+
recording.flvRecordingLog[i].msgType
+ '<br/>'
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/roomAccessMessage.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/roomAccessMessage.lzx?rev=1291937&r1=1291936&r2=1291937&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/roomAccessMessage.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/roomAccessMessage.lzx
Tue Feb 21 17:46:31 2012
@@ -46,8 +46,8 @@
}
//private Date appointmentStarttime;
//private Date appointmentEndtime;
-
parent._content._labels._start._text.setAttribute("text",parseDateToStringTimeSecunds(value.appointmentStarttime));
-
parent._content._labels._end._text.setAttribute("text",parseDateToStringTimeSecunds(value.appointmentEndtime));
+
parent._content._labels._start._text.setAttribute("text",parseDateToStringTimeSeconds(value.appointmentStarttime));
+
parent._content._labels._end._text.setAttribute("text",parseDateToStringTimeSeconds(value.appointmentEndtime));
]]>
</handler>
</netRemoteCallHib>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx?rev=1291937&r1=1291936&r2=1291937&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
Tue Feb 21 17:46:31 2012
@@ -34,6 +34,8 @@
client.pauseRecordingPlayback = this.pauseRecordingPlayback;
client.seekRecordingPlayback = this.seekRecordingPlayback;
client.stopAndCloseRecordingConnection =
this.stopAndCloseRecordingConnection;
+ client.playbackWhiteboardVideo = this.playbackWhiteboardVideo;
+ client.stopWhiteboardVideo = this.stopWhiteboardVideo;
var rtmpLC:LocalConnection = new LocalConnection();
rtmpLC.connect(canvas.rtmp_lc_name);
@@ -188,6 +190,42 @@
// send back confirmation to leave the module
canvas.videoComp_lc.send(canvas.videoComp_lc_name,
'recordingStoppedAndDisconnected');
</method>
+
+ <!---
+ Start playback of whiteboard video
+ -->
+ <method name="playbackWhiteboardVideo"
args="tName,recordingName,seek,tx,ty,twidth,theight">
+ <![CDATA[
+ if($debug) Debug.write("playbackWhiteboardVideo
",tName,recordingName,seek,tx,ty,twidth,theight);
+ if (this[tName]) {
+ if ($debug) Debug.warn("playbackWhiteboardVideo there was
already a video with the same name");
+ this[tName]._stop();
+ this[tName].destroy();
+ }
+
+ new lz.playBackWhiteboardVideo(this,{
+ name:tName,
+ x:tx,
+ y:ty,
+ width:twidth,
+ height:theight
+ });
+
+ this[tName].playVideoStream(recordingName,0);
+ ]]>
+ </method>
+
+ <method name="stopWhiteboardVideo" args="tName">
+ <![CDATA[
+ if($debug) Debug.write("stopWhiteboardVideo ",tName);
+ if (this[tName]) {
+ this[tName].stopVideo();
+ this[tName].destroy();
+ } else {
+ if ($debug) Debug.warn("stopWhiteboardVideo could not find
video to stop");
+ }
+ ]]>
+ </method>
</class>
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/lzrecorder/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/lzrecorder/library.lzx?rev=1291937&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/lzrecorder/library.lzx
(added)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/lzrecorder/library.lzx
Tue Feb 21 17:46:31 2012
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<library>
+
+ <include href="playBackVideoStream.lzx" />
+
+</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx?rev=1291937&r1=1291936&r2=1291937&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx Tue
Feb 21 17:46:31 2012
@@ -35,6 +35,10 @@
<include href="video/" />
<include href="audioVideoTest/" />
+
+ <include href="lzrecorder/" />
+
+ <include href="whiteboard/" />
<include href="commonVideoViewContentSWF10.lzx" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx?rev=1291937&r1=1291936&r2=1291937&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx
Tue Feb 21 17:46:31 2012
@@ -37,6 +37,10 @@
<include href="video/" />
<include href="audioVideoTest/" />
+
+ <include href="lzrecorder/" />
+
+ <include href="whiteboard/" />
<include href="commonVideoViewContentSWF10.lzx" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/library.lzx?rev=1291937&r1=1291936&r2=1291937&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/library.lzx
Tue Feb 21 17:46:31 2012
@@ -29,6 +29,5 @@
<include href="videoObjectPlayBroadcast.lzx" />
<include href="videoObjectTestBroadcast.lzx" />
<include href="videoObjectPlayTestBroadcast.lzx" />
- <include href="playBackVideoStream.lzx" />
</library>
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/whiteboard/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/whiteboard/library.lzx?rev=1291937&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/whiteboard/library.lzx
(added)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/whiteboard/library.lzx
Tue Feb 21 17:46:31 2012
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<library>
+
+ <include href="playBackWhiteboardVideo.lzx" />
+
+</library>
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/whiteboard/playBackWhiteboardVideo.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/whiteboard/playBackWhiteboardVideo.lzx?rev=1291937&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/whiteboard/playBackWhiteboardVideo.lzx
(added)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/whiteboard/playBackWhiteboardVideo.lzx
Tue Feb 21 17:46:31 2012
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<library>
+
+<!---
+ The playBackVideoStream is used in the recording playerback to show the
video
+ -->
+<class name="playBackWhiteboardVideo" extends="baseVideoStream"
bgcolor="0x000000">
+
+ <attribute name="timerDelegate" value="null"/>
+ <attribute name="timerDelegateStarted" value="false" type="boolean"/>
+
+ <handler name="oninit">
+ this.timerDelegate = new LzDelegate( this, "calcProgressBar" );
+ </handler>
+
+ <method name="playVideoStream" args="streamName,delay">
+ this.playStream(streamName,delay);
+ this.timerDelegateStarted = true;
+ lz.Timer.addTimer( this.timerDelegate , 1000 );
+ </method>
+
+ <method name="stopVideo">
+ this._stop();
+ lz.Timer.removeTimer(this.timerDelegate);
+ this.timerDelegateStarted = false;
+ </method>
+
+ <handler name="onPlayStatusEvent" args="info">
+ if ($debug) Debug.write("onPlayStatus ",info);
+ if (info.code == "NetStream.Play.Complete" ) {
+ if ($debug) Debug.write("-- stopStream");
+ //parent.parent.stopStream();
+ canvas.videoComp_lc.send(canvas.videoComp_lc_name,
'stopWhiteboardPlaybackStream', this.name);
+ }
+ </handler>
+ <handler name="onMetaDataEvent" args="info">
+ if ($debug) Debug.warn("onMetaData ",info);
+ if ($debug) Debug.write("parent.parent.deltaInSeconds
",Number(info.duration));
+ //parent.parent.deltaInSeconds = Number(info.duration);
+ canvas.videoComp_lc.send(canvas.videoComp_lc_name,
'metaWhiteboardPlaybackStream', this.name, Number(info.duration));
+ </handler>
+
+ <method name="calcProgressBar" args="tObjRef">
+ //if ($debug) Debug.write("calcProgressBar
updateRecordingStreamTime",this._ns.time)
+ canvas.videoComp_lc.send(canvas.videoComp_lc_name,
'updateWhiteboardStreamTime',this.name, this._ns.time);
+ if (this.timerDelegateStarted) {
+ lz.Timer.addTimer( this.timerDelegate , 1000 );
+ }
+ </method>
+
+</class>
+
+</library>
\ No newline at end of file
