Changeset 1815

Timestamp:

05/31/11 08:26:37 (2 years ago)

Author:

jeroen

Message:

fixed small issue with resizing selectbox. Documented small fix for bug that broke spans wrapping an entire caption.

Location:

plugins/captions/v5

Files:

• captions.swf (modified) (previous)
• doc/guide.html (modified) (1 diff)
• src/com/longtailvideo/plugins/captions/Captions.as (modified) (2 diffs)
• src/com/longtailvideo/plugins/captions/Selector.as (modified) (5 diffs)
• test/assets/corrie-styled.xml (modified) (1 diff)

plugins/captions/v5/doc/guide.html

@@ -329 +329 @@
 <li>Enhanced error handling. Instead of printing the error on screen, it is logged by the player. </li>
 <li>Fixed an issue with too many line breaks in both MP4 and DFXP files.</li>
+<li>Fixed an issue that caused spans wrapping an entire caption to be ignored.</li>
 </ul>
 

plugins/captions/v5/src/com/longtailvideo/plugins/captions/Captions.as

@@ -330 +330 @@
         /** Resize this plugin */
         public function resize(width:Number, height:Number):void {
-            _selector.resize(width,height);
             if(_player.config.fullscreen) {
                 _renderer.x = width / 6;
@@ -346 +345 @@
                 _renderer.y = height - 10;
             }
+            _selector.resize(width,height);
         };
 

plugins/captions/v5/src/com/longtailvideo/plugins/captions/Selector.as

@@ -71 +71 @@
         private function _downHandler():void {
             _offset++;
-            _redraw(false);
+            _redraw();
         };
 
@@ -90 +90 @@
             }
             _options[_active].button.activate(true);
-            // Set a sane default offset.
-            if(_active < _max()) {
-                _offset = 0;
-            } else if(_options.length > _max() && _active > _options.length - _max()) {
-                _offset = _options.length - _max();
-            } else { 
-                _offset = _active;
-            }
             // Redraw the menu.
+            _reoffset();
             _redraw();
         };
@@ -104 +97 @@
 
         /** Draw visible portion of the options. **/
-        private function _redraw(show:Boolean=true):void {
+        private function _redraw():void {
             var button:SelectorButton;
             var height:Number = 0;
@@ -164 +157 @@
 
 
+        /** If scrolling, set offset such that active track is visible. **/
+        private function _reoffset():void {
+            if(_active < _max()) {
+                _offset = 0;
+            } else if(_options.length > _max() && _active > _options.length - _max()) {
+                _offset = _options.length - _max();
+            } else { 
+                _offset = _active;
+            }
+        };
+
+
         /** Resize the selector screen. **/
         public function resize(width:Number,height:Number):void {
+            _back.height = height;
             _back.width = width;
-            _back.height = height;
-            if(_options) { 
+            if(_options) {
+                _reoffset();
                 _redraw();
             }
@@ -176 +182 @@
         /** The up button was clicked. **/
         private function _upHandler():void {
-            _offset --;
-            _redraw(false);
+            _offset--;
+            _redraw();
         };
 

plugins/captions/v5/test/assets/corrie-styled.xml

@@ -12 +12 @@
       <p begin="00:00:08" end="00:00:10" style="boldened">- Nothing is going on.</p>
       <p begin="00:00:10.5" end="00:00:12.5" style="yellow">You liar!</p>
-      <p begin="00:00:13.5" end="00:00:15" style="yellow"><span tts:fontSize="30">Are you?</span></p>
+      <p begin="00:00:13.5" end="00:00:15" style="yellow"><span tts:fontSize="30" tts:color="#FFCC00">Are you?</span></p>
       <p begin="00:00:17" end="00:00:20" style="bigger">Violet, please!<br/>- I am <span tts:fontSize="30">not</span> your babe!</p>
       <p begin="00:00:24" end="00:00:29" style="yellow">