[Laszlo-checkins] r13568 - in openlaszlo/branches/4.3: . lps/components/av lps/components/extensions/av test/video
ptw@openlaszlo.org
ptw at openlaszlo.org
Wed Apr 1 01:46:47 PDT 2009
Author: ptw
Date: 2009-04-01 01:46:39 -0700 (Wed, 01 Apr 2009)
New Revision: 13568
Modified:
openlaszlo/branches/4.3/
openlaszlo/branches/4.3/lps/components/av/videoplayer.lzx
openlaszlo/branches/4.3/lps/components/av/videoscreen.lzx
openlaszlo/branches/4.3/lps/components/extensions/av/videoview.lzx
openlaszlo/branches/4.3/test/video/test-stream-video.lzx
openlaszlo/branches/4.3/test/video/test-videoplayer-http.lzx
Log:
Merged revisions 13566 via svnmerge from
http://svn.openlaszlo.org/openlaszlo/trunk
.......
r13566 | sallen | 2009-03-31 18:58:50 -0400 (Tue, 31 Mar 2009) | 25 lines
Change 20090331-sallen-a by sallen at sallen-mac.local on 2009-03-31 15:28:54 PDT
in /Users/sarah/src/svn/openlaszlo/trunk-review/test/video
for http://svn.openlaszlo.org/openlaszlo/trunk/test/video
Summary: videoView.showFrame -> startTime
New Features:
Bugs Fixed: LPP-799 videoView.showFrame -> startTime
Technical Reviewer: max
QA Reviewer: (pending)
Doc Reviewer: (pending)
Documentation:
doc'd in reference
Release Notes:
Details:
Tests:
.......
Property changes on: openlaszlo/branches/4.3
___________________________________________________________________
Name: svnmerge-integrated
- /openlaszlo/branches/4.1:1-10153 /openlaszlo/branches/4.2:1-12154,12181,13205 /openlaszlo/branches/devildog:1-8432 /openlaszlo/branches/pagan-deities:1-7955,8825,10756-10920,10922-10928,10930-10935,11151,11207,11554,13476 /openlaszlo/branches/paperpie:1-6504,6506-6574,6576-7135,7137-7235 /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497,6509,6661,7097,7872 /openlaszlo/trunk:1-13548,13554,13557,13559,13562
+ /openlaszlo/branches/4.1:1-10153 /openlaszlo/branches/4.2:1-12154,12181,13205 /openlaszlo/branches/devildog:1-8432 /openlaszlo/branches/pagan-deities:1-7955,8825,10756-10920,10922-10928,10930-10935,11151,11207,11554,13476 /openlaszlo/branches/paperpie:1-6504,6506-6574,6576-7135,7137-7235 /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497,6509,6661,7097,7872 /openlaszlo/trunk:1-13548,13554,13557,13559,13562,13566
Modified: openlaszlo/branches/4.3/lps/components/av/videoplayer.lzx
===================================================================
--- openlaszlo/branches/4.3/lps/components/av/videoplayer.lzx 2009-04-01 08:00:05 UTC (rev 13567)
+++ openlaszlo/branches/4.3/lps/components/av/videoplayer.lzx 2009-04-01 08:46:39 UTC (rev 13568)
@@ -28,15 +28,17 @@
see mediastream for details -->
<attribute name="url" type="string" value=""/>
- <!--- Show this frame when the url is set.
- Use -1 to show no frame.
- Default: 0 -->
- <attribute name="showframe" type="number" value="0"/>
<!--- when true, playback will start automatically
without user action -->
<attribute name="autoplay" value="false"/>
+ <!--- Show the frame from this time (in seconds) whenever the url
+ is set for video playback.
+ Use -1 to show no frame (which will leave the image as it
+ was when switching videos) -->
+ <attribute name="starttime" value="0" type="number"/>
+
<!--- why would you want this? no test case, marking private
@access private -->
<attribute name="showscreen" value="true"/>
@@ -122,7 +124,7 @@
autoplay="${classroot.autoplay}"
url="${classroot.url}"
volume="${parent.vslider.volume}"
- showframe="${parent.showframe}"
+ starttime="${parent.starttime}"
borderTop="${parent.borderTop}"
borderLeft="${parent.borderLeft}"
borderBottom="${parent.borderBottom}"
Modified: openlaszlo/branches/4.3/lps/components/av/videoscreen.lzx
===================================================================
--- openlaszlo/branches/4.3/lps/components/av/videoscreen.lzx 2009-04-01 08:00:05 UTC (rev 13567)
+++ openlaszlo/branches/4.3/lps/components/av/videoscreen.lzx 2009-04-01 08:46:39 UTC (rev 13568)
@@ -16,7 +16,7 @@
<!--- true for verbose debug logging -->
<attribute name="debug" value="false"/>
- <attribute name="showframe" value="0"/>
+ <attribute name="starttime" value="0" type="number"/>
<attribute name="type" type="string" value="http"/>
<attribute name="url" type="string" value=""/>
@@ -75,6 +75,7 @@
stream="$once{classroot.ms}"
visible="${parent.visible && (this.width > 1) && (this.height > 1)}"
playvolume="${classroot.volume}"
+ starttime="${classroot.starttime}"
debug="${parent.debug}"
>
Modified: openlaszlo/branches/4.3/lps/components/extensions/av/videoview.lzx
===================================================================
--- openlaszlo/branches/4.3/lps/components/extensions/av/videoview.lzx 2009-04-01 08:00:05 UTC (rev 13567)
+++ openlaszlo/branches/4.3/lps/components/extensions/av/videoview.lzx 2009-04-01 08:46:39 UTC (rev 13568)
@@ -54,9 +54,11 @@
Default: false. -->
<attribute name="autoplay" value="false"/>
- <!--- Show this frame when the url is set for recorded video.
- Use -1 to show no frame-->
- <attribute name="showframe" value="0"/>
+ <!--- Show the frame from this time (in seconds) whenever the url
+ is set for video playback.
+ Use -1 to show no frame (which will leave the image as it
+ was when switching videos) -->
+ <attribute name="starttime" value="0" type="number"/>
<!--- If true, Debug.write extra stuff (this may go away). -->
<attribute name="debug" value="false"/>
@@ -164,8 +166,8 @@
this.stream, "onplaying")
if (this.stream.playing || this.stream.type == 'http') {
// show poster frame now for http streams
- if (!this.stream.playing && this.showframe != -1) {
- this.stream.seek(this.showframe);
+ if (!this.stream.playing && this.starttime != -1) {
+ this.stream.seek(this.starttime);
}
this._setPlayStream();
}
@@ -286,7 +288,7 @@
<method name="_updateStreamUrl"> <![CDATA[
//Debug.write("%w _updateStreamUrl %w %w",
- // this, this.url, this.showframe);
+ // this, this.url, this.starttime);
this.stream.setAttribute("url", this.url);
]]>
Modified: openlaszlo/branches/4.3/test/video/test-stream-video.lzx
===================================================================
--- openlaszlo/branches/4.3/test/video/test-stream-video.lzx 2009-04-01 08:00:05 UTC (rev 13567)
+++ openlaszlo/branches/4.3/test/video/test-stream-video.lzx 2009-04-01 08:46:39 UTC (rev 13568)
@@ -22,7 +22,7 @@
<simplelayout axis="y" inset="10" spacing="5"/>
<constantlayout axis="x" value="10"/>
<text>v2: don't show first frame initially</text>
- <videoview id="v2" showframe="-1">
+ <videoview id="v2" starttime="-1">
<mediastream id="s2"
url="http:videos/good-dog.flv"/>
</videoview>
Modified: openlaszlo/branches/4.3/test/video/test-videoplayer-http.lzx
===================================================================
--- openlaszlo/branches/4.3/test/video/test-videoplayer-http.lzx 2009-04-01 08:00:05 UTC (rev 13567)
+++ openlaszlo/branches/4.3/test/video/test-videoplayer-http.lzx 2009-04-01 08:46:39 UTC (rev 13568)
@@ -8,11 +8,11 @@
<simplelayout axis="x" spacing="10"/>
<view layout="axis:y">
<text multiline="true">
- v1: showframe="1"<br/>
+ v1: starttime="1"<br/>
showTimeDisplay="false" showVolumeControl="false"<br/>
progressColor="0x0000cc" border="1" sliderGap="0"
</text>
- <videoplayer id="v1" showframe="1"
+ <videoplayer id="v1" starttime="1"
showTimeDisplay="false" showVolumeControl="false"
progressColor="0x0000cc"
border="1" sliderGap="0"
More information about the Laszlo-checkins
mailing list