Author: sebawagner
Date: Sat Feb 18 11:03:54 2012
New Revision: 1245904
URL: http://svn.apache.org/viewvc?rev=1245904&view=rev
Log:
OPENMEETINGS-54 fix recorder to use new audio/video components and fix
recording itself to reference correct streams => Partly fixed to send the
events to new audio/video components
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewAdapter.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewMain.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordContent.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/library.lzx?rev=1245904&r1=1245903&r2=1245904&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/library.lzx
Sat Feb 18 11:03:54 2012
@@ -23,6 +23,7 @@
<include href="lzRecordingsViewMain.lzx" />
<include href="lzRecordingsViewBottom.lzx" />
+ <include href="lzRecordingsViewAdapter.lzx" />
</library>
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewAdapter.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewAdapter.lzx?rev=1245904&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewAdapter.lzx
(added)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewAdapter.lzx
Sat Feb 18 11:03:54 2012
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<library>
+
+
+<!---
+ View for recorded contents list.
+ When you select 'Recordings' on the top menu, this class shows the list.
+-->
+<class name="lzRecordingsViewAdapter" extends="view">
+
+ <method name="connect">
+ if ($debug) Debug.write("connect");
+ var tx = this.getAttributeRelative("x",canvas);
+ var ty = this.getAttributeRelative("y",canvas);
+ canvas.lc.send(canvas.rtmp_lc_name, "connectRecordingPlayer",
canvas.thishib.src, tx, ty, parent.width, parent.height);
+ </method>
+
+ <method name="disconnect">
+ if ($debug) Debug.write("disconnect");
+ </method>
+
+ <method name="playStream" args="stream">
+ if ($debug) Debug.write("playStream ",stream);
+ </method>
+
+ <method name="seek" args="flvTime">
+ if ($debug) Debug.write("seek ",flvTime);
+ </method>
+
+ <method name="pause" args="pauseBool">
+ if ($debug) Debug.write("pauseBool",pauseBool);
+ </method>
+
+ <method name="stop">
+ if ($debug) Debug.write("stop ");
+ </method>
+
+</class>
+
+</library>
\ No newline at end of file
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=1245904&r1=1245903&r2=1245904&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
Sat Feb 18 11:03:54 2012
@@ -45,6 +45,10 @@
this.timerDelegate = new LzDelegate( this, "calcProgressBar" );
</handler>
+ <method name="connect">
+ this._content._videostream.connect();
+ </method>
+
<method name="showLog">
if ($debug) Debug.write("getFlvRecordingLog flvRecordingId
",this.getFlvRecordingLog.flvRecordingId);
this.getFlvRecordingLog.doCall();
@@ -294,7 +298,7 @@
<method name="pauseStream">
this.isPaused = !this.isPaused;
- this._content._videostream._ns.pause(this.isPaused);
+ this._content._videostream.pause(this.isPaused);
</method>
<method name="seekStream" args="newX">
@@ -310,7 +314,7 @@
if ($debug) Debug.write("seekStream :: flvTime ",flvTime);
- this._content._videostream._ns.seek(flvTime);
+ this._content._videostream.seek(flvTime);
}
@@ -365,6 +369,12 @@
</view>
</view>
+ <lzRecordingsViewAdapter name="_videostream">
+
+
+ </lzRecordingsViewAdapter>
+
+ <!--
<baseVideoStream name="_videostream" bgcolor="0x000000"
width="${parent.width}" height="${parent.height}">
<handler name="onPlayStatus" args="info">
@@ -377,6 +387,7 @@
if ($debug) Debug.write("onMetaData ",info);
</handler>
</baseVideoStream>
+ -->
</view>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordContent.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordContent.lzx?rev=1245904&r1=1245903&r2=1245904&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordContent.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordContent.lzx
Sat Feb 18 11:03:54 2012
@@ -29,6 +29,7 @@
<handler name="oninit">
_mainScrollBar.setAttribute("visibility","hidden");
+ this._recordingsViewMain.connect();
</handler>
<handler name="ontabcontentleave">
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx?rev=1245904&r1=1245903&r2=1245904&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
Sat Feb 18 11:03:54 2012
@@ -4,6 +4,7 @@
<class name="hibAdapter">
<attribute name="testingApplication" value="null" />
+ <attribute name="baseVideoStream" value="null" />
<switch>
<when property="$as3">
@@ -22,8 +23,11 @@
client.getRoomTypes = this.getRoomTypes;
client.disconnect = this.disconnect;
client.reconnectSuccess = this.reconnectSuccess;
+ //Test application to record 5 seconds
client.doInitTestingApplication = this.doInitTestingApplication;
client.closeInitTestingApplication = this.closeInitTestingApplication;
+ //Recording Player
+ client.connectRecordingPlayer = this.connectRecordingPlayer;
var rtmpLC:LocalConnection = new LocalConnection();
rtmpLC.connect(canvas.rtmp_lc_name);
@@ -59,6 +63,9 @@
canvas.thishib.disconnect();
</method>
+ <!---
+ Starts the 5 second audio/video testing application and connect to RTMP
+ -->
<method name="doInitTestingApplication" args="x,y,connection_url">
if($debug) Debug.write("doInitTestingApplication ",x,y);
canvas.thishib.setAttribute('src',connection_url);
@@ -66,6 +73,10 @@
this.testingApplication = new
lz.testingApplication(canvas,{name:'currentSharing',x:x+1,y:y+24});
</method>
+ <!---
+ Stops and destroys the view with the audio/video testing application
+ and send confirmation back via LocalConnection
+ -->
<method name="closeInitTestingApplication">
canvas.thishib.disconnect();
if($debug) Debug.write("closeInitTestingApplication ");
@@ -77,7 +88,38 @@
if ($debug) Debug.write("Send confirmation of close back to:
",canvas.videoComp_lc_name);
canvas.videoComp_lc.send(canvas.videoComp_lc_name,
'closeInitTestingApplicationConfirm');
</method>
+
+ <!---
+ Initializes video playback component
+ and connect to RTMP
+ -->
+ <method name="connectRecordingPlayer"
args="connection_url,x,y,width,height">
+ if($debug) Debug.write("connectRecordingPlayer ",
connection_url,x,y,width,height);
+ canvas.thishib.setAttribute('src',connection_url);
+ canvas.thishib.connect();
+ this.baseVideoStream = new lz.playBackVideoStream(canvas,{
+ x:x,
+ y:y,
+ width:width,
+ height:height
+ });
+ </method>
+
</class>
+<class name="playBackVideoStream" extends="baseVideoStream" bgcolor="0x000000"
visibility="hidden">
+
+ <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.write("onMetaData ",info);
+ </handler>
+
+</class>
+
</library>
\ No newline at end of file
