Changeset 1276

Timestamp:

03/07/10 10:21:32 (5 months ago)

Author:

dreisch

Message:

-fixed #1105

Location:

flash_player/trunk/src/org/korsakow/player

Files:

• engine/Engine.as (modified) (4 diffs)
• engine/action/ExecuteSnuAction.as (modified) (1 diff)
• engine/rules/RequireKeywordsRule.as (modified) (2 diffs)
• engine/rules/SearchRule.as (modified) (1 diff)
• engine/rules/SetBackgroundSoundRule.as (added)
• widget/MultiMediaArea.mxml (modified) (1 diff)
• widget/VideoArea.mxml (modified) (1 diff)

flash_player/trunk/src/org/korsakow/player/engine/Engine.as

@@ -125 +125 @@
                         addEventListener(EnvironmentEvent.SNU_BEGIN_PLAYING, onSnuBeginPlaying);
                         addEventListener(EnvironmentEvent.SNU_FINISH_PLAYING, onSnuFinishPlaying);
-                        addEventListener(EnvironmentEvent.SNU_TIME_UPDATE, onSnuTimeUpdate);
-                        
                         
                         dispatchEvent(new EnvironmentEvent(EnvironmentEvent.INITIALIZED));
@@ -147 +145 @@
                         removeEventListener(EnvironmentEvent.SNU_BEGIN_PLAYING, onSnuBeginPlaying);
                         removeEventListener(EnvironmentEvent.SNU_FINISH_PLAYING, onSnuFinishPlaying);
-                        removeEventListener(EnvironmentEvent.SNU_TIME_UPDATE, onSnuTimeUpdate);
                 }
                 public function showErrorDialog(message:String, title:String):void
@@ -309 +306 @@
                         return _currentSnuTime;
                 }
+                public function set currentSnuTime(time:uint):void
+                {
+                        _currentSnuTime = time;
+                }
                 public function get currentSnuTimeOffset():uint
                 {
@@ -665 +666 @@
                 protected function onSnuFinishPlaying(event:EnvironmentEvent):void
                 {
-                }
-                protected function onSnuTimeUpdate(event:EnvironmentEvent):void
-                {
-                        if (_currentInterfacaMainMedia)
-                                _currentSnuTime = _currentInterfacaMainMedia.playTime;
                 }
                 protected function togglePauseScreen(event:MediaEvent):void

flash_player/trunk/src/org/korsakow/player/engine/action/ExecuteSnuAction.as

@@ -234 +234 @@
                 protected function onMainMediaTime(event:MediaEvent=null):void
                 {
+                        if (_engine.currentMainMedia)
+                                _engine.currentSnuTime = _engine.currentMainMedia.playTime;
                         _engine.snuEventContext.dispatchEvent(new EnvironmentEvent(EnvironmentEvent.SNU_TIME_UPDATE));
                         _engine.dispatchEvent(new EnvironmentEvent(EnvironmentEvent.SNU_TIME_UPDATE));

flash_player/trunk/src/org/korsakow/player/engine/rules/RequireKeywordsRule.as

@@ -1 +1 @@
 package org.korsakow.player.engine.rules
 {
-import __AS3__.vec.Vector;
-
+import org.korsakow.debug.Debug;
 import org.korsakow.domain.Rule;
 import org.korsakow.domain.RuleType;
@@ -17 +16 @@
         override public function execute(env:IEnvironment):void
         {
+                Debug.log("RequireKeywordsRule.execute; keywords=", keywords);
                 // we give each snu without the keyword a score of 0
                 var snusWithoutKeyword:Vector.<ISnu> = new Vector.<ISnu>; // an array of snu vectors

flash_player/trunk/src/org/korsakow/player/engine/rules/SearchRule.as

@@ -106 +106 @@
                                         continue;
                                 var score:Score = env.getSnuScore(snu);
-                                Debug.log("\tSearchRule.links", '#'+i, snu.id, '('+snu.name+')', score.score, '('+snu.rating+')');
-                                availableLinks[linksCounter].snu = candidates[i];
+                                var chosenLink:ISnuLink = availableLinks[linksCounter];
+                                Debug.log("\tSearchRule.links", 'available#'+i, 'index#'+chosenLink.model['index'], snu.id, '('+snu.name+')', score.score, '('+snu.rating+')');
+                                chosenLink.snu = candidates[i];
                                 linksCounter++;
                                 ++maxlinkscount;

flash_player/trunk/src/org/korsakow/player/widget/MultiMediaArea.mxml

@@ -155 +155 @@
                 super.initializeWidget(env);
                 playMedia(_mediaId);
-                Debug.log("MediaArea.init", visible, _media?_media.name:'', _media?_media.filename:'');
+                Debug.log("MediaArea.init", 'id#'+(this), visible, _media?_media.name:'', _media?_media.filename:'');
         }
         override public function destroyWidget(env:IEnvironment):void

flash_player/trunk/src/org/korsakow/player/widget/VideoArea.mxml

@@ -216 +216 @@
         {
                 ScalingPolicy.apply(scalingPolicy, video, this.width, this.height);
-                trace('VideoArea.scaling', this.width, this.height, video.width, video.height);
         }
         override public function destroyWidget(env:IEnvironment):void