From 2fac925ca593ce626a82de8ab0b8661feade8f55 Mon Sep 17 00:00:00 2001
From: Benjamin Mack <benni@typo3.org>
Date: Sat, 28 Feb 2015 19:48:38 +0100
Subject: [PATCH] [TASK] Move media libraries to EXT:mediace
Files related solely to the media Content Element
are moved from typo3/contrib/ to the
extension itself.
Resolves: #65417
Releases: master
Change-Id: I8223f204ccf35c4f4399760da90a90d6a7d1e46d
Reviewed-on: http://review.typo3.org/37367
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
---
.../ContentObject/FlowPlayerContentObject.php | 12 +-
.../QuicktimeObjectContentObject.php | 4 +-
.../ShockwaveFlashObjectContentObject.php | 5 +-
.../Configuration/TypoScript/constants.txt | 6 +-
.../Contrib}/flashmedia/flvplayer.swf | Bin
.../Contrib}/flashmedia/player.license.txt | 0
.../Contrib}/flashmedia/player.readme.txt | 196 +--
.../Resources/Contrib}/flashmedia/player.swf | Bin
.../Contrib}/flashmedia/qtobject/qtobject.js | 4 +-
.../flashmedia/src/doc_core_mediace.sxw | Bin
.../Contrib}/flashmedia/src/flvplayer.as | 20 +-
.../Contrib}/flashmedia/src/flvplayer.fla | Bin
.../flashmedia/swfobject/expressInstall.swf | Bin
.../flashmedia/swfobject/swfobject.js | 4 +-
.../Contrib}/flowplayer/LICENSE-exception.txt | 8 +-
.../Resources/Contrib}/flowplayer/LICENSE.txt | 2 +-
.../flowplayer/LICENSE_COMMERCIAL.txt | 1 -
.../flowplayer/LICENSE_MULTIDOMAIN.txt | 0
.../Contrib}/flowplayer/LICENSE_UNLIMITED.txt | 0
.../Resources/Contrib}/flowplayer/README.txt | 12 +-
.../Contrib}/flowplayer/build.properties | 4 +-
.../Resources/Contrib}/flowplayer/build.xml | 6 +-
.../flowplayer/example/index.html.tmpl | 60 +-
.../Contrib}/flowplayer/example/style.css | 6 +-
.../express-install/express-install.css | 0
.../express-install/flashplayerlogo.jpg | Bin
.../Contrib}/flowplayer/expressinstall.swf | Bin
.../flowplayer/flowplayer-3.2.12.min.js | 0
.../Contrib}/flowplayer/flowplayer-3.2.16.swf | Bin
.../flowplayer/flowplayer.controls-3.2.15.swf | Bin
.../flowplayer/lib/corelib/license.txt | 10 +-
.../flowplayer/lib/corelib/readme.txt | 0
.../lib/corelib/src/com/adobe/crypto/MD5.as | 510 +++----
.../lib/corelib/src/com/adobe/crypto/SHA1.as | 62 +-
.../corelib/src/com/adobe/crypto/SHA224.as | 56 +-
.../corelib/src/com/adobe/crypto/SHA256.as | 60 +-
.../src/com/adobe/crypto/WSSEUsernameToken.as | 28 +-
.../src/com/adobe/errors/IllegalStateError.as | 30 +-
.../com/adobe/fileformats/vcard/Address.as | 32 +-
.../src/com/adobe/fileformats/vcard/Email.as | 30 +-
.../src/com/adobe/fileformats/vcard/Phone.as | 30 +-
.../src/com/adobe/fileformats/vcard/VCard.as | 32 +-
.../adobe/fileformats/vcard/VCardParser.as | 36 +-
.../corelib/src/com/adobe/images/BitString.as | 30 +-
.../src/com/adobe/images/JPGEncoder.as | 1302 ++++++++---------
.../src/com/adobe/images/PNGEncoder.as | 44 +-
.../src/com/adobe/net/DynamicURLLoader.as | 38 +-
.../corelib/src/com/adobe/net/IURIResolver.as | 44 +-
.../corelib/src/com/adobe/net/MimeTypeMap.as | 4 +-
.../lib/corelib/src/com/adobe/net/URI.as | 864 +++++------
.../src/com/adobe/net/URIEncodingBitmap.as | 66 +-
.../com/adobe/net/proxies/RFC2817Socket.as | 58 +-
.../src/com/adobe/serialization/json/JSON.as | 28 +-
.../adobe/serialization/json/JSONDecoder.as | 76 +-
.../adobe/serialization/json/JSONEncoder.as | 112 +-
.../serialization/json/JSONParseError.as | 20 +-
.../com/adobe/serialization/json/JSONToken.as | 32 +-
.../adobe/serialization/json/JSONTokenType.as | 38 +-
.../adobe/serialization/json/JSONTokenizer.as | 212 +--
.../corelib/src/com/adobe/utils/ArrayUtil.as | 98 +-
.../corelib/src/com/adobe/utils/DateUtil.as | 196 +--
.../src/com/adobe/utils/DictionaryUtil.as | 62 +-
.../corelib/src/com/adobe/utils/IntUtil.as | 24 +-
.../src/com/adobe/utils/NumberFormatter.as | 52 +-
.../corelib/src/com/adobe/utils/StringUtil.as | 104 +-
.../corelib/src/com/adobe/utils/XMLUtil.as | 124 +-
.../src/com/adobe/webapis/ServiceBase.as | 34 +-
.../src/com/adobe/webapis/URLLoaderBase.as | 84 +-
.../com/adobe/webapis/events/ServiceEvent.as | 34 +-
.../flowplayer/lib/flexunit/flexunit.swc | Bin
.../mosesSupposes/go/tutorials/SizeTweenMG.as | 92 +-
.../mosesSupposes/go/tutorials/WidthTween.as | 74 +-
.../lib/goasp/src_go/org/goasap/GoEngine.as | 208 +--
.../goasp/src_go/org/goasap/PlayableBase.as | 62 +-
.../goasap/errors/DuplicateManagerError.as | 12 +-
.../org/goasap/errors/EasingFormatError.as | 10 +-
.../goasap/errors/InstanceNotAllowedError.as | 12 +-
.../goasp/src_go/org/goasap/events/GoEvent.as | 54 +-
.../src_go/org/goasap/events/SequenceEvent.as | 16 +-
.../org/goasap/interfaces/ILiveManager.as | 78 +-
.../org/goasap/interfaces/IManageable.as | 96 +-
.../src_go/org/goasap/interfaces/IManager.as | 162 +-
.../src_go/org/goasap/interfaces/IPlayable.as | 20 +-
.../org/goasap/interfaces/IPlayableBase.as | 8 +-
.../org/goasap/interfaces/IUpdatable.as | 30 +-
.../goasp/src_go/org/goasap/items/GoItem.as | 128 +-
.../goasp/src_go/org/goasap/items/LinearGo.as | 418 +++---
.../src_go/org/goasap/items/PhysicsGo.as | 10 +-
.../org/goasap/managers/LinearGoRepeater.as | 26 +-
.../org/goasap/managers/OverlapMonitor.as | 48 +-
.../src_go/org/goasap/managers/Repeater.as | 52 +-
.../src_go/org/goasap/utils/PlayableGroup.as | 138 +-
.../goasp/src_go/org/goasap/utils/Sequence.as | 82 +-
.../src_go/org/goasap/utils/SequenceBase.as | 166 +--
.../src_go/org/goasap/utils/SequenceCA.as | 132 +-
.../src_go/org/goasap/utils/SequenceStep.as | 16 +-
.../src_go/org/goasap/utils/SequenceStepCA.as | 74 +-
.../utils/customadvance/OnConditionTrue.as | 28 +-
.../utils/customadvance/OnDurationComplete.as | 50 +-
.../utils/customadvance/OnEventComplete.as | 28 +-
.../utils/customadvance/OnPlayableComplete.as | 22 +-
.../utils/customadvance/SequenceAdvance.as | 36 +-
.../flowplayer/lib/licensekey/licensekey.swc | Bin
.../lib/thunderbolt/ThunderBoltAS3_Flash.swc | Bin
.../Contrib}/flowplayer/manifest.xml | 0
.../plugins/flowplayer.audio-3.2.10.swf | Bin
.../plugins/flowplayer.audio/LICENSE.txt | 0
.../plugins/flowplayer.audio/README.txt | 2 +-
.../plugins/flowplayer.audio/build.properties | 0
.../plugins/flowplayer.audio/build.xml | 6 +-
.../org/flowplayer/audio/AudioProvider.as | 2 +-
.../flowplayer/audio/AudioProviderFactory.as | 2 +-
.../plugins/flowplayer.captions-3.2.9.swf | Bin
.../plugins/flowplayer.captions/LICENSE.txt | 0
.../plugins/flowplayer.captions/README.txt | 0
.../flowplayer.captions/build.properties | 0
.../plugins/flowplayer.captions/build.xml | 4 +-
.../example/flowplayer.captions.js | 152 +-
.../example/flvtool2-cuepoints.sh | 9 +-
.../example/images/left.png | Bin
.../example/images/right.png | Bin
.../example/images/thumbs/frame00.jpg | Bin
.../example/images/thumbs/frame01.jpg | Bin
.../example/images/thumbs/frame02.jpg | Bin
.../example/images/thumbs/frame03.jpg | Bin
.../example/images/thumbs/frame04.jpg | Bin
.../example/images/thumbs/frame05.jpg | Bin
.../example/images/thumbs/frame06.jpg | Bin
.../example/images/thumbs/frame07.jpg | Bin
.../example/images/thumbs/frame08.jpg | Bin
.../example/images/thumbs/frame09.jpg | Bin
.../example/images/thumbs/frame10.jpg | Bin
.../example/images/thumbs/frame11.jpg | Bin
.../example/images/thumbs/frame12.jpg | Bin
.../example/images/thumbs/frame13.jpg | Bin
.../example/images/thumbs/frame14.jpg | Bin
.../example/images/thumbs/frame15.jpg | Bin
.../example/images/thumbs/frame16.jpg | Bin
.../example/images/thumbs/frame17.jpg | Bin
.../example/images/thumbs/frame18.jpg | Bin
.../example/images/thumbs/frame19.jpg | Bin
.../example/images/thumbs/frame20.jpg | Bin
.../example/index.html.tmpl | 216 +--
.../example/tools.scrollable-1.1.2.js | 428 +++---
.../org/flowplayer/captions/CCButton.as | 2 +-
.../org/flowplayer/captions/Caption.as | 0
.../org/flowplayer/captions/CaptionLoader.as | 12 +-
.../org/flowplayer/captions/CaptionLoading.as | 2 +-
.../org/flowplayer/captions/CaptionPlugin.as | 0
.../captions/CaptionPluginFactory.as | 2 +-
.../captions/CaptionViewDelegate.as | 0
.../org/flowplayer/captions/Config.as | 3 -
.../captions/parsers/AbstractCaptionParser.as | 0
.../captions/parsers/CaptionParser.as | 0
.../flowplayer/captions/parsers/JSONParser.as | 0
.../flowplayer/captions/parsers/SRTParser.as | 0
.../flowplayer/captions/parsers/TTXTParser.as | 0
.../src/flash/closebutton.fla | Bin
.../src/flash/closebutton.swc | Bin
.../src/flash/closebutton.swf | Bin
.../plugins/flowplayer.content-3.2.8.swf | Bin
.../plugins/flowplayer.content/LICENSE.txt | 0
.../plugins/flowplayer.content/README.txt | 0
.../flowplayer.content/build.properties | 0
.../plugins/flowplayer.content/build.xml | 58 +-
.../org/flowplayer/content/CloseButton.as | 2 +-
.../org/flowplayer/content/Content.as | 2 +-
.../org/flowplayer/content/ContentView.as | 0
.../src/flash/closebutton.fla | Bin
.../src/flash/closebutton.swc | Bin
.../src/flash/closebutton.swf | Bin
.../Resources/Contrib}/flowplayer/release.xml | 468 +++---
.../src/actionscript-builtin/BuiltInConfig.as | 6 +-
.../org/flowplayer/config/VersionInfo.as | 14 +-
.../org/flowplayer/view/ContextMenuBuilder.as | 24 +-
.../org/flowplayer/view/LabelPlayButton.as | 14 +-
.../org/flowplayer/view/LicenseKey.as | 10 +-
.../org/flowplayer/view/LogoView.as | 22 +-
.../flowplayer/view/PlayButtonOverlayView.as | 70 +-
.../src/actionscript/mx/core/BitmapAsset.as | 0
.../org/flowplayer/config/Config.as | 44 +-
.../org/flowplayer/config/ConfigParser.as | 2 +-
.../config/ExternalInterfaceHelper.as | 22 +-
.../org/flowplayer/config/PlaylistBuilder.as | 20 +-
.../org/flowplayer/config/PluginBuilder.as | 30 +-
.../flowplayer/config/RSSPlaylistParser.as | 76 +-
.../AbstractDurationTrackingController.as | 22 +-
.../flowplayer/controller/BufferingState.as | 18 +-
.../flowplayer/controller/ClipImageLoader.as | 14 +-
.../flowplayer/controller/ClipURLResolver.as | 12 +-
.../controller/ClipURLResolverHelper.as | 2 +-
.../controller/CompositeClipUrlResolver.as | 0
.../controller/ConnectionCallbacks.as | 2 +-
.../controller/ConnectionProvider.as | 10 +-
.../controller/DefaultClipURLResolver.as | 6 +-
.../DefaultRTMPConnectionProvider.as | 22 +-
.../org/flowplayer/controller/EndedState.as | 6 +-
.../flowplayer/controller/ImageController.as | 30 +-
.../flowplayer/controller/InStreamTracker.as | 2 +-
.../controller/LocalSOVolumeStorage.as | 22 +-
.../flowplayer/controller/MediaController.as | 8 +-
.../controller/MediaControllerFactory.as | 30 +-
.../controller/NetConnectionClient.as | 10 +-
.../controller/NetStreamCallbacks.as | 4 +-
.../flowplayer/controller/NetStreamClient.as | 2 +-
.../NetStreamControllingStreamProvider.as | 10 +-
.../controller/NullNetStreamClient.as | 26 +-
.../controller/NullVolumeStorage.as | 18 +-
.../ParallelRTMPConnectionProvider.as | 2 +-
.../controller/ParallelRTMPConnector.as | 10 +-
.../org/flowplayer/controller/PausedState.as | 12 +-
.../controller/PlayListController.as | 58 +-
.../org/flowplayer/controller/PlayState.as | 38 +-
.../flowplayer/controller/PlayTimeTracker.as | 66 +-
.../org/flowplayer/controller/PlayingState.as | 2 +-
.../flowplayer/controller/ProviderTypes.as | 2 +-
.../flowplayer/controller/ResourceLoader.as | 14 +-
.../controller/ResourceLoaderImpl.as | 24 +-
.../flowplayer/controller/StreamProvider.as | 2 +-
.../controller/StreamProviderController.as | 2 +-
.../org/flowplayer/controller/TimeProvider.as | 2 +-
.../flowplayer/controller/VolumeController.as | 28 +-
.../flowplayer/controller/VolumeStorage.as | 14 +-
.../org/flowplayer/controller/WaitingState.as | 10 +-
.../org/flowplayer/flow_internal.as | 4 +-
.../flowplayer/layout/AbstractConstraint.as | 22 +-
.../org/flowplayer/layout/AbstractLayout.as | 32 +-
.../org/flowplayer/layout/Constraint.as | 18 +-
.../org/flowplayer/layout/Dimensions.as | 26 +-
.../org/flowplayer/layout/DrawWrapper.as | 10 +-
.../org/flowplayer/layout/FixedContraint.as | 14 +-
.../org/flowplayer/layout/Layout.as | 16 +-
.../org/flowplayer/layout/LayoutEvent.as | 10 +-
.../org/flowplayer/layout/Length.as | 26 +-
.../org/flowplayer/layout/LengthMath.as | 28 +-
.../org/flowplayer/layout/MarginConstraint.as | 30 +-
.../org/flowplayer/layout/MarginLayout.as | 14 +-
.../org/flowplayer/layout/Position.as | 40 +-
.../flowplayer/layout/RelativeConstraint.as | 18 +-
.../org/flowplayer/model/AbstractEvent.as | 44 +-
.../org/flowplayer/model/Callable.as | 10 +-
.../org/flowplayer/model/Canvas.as | 0
.../actionscript/org/flowplayer/model/Clip.as | 154 +-
.../org/flowplayer/model/ClipError.as | 12 +-
.../org/flowplayer/model/ClipEvent.as | 10 +-
.../flowplayer/model/ClipEventDispatcher.as | 26 +-
.../org/flowplayer/model/ClipEventSupport.as | 8 +-
.../org/flowplayer/model/ClipEventType.as | 12 +-
.../org/flowplayer/model/ClipType.as | 6 +-
.../org/flowplayer/model/Cloneable.as | 2 +-
.../org/flowplayer/model/Cuepoint.as | 14 +-
.../flowplayer/model/DisplayPluginModel.as | 4 +-
.../model/DisplayPluginModelImpl.as | 16 +-
.../org/flowplayer/model/DisplayProperties.as | 48 +-
.../flowplayer/model/DisplayPropertiesImpl.as | 54 +-
.../org/flowplayer/model/DynamicCuepoint.as | 6 +-
.../org/flowplayer/model/ErrorCode.as | 12 +-
.../org/flowplayer/model/EventDispatcher.as | 26 +-
.../org/flowplayer/model/EventListener.as | 16 +-
.../org/flowplayer/model/EventType.as | 8 +-
.../org/flowplayer/model/Extendable.as | 2 +-
.../org/flowplayer/model/ExtendableHelper.as | 0
.../org/flowplayer/model/FontProvider.as | 6 +-
.../org/flowplayer/model/Identifiable.as | 6 +-
.../org/flowplayer/model/Loadable.as | 26 +-
.../actionscript/org/flowplayer/model/Logo.as | 22 +-
.../org/flowplayer/model/MediaSize.as | 14 +-
.../org/flowplayer/model/NullClip.as | 2 +-
.../org/flowplayer/model/PlayButtonOverlay.as | 22 +-
.../org/flowplayer/model/PlayerError.as | 6 +-
.../org/flowplayer/model/PlayerEvent.as | 16 +-
.../org/flowplayer/model/PlayerEventType.as | 10 +-
.../org/flowplayer/model/Playlist.as | 38 +-
.../org/flowplayer/model/Plugin.as | 14 +-
.../org/flowplayer/model/PluginError.as | 8 +-
.../org/flowplayer/model/PluginEvent.as | 10 +-
.../flowplayer/model/PluginEventDispatcher.as | 10 +-
.../org/flowplayer/model/PluginEventType.as | 16 +-
.../org/flowplayer/model/PluginFactory.as | 4 +-
.../org/flowplayer/model/PluginMethod.as | 16 +-
.../flowplayer/model/PluginMethodHelper.as | 4 +-
.../org/flowplayer/model/PluginModel.as | 18 +-
.../org/flowplayer/model/PluginModelImpl.as | 28 +-
.../org/flowplayer/model/ProviderModel.as | 2 +-
.../org/flowplayer/model/State.as | 8 +-
.../org/flowplayer/model/Status.as | 38 +-
.../org/flowplayer/model/TimedPlaylist.as | 2 +-
.../org/flowplayer/util/Arrange.as | 22 +-
.../org/flowplayer/util/ArrayUtil.as | 8 +-
.../org/flowplayer/util/Assert.as | 4 +-
.../org/flowplayer/util/GraphicsUtil.as | 20 +-
.../actionscript/org/flowplayer/util/Log.as | 34 +-
.../org/flowplayer/util/LogConfiguration.as | 10 +-
.../org/flowplayer/util/NumberUtil.as | 14 +-
.../org/flowplayer/util/ObjectConverter.as | 18 +-
.../org/flowplayer/util/PropertyBinder.as | 12 +-
.../org/flowplayer/util/StyleSheetUtil.as | 32 +-
.../org/flowplayer/util/TextUtil.as | 8 +-
.../org/flowplayer/util/TimeUtil.as | 0
.../org/flowplayer/util/URLUtil.as | 14 +-
.../org/flowplayer/util/VersionUtil.as | 28 +-
.../org/flowplayer/view/AbstractSprite.as | 20 +-
.../org/flowplayer/view/Animation.as | 20 +-
.../org/flowplayer/view/AnimationEngine.as | 52 +-
.../org/flowplayer/view/BuiltInAssetHelper.as | 2 +-
.../org/flowplayer/view/ClipResizer.as | 24 +-
.../org/flowplayer/view/ErrorHandler.as | 8 +-
.../org/flowplayer/view/FlowStyleSheet.as | 52 +-
.../org/flowplayer/view/Flowplayer.as | 2 +-
.../org/flowplayer/view/FlowplayerBase.as | 88 +-
.../flowplayer/view/FlowplayerComponent.as | 0
.../org/flowplayer/view/FullscreenManager.as | 14 +-
.../org/flowplayer/view/ImageDisplay.as | 12 +-
.../org/flowplayer/view/ImageHolder.as | 44 +-
.../org/flowplayer/view/KeyboardHandler.as | 36 +-
.../org/flowplayer/view/Launcher.as | 106 +-
.../org/flowplayer/view/LogoUtil.as | 10 +-
.../org/flowplayer/view/MediaDisplay.as | 6 +-
.../flowplayer/view/MediaDisplayFactory.as | 24 +-
.../org/flowplayer/view/MediaResizer.as | 24 +-
.../actionscript/org/flowplayer/view/Panel.as | 22 +-
.../flowplayer/view/PlayerEventDispatcher.as | 20 +-
.../org/flowplayer/view/PluginLoader.as | 30 +-
.../org/flowplayer/view/PluginRegistry.as | 48 +-
.../org/flowplayer/view/Preloader.as | 8 +-
.../org/flowplayer/view/RotatingAnimation.as | 0
.../org/flowplayer/view/Screen.as | 2 +-
.../org/flowplayer/view/StageVideoWrapper.as | 64 +-
.../org/flowplayer/view/Styleable.as | 24 +-
.../org/flowplayer/view/StyleableSprite.as | 82 +-
.../org/flowplayer/view/VideoApiDisplay.as | 20 +-
.../org/flowplayer/view/VideoDisplay.as | 16 +-
.../org/flowplayer/view/WrapperForIE.as | 2 +-
.../org/flowplayer/view/fplogo.png | Bin
.../Contrib}/flowplayer/src/assets/play.png | Bin
.../flowplayer/src/flash/resources.fla | Bin
.../flowplayer/src/flash/resources.swc | Bin
.../flowplayer/src/flash/resources.swf | Bin
.../flowplayer/src/html/FlowPlayer.html | 38 +-
.../flowplayer/src/html/embedding.html | 0
.../flowplayer/src/html/flashembed.min.js | 4 +-
.../flowplayer/src/javascript/flashembed.js | 0
.../src/javascript/flashembed.min.js | 4 +-
.../src/javascript/flowplayer.js/build.xml | 18 +-
.../flowplayer.js/flowplayer-3.2.10.js | 6 +-
.../flowplayer.js/flowplayer-3.2.10.min.js | 0
.../flowplayer.js/flowplayer-3.2.11.min.js | 0
.../flowplayer.js/flowplayer-3.2.12.min.js | 0
.../flowplayer.js/flowplayer-3.2.7.min.js | 16 +-
.../flowplayer.js/flowplayer-3.2.8.js | 6 +-
.../flowplayer.js/flowplayer-3.2.8.min.js | 0
.../flowplayer.js/flowplayer-3.2.9.js | 6 +-
.../flowplayer.js/flowplayer-3.2.9.min.js | 0
.../flowplayer.js/flowplayer-src.js | 6 +-
.../flowplayer.js/release-notes.html | 22 +-
.../javascript/flowplayer.js/test/index.html | 12 +-
.../flowplayer.js/test/test-player.js | 113 +-
.../flowplayer/src/javascript/swfobject.js | 0
.../Contrib}/videojs/video-js/LICENSE.txt | 0
.../Contrib}/videojs/video-js/README.markdown | 2 +-
.../video-js/controls/audio-description.js | 0
.../video-js/controls/audio-description.png | Bin
.../videojs/video-js/controls/captions.js | 2 +-
.../videojs/video-js/controls/captions.png | Bin
.../videojs/video-js/controls/control-bar.css | 6 +-
.../videojs/video-js/controls/control-bar.js | 12 +-
.../videojs/video-js/demo-subtitles.srt | 2 -
.../Contrib}/videojs/video-js/demo.html | 6 +-
.../Contrib}/videojs/video-js/skins/hu.css | 0
.../Contrib}/videojs/video-js/skins/tube.css | 2 +-
.../Contrib}/videojs/video-js/skins/vim.css | 0
.../Contrib}/videojs/video-js/video-js.css | 16 +-
.../Contrib}/videojs/video-js/video.js | 0
373 files changed, 6132 insertions(+), 6139 deletions(-)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flashmedia/flvplayer.swf (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flashmedia/player.license.txt (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flashmedia/player.readme.txt (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flashmedia/player.swf (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flashmedia/qtobject/qtobject.js (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flashmedia/src/doc_core_mediace.sxw (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flashmedia/src/flvplayer.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flashmedia/src/flvplayer.fla (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flashmedia/swfobject/expressInstall.swf (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flashmedia/swfobject/swfobject.js (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/LICENSE-exception.txt (95%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/LICENSE.txt (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/LICENSE_COMMERCIAL.txt (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/LICENSE_MULTIDOMAIN.txt (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/LICENSE_UNLIMITED.txt (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/README.txt (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/build.properties (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/build.xml (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/example/index.html.tmpl (78%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/example/style.css (87%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/express-install/express-install.css (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/express-install/flashplayerlogo.jpg (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/expressinstall.swf (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/flowplayer-3.2.12.min.js (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/flowplayer-3.2.16.swf (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/flowplayer.controls-3.2.15.swf (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/license.txt (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/readme.txt (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/crypto/MD5.as (95%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/crypto/SHA1.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/crypto/SHA224.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/crypto/SHA256.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/crypto/WSSEUsernameToken.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/errors/IllegalStateError.as (94%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/Address.as (93%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/Email.as (92%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/Phone.as (92%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/VCard.as (93%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/VCardParser.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/images/BitString.as (92%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/images/JPGEncoder.as (95%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/images/PNGEncoder.as (93%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/net/DynamicURLLoader.as (90%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/net/IURIResolver.as (94%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/net/MimeTypeMap.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/net/URI.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/net/URIEncodingBitmap.as (93%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/net/proxies/RFC2817Socket.as (95%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSON.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONDecoder.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONEncoder.as (95%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONParseError.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONToken.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONTokenType.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONTokenizer.as (94%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/utils/ArrayUtil.as (93%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/utils/DateUtil.as (94%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/utils/DictionaryUtil.as (92%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/utils/IntUtil.as (91%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/utils/NumberFormatter.as (91%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/utils/StringUtil.as (92%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/utils/XMLUtil.as (90%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/webapis/ServiceBase.as (91%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/webapis/URLLoaderBase.as (87%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/corelib/src/com/adobe/webapis/events/ServiceEvent.as (94%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/flexunit/flexunit.swc (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/com/mosesSupposes/go/tutorials/SizeTweenMG.as (92%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/com/mosesSupposes/go/tutorials/WidthTween.as (90%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/GoEngine.as (92%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/PlayableBase.as (94%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/errors/DuplicateManagerError.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/errors/EasingFormatError.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/errors/InstanceNotAllowedError.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/events/GoEvent.as (95%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/events/SequenceEvent.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/interfaces/ILiveManager.as (87%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IManageable.as (88%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IManager.as (75%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IPlayable.as (95%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IPlayableBase.as (95%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IUpdatable.as (89%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/items/GoItem.as (89%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/items/LinearGo.as (89%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/items/PhysicsGo.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/managers/LinearGoRepeater.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/managers/OverlapMonitor.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/managers/Repeater.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/utils/PlayableGroup.as (95%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/utils/Sequence.as (94%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/utils/SequenceBase.as (95%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/utils/SequenceCA.as (94%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/utils/SequenceStep.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/utils/SequenceStepCA.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/OnConditionTrue.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/OnDurationComplete.as (94%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/OnEventComplete.as (95%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/OnPlayableComplete.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/SequenceAdvance.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/licensekey/licensekey.swc (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/lib/thunderbolt/ThunderBoltAS3_Flash.swc (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/manifest.xml (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.audio-3.2.10.swf (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.audio/LICENSE.txt (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.audio/README.txt (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.audio/build.properties (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.audio/build.xml (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.audio/src/actionscript/org/flowplayer/audio/AudioProvider.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.audio/src/actionscript/org/flowplayer/audio/AudioProviderFactory.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions-3.2.9.swf (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/LICENSE.txt (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/README.txt (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/build.properties (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/build.xml (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/example/flowplayer.captions.js (79%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/example/flvtool2-cuepoints.sh (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/example/images/left.png (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/example/images/right.png (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame00.jpg (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame01.jpg (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame02.jpg (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame03.jpg (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame04.jpg (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame05.jpg (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame06.jpg (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame07.jpg (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame08.jpg (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame09.jpg (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame10.jpg (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame11.jpg (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame12.jpg (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame13.jpg (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame14.jpg (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame15.jpg (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame16.jpg (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame17.jpg (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame18.jpg (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame19.jpg (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame20.jpg (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/example/index.html.tmpl (92%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/example/tools.scrollable-1.1.2.js (63%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CCButton.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/Caption.as (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionLoader.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionLoading.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionPlugin.as (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionPluginFactory.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionViewDelegate.as (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/Config.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/parsers/AbstractCaptionParser.as (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/parsers/CaptionParser.as (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/parsers/JSONParser.as (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/parsers/SRTParser.as (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/parsers/TTXTParser.as (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/src/flash/closebutton.fla (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/src/flash/closebutton.swc (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.captions/src/flash/closebutton.swf (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.content-3.2.8.swf (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.content/LICENSE.txt (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.content/README.txt (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.content/build.properties (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.content/build.xml (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.content/src/actionscript/org/flowplayer/content/CloseButton.as (95%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.content/src/actionscript/org/flowplayer/content/Content.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.content/src/actionscript/org/flowplayer/content/ContentView.as (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.content/src/flash/closebutton.fla (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.content/src/flash/closebutton.swc (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/plugins/flowplayer.content/src/flash/closebutton.swf (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/release.xml (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript-builtin/BuiltInConfig.as (95%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript-commercial/org/flowplayer/config/VersionInfo.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript-commercial/org/flowplayer/view/ContextMenuBuilder.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript-commercial/org/flowplayer/view/LabelPlayButton.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript-commercial/org/flowplayer/view/LicenseKey.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript-commercial/org/flowplayer/view/LogoView.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript-commercial/org/flowplayer/view/PlayButtonOverlayView.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/mx/core/BitmapAsset.as (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/config/Config.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/config/ConfigParser.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/config/ExternalInterfaceHelper.as (95%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/config/PlaylistBuilder.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/config/PluginBuilder.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/config/RSSPlaylistParser.as (92%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/AbstractDurationTrackingController.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/BufferingState.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/ClipImageLoader.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/ClipURLResolver.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/ClipURLResolverHelper.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/CompositeClipUrlResolver.as (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/ConnectionCallbacks.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/ConnectionProvider.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/DefaultClipURLResolver.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/DefaultRTMPConnectionProvider.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/EndedState.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/ImageController.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/InStreamTracker.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/LocalSOVolumeStorage.as (95%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/MediaController.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/MediaControllerFactory.as (94%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/NetConnectionClient.as (94%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/NetStreamCallbacks.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/NetStreamClient.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/NetStreamControllingStreamProvider.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/NullNetStreamClient.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/NullVolumeStorage.as (91%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/ParallelRTMPConnectionProvider.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/ParallelRTMPConnector.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/PausedState.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/PlayListController.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/PlayState.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/PlayTimeTracker.as (94%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/PlayingState.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/ProviderTypes.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/ResourceLoader.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/ResourceLoaderImpl.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/StreamProvider.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/StreamProviderController.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/TimeProvider.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/VolumeController.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/VolumeStorage.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/controller/WaitingState.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/flow_internal.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/layout/AbstractConstraint.as (92%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/layout/AbstractLayout.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/layout/Constraint.as (92%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/layout/Dimensions.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/layout/DrawWrapper.as (92%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/layout/FixedContraint.as (95%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/layout/Layout.as (92%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/layout/LayoutEvent.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/layout/Length.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/layout/LengthMath.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/layout/MarginConstraint.as (95%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/layout/MarginLayout.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/layout/Position.as (94%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/layout/RelativeConstraint.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/AbstractEvent.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/Callable.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/Canvas.as (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/Clip.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/ClipError.as (93%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/ClipEvent.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/ClipEventDispatcher.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/ClipEventSupport.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/ClipEventType.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/ClipType.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/Cloneable.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/Cuepoint.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/DisplayPluginModel.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/DisplayPluginModelImpl.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/DisplayProperties.as (94%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/DisplayPropertiesImpl.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/DynamicCuepoint.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/ErrorCode.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/EventDispatcher.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/EventListener.as (94%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/EventType.as (92%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/Extendable.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/ExtendableHelper.as (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/FontProvider.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/Identifiable.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/Loadable.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/Logo.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/MediaSize.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/NullClip.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/PlayButtonOverlay.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/PlayerError.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/PlayerEvent.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/PlayerEventType.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/Playlist.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/Plugin.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/PluginError.as (95%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/PluginEvent.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/PluginEventDispatcher.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/PluginEventType.as (90%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/PluginFactory.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/PluginMethod.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/PluginMethodHelper.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/PluginModel.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/PluginModelImpl.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/ProviderModel.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/State.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/Status.as (95%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/model/TimedPlaylist.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/util/Arrange.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/util/ArrayUtil.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/util/Assert.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/util/GraphicsUtil.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/util/Log.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/util/LogConfiguration.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/util/NumberUtil.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/util/ObjectConverter.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/util/PropertyBinder.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/util/StyleSheetUtil.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/util/TextUtil.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/util/TimeUtil.as (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/util/URLUtil.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/util/VersionUtil.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/AbstractSprite.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/Animation.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/AnimationEngine.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/BuiltInAssetHelper.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/ClipResizer.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/ErrorHandler.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/FlowStyleSheet.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/Flowplayer.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/FlowplayerBase.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/FlowplayerComponent.as (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/FullscreenManager.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/ImageDisplay.as (93%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/ImageHolder.as (90%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/KeyboardHandler.as (93%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/Launcher.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/LogoUtil.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/MediaDisplay.as (95%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/MediaDisplayFactory.as (95%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/MediaResizer.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/Panel.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/PlayerEventDispatcher.as (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/PluginLoader.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/PluginRegistry.as (95%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/Preloader.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/RotatingAnimation.as (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/Screen.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/StageVideoWrapper.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/Styleable.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/StyleableSprite.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/VideoApiDisplay.as (97%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/VideoDisplay.as (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/WrapperForIE.as (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/actionscript/org/flowplayer/view/fplogo.png (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/assets/play.png (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/flash/resources.fla (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/flash/resources.swc (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/flash/resources.swf (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/html/FlowPlayer.html (93%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/html/embedding.html (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/html/flashembed.min.js (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/javascript/flashembed.js (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/javascript/flashembed.min.js (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/javascript/flowplayer.js/build.xml (85%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.10.js (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.10.min.js (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.11.min.js (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.12.min.js (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.7.min.js (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.8.js (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.8.min.js (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.9.js (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.9.min.js (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/javascript/flowplayer.js/flowplayer-src.js (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/javascript/flowplayer.js/release-notes.html (92%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/javascript/flowplayer.js/test/index.html (69%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/javascript/flowplayer.js/test/test-player.js (79%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/flowplayer/src/javascript/swfobject.js (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/videojs/video-js/LICENSE.txt (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/videojs/video-js/README.markdown (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/videojs/video-js/controls/audio-description.js (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/videojs/video-js/controls/audio-description.png (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/videojs/video-js/controls/captions.js (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/videojs/video-js/controls/captions.png (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/videojs/video-js/controls/control-bar.css (96%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/videojs/video-js/controls/control-bar.js (94%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/videojs/video-js/demo-subtitles.srt (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/videojs/video-js/demo.html (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/videojs/video-js/skins/hu.css (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/videojs/video-js/skins/tube.css (99%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/videojs/video-js/skins/vim.css (100%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/videojs/video-js/video-js.css (98%)
rename typo3/{contrib => sysext/mediace/Resources/Contrib}/videojs/video-js/video.js (100%)
diff --git a/typo3/sysext/mediace/Classes/ContentObject/FlowPlayerContentObject.php b/typo3/sysext/mediace/Classes/ContentObject/FlowPlayerContentObject.php
index 9edc9b9ca94d..ee1a63600ffa 100644
--- a/typo3/sysext/mediace/Classes/ContentObject/FlowPlayerContentObject.php
+++ b/typo3/sysext/mediace/Classes/ContentObject/FlowPlayerContentObject.php
@@ -239,11 +239,13 @@ class FlowPlayerContentObject extends \TYPO3\CMS\Frontend\ContentObject\Abstract
if (!$player) {
$player = $prefix . $this->getPathToLibrary('flowplayer/flowplayer-3.2.16.swf');
} elseif (strpos($player, 'EXT:') === 0) {
- $player = $GLOBALS['TSFE']->tmpl->getFileName($player);
+ $player = $prefix . $GLOBALS['TSFE']->tmpl->getFileName($player);
}
$installUrl = isset($conf['installUrl.']) ? $this->cObj->stdWrap($conf['installUrl'], $conf['installUrl.']) : $conf['installUrl'];
if (!$installUrl) {
$installUrl = $prefix . $this->getPathToLibrary('flowplayer/expressinstall.swf');
+ } elseif (strpos($installUrl, 'EXT:') === 0) {
+ $installUrl = $prefix . $GLOBALS['TSFE']->tmpl->getFileName($installUrl);
}
$flashVersion = isset($conf['flashVersion.']) ? $this->cObj->stdWrap($conf['flashVersion'], $conf['flashVersion.']) : $conf['flashVersion'];
if (!$flashVersion) {
@@ -402,8 +404,8 @@ class FlowPlayerContentObject extends \TYPO3\CMS\Frontend\ContentObject\Abstract
ArrayUtility::remapArrayKeys($conf['attributes.'], $typeConf['attributes.']['params.']);
}
foreach ($this->html5TagAttributes as $attribute) {
- if ($conf['attributes.'][$attribute] === 'true' || $conf['attributes.'][$attribute] === strToLower($attribute) || $conf['attributes.'][$attribute] === $attribute) {
- $attributes .= strToLower($attribute) . '="' . strToLower($attribute) . '" ';
+ if ($conf['attributes.'][$attribute] === 'true' || $conf['attributes.'][$attribute] === strtolower($attribute) || $conf['attributes.'][$attribute] === $attribute) {
+ $attributes .= strtolower($attribute) . '="' . strtolower($attribute) . '" ';
}
}
// Media dimensions
@@ -719,12 +721,12 @@ class FlowPlayerContentObject extends \TYPO3\CMS\Frontend\ContentObject\Abstract
}
/**
- * resolves the path to the main contrib directory
+ * resolves the path to the extensions' Contrib directory
*
* @param string $fileAndFolderName the file to be located
* @return string
*/
protected function getPathToLibrary($fileAndFolderName) {
- return TYPO3_mainDir . 'contrib/' . $fileAndFolderName;
+ return $GLOBALS['TSFE']->tmpl->getFileName('EXT:mediace/Resources/Contrib/' . $fileAndFolderName);
}
}
diff --git a/typo3/sysext/mediace/Classes/ContentObject/QuicktimeObjectContentObject.php b/typo3/sysext/mediace/Classes/ContentObject/QuicktimeObjectContentObject.php
index 8edf29b090c6..1652be7ed3d1 100644
--- a/typo3/sysext/mediace/Classes/ContentObject/QuicktimeObjectContentObject.php
+++ b/typo3/sysext/mediace/Classes/ContentObject/QuicktimeObjectContentObject.php
@@ -102,12 +102,12 @@ class QuicktimeObjectContentObject extends \TYPO3\CMS\Frontend\ContentObject\Abs
}
/**
- * resolves the path to the main contrib directory
+ * resolves the path to the extensions' Contrib directory
*
* @param string $fileAndFolderName the file to be located
* @return string
*/
protected function getPathToLibrary($fileAndFolderName) {
- return TYPO3_mainDir . 'contrib/' . $fileAndFolderName;
+ return $GLOBALS['TSFE']->tmpl->getFileName('EXT:mediace/Resources/Contrib/' . $fileAndFolderName);
}
}
diff --git a/typo3/sysext/mediace/Classes/ContentObject/ShockwaveFlashObjectContentObject.php b/typo3/sysext/mediace/Classes/ContentObject/ShockwaveFlashObjectContentObject.php
index 02bdf76a5cb7..2fcdaf7ec8f2 100644
--- a/typo3/sysext/mediace/Classes/ContentObject/ShockwaveFlashObjectContentObject.php
+++ b/typo3/sysext/mediace/Classes/ContentObject/ShockwaveFlashObjectContentObject.php
@@ -126,14 +126,13 @@ class ShockwaveFlashObjectContentObject extends \TYPO3\CMS\Frontend\ContentObjec
return $content;
}
-
/**
- * resolves the path to the main contrib directory
+ * resolves the path to the extensions' Contrib directory
*
* @param string $fileAndFolderName the file to be located
* @return string
*/
protected function getPathToLibrary($fileAndFolderName) {
- return TYPO3_mainDir . 'contrib/' . $fileAndFolderName;
+ return $GLOBALS['TSFE']->tmpl->getFileName('EXT:mediace/Resources/Contrib/' . $fileAndFolderName);
}
}
diff --git a/typo3/sysext/mediace/Configuration/TypoScript/constants.txt b/typo3/sysext/mediace/Configuration/TypoScript/constants.txt
index e38f28df195c..95158fdf48f9 100644
--- a/typo3/sysext/mediace/Configuration/TypoScript/constants.txt
+++ b/typo3/sysext/mediace/Configuration/TypoScript/constants.txt
@@ -1,16 +1,16 @@
styles.content.media {
# cat=content/cMedia/j1; type=; label= Video Player: configure the path to the video player
- videoPlayer = typo3/contrib/flashmedia/flvplayer.swf
+ videoPlayer = EXT:mediace/Resources/Contrib/flashmedia/flvplayer.swf
# cat=content/cMedia/j2; type=int+; label= Media Video Width: define the default width for the media video
defaultVideoWidth = 600
# cat=content/cMedia/j3; type=int+; label= Media Video Height: define the default height for the media video
defaultVideoHeight = 400
# cat=content/cMedia/j4; type=; label= Audio Player: configure the path to the video player
- audioPlayer = typo3/contrib/flashmedia/player.swf
+ audioPlayer = EXT:mediace/Resources/Contrib/flashmedia/player.swf
# cat=content/cMedia/j5; type=int+; label= Media Audio Width: define the default width for the media audio
defaultAudioWidth = 300
# cat=content/cMedia/j6; type=int+; label= Media Audio Height: define the default height for the media audio
defaultAudioHeight = 30
# cat=content/cMedia/j7; type=; label= Flow Player: configure the path to the flow-player
- flowPlayer = typo3/contrib/flowplayer/flowplayer-3.2.16.swf
+ flowPlayer = EXT:mediace/Resources/Contrib/flowplayer/flowplayer-3.2.16.swf
}
diff --git a/typo3/contrib/flashmedia/flvplayer.swf b/typo3/sysext/mediace/Resources/Contrib/flashmedia/flvplayer.swf
similarity index 100%
rename from typo3/contrib/flashmedia/flvplayer.swf
rename to typo3/sysext/mediace/Resources/Contrib/flashmedia/flvplayer.swf
diff --git a/typo3/contrib/flashmedia/player.license.txt b/typo3/sysext/mediace/Resources/Contrib/flashmedia/player.license.txt
similarity index 100%
rename from typo3/contrib/flashmedia/player.license.txt
rename to typo3/sysext/mediace/Resources/Contrib/flashmedia/player.license.txt
diff --git a/typo3/contrib/flashmedia/player.readme.txt b/typo3/sysext/mediace/Resources/Contrib/flashmedia/player.readme.txt
similarity index 96%
rename from typo3/contrib/flashmedia/player.readme.txt
rename to typo3/sysext/mediace/Resources/Contrib/flashmedia/player.readme.txt
index a80691ea9adc..6a36036eb3e5 100644
--- a/typo3/contrib/flashmedia/player.readme.txt
+++ b/typo3/sysext/mediace/Resources/Contrib/flashmedia/player.readme.txt
@@ -1,98 +1,98 @@
-=== Audio Player ===
-
-Contributors: doryphores
-Donate link: http://www.wpaudioplayer.com
-Tags: media, audio, podcast, post, mp3, music, embed, flash, player, sound, media player, music player, mp3 player
-Requires at least: 2.2
-Tested up to: 2.9
-Stable tag: 2.0.4.6
-
-Audio Player is a highly configurable but simple mp3 player for all your audio needs. You can customise the player's colour scheme to match your blog theme, have it automatically show track information from the encoded ID3 tags and more.
-
-== Description ==
-
-Audio Player is a highly configurable but simple mp3 player for all your audio needs.
-
-Features include:
-
-* configurable colour scheme to match your blog theme
-* volume control
-* right-to-left layout switch for Arabic and Hebrew language sites
-* many options such as autostart and loop
-* ID3 tag support (custom track info also available)
-
-Related links:
-
-* [Usage](http://wpaudioplayer.com/usage)
-* [FAQs](http://wpaudioplayer.com/frequently-asked-questions)
-* [Troubleshooting](http://wpaudioplayer.com/support/troubleshooting)
-
-== Installation ==
-
-To install the plugin manually:
-
-1. Extract the contents of the archive (zip file)
-2. Upload the audio-player folder to your '/wp-content/plugins' folder
-3. Activate the plugin through the Plugins section in your WordPress admin
-
-IMPORTANT NOTE:
-
-This plugin will only work if your theme allows inserting code in the HEAD and FOOTER sections of your blog. See [this page](http://wpaudioplayer.com/support/troubleshooting) for more details.
-
-Upgrade - VERY IMPORTANT
-
-Upgrading from 1.2.3 to 2.0: The plugins/audio-player.php file is no longer needed and MUST be deleted. The audio-player.php file now lives in plugins/audio-player/
-
-== Changelog ==
-
-= 2.0.4.6 =
-
-Player swf fix
-
-= 2.0.4.5 =
-
-Fixed option page button styling
-
-= 2.0.4.4 =
-
-Fixed time display
-
-= 2.0.4.3 =
-
-Security update
-
-= 2.0.4.1 =
-
-* RTL layout was set as default (oops)
-
-= 2.0.4 =
-
-* Reverted RTL play button (again, needs more flexible options)
-* Added "remove all enclosures" option
-* Fixed PHP 4 compatibility (this caused players to not show in the Sermon Browser plugin)
-
-= 2.0.3.1 =
-
-* Fixed path to plugins folder (in case plugins are stored in a non-standard place)
-
-= 2.0.3 =
-
-* Play button now points to the left in RTL layout
-* Alternate content is now hidden before player loads
-* Fixed Spanish translation file problem
-* Added Danish language file and fixed small errors in all others
-* Ampersands in mp3 file names are now properly decoded
-* Fixed an issue with migrating the transparent background option to version 2.x
-
-= 2.0.2 =
-
-* Updated SWFObject to version 2.2
-* Added translation files for German and Spanish
-
-= 2.0.1 =
-
-* Fixed a bug where custom track titles were being ignored
-
-== Frequently Asked Questions ==
-
-View the complete FAQs [here](http://wpaudioplayer.com/frequently-asked-questions).
+=== Audio Player ===
+
+Contributors: doryphores
+Donate link: http://www.wpaudioplayer.com
+Tags: media, audio, podcast, post, mp3, music, embed, flash, player, sound, media player, music player, mp3 player
+Requires at least: 2.2
+Tested up to: 2.9
+Stable tag: 2.0.4.6
+
+Audio Player is a highly configurable but simple mp3 player for all your audio needs. You can customise the player's colour scheme to match your blog theme, have it automatically show track information from the encoded ID3 tags and more.
+
+== Description ==
+
+Audio Player is a highly configurable but simple mp3 player for all your audio needs.
+
+Features include:
+
+* configurable colour scheme to match your blog theme
+* volume control
+* right-to-left layout switch for Arabic and Hebrew language sites
+* many options such as autostart and loop
+* ID3 tag support (custom track info also available)
+
+Related links:
+
+* [Usage](http://wpaudioplayer.com/usage)
+* [FAQs](http://wpaudioplayer.com/frequently-asked-questions)
+* [Troubleshooting](http://wpaudioplayer.com/support/troubleshooting)
+
+== Installation ==
+
+To install the plugin manually:
+
+1. Extract the contents of the archive (zip file)
+2. Upload the audio-player folder to your '/wp-content/plugins' folder
+3. Activate the plugin through the Plugins section in your WordPress admin
+
+IMPORTANT NOTE:
+
+This plugin will only work if your theme allows inserting code in the HEAD and FOOTER sections of your blog. See [this page](http://wpaudioplayer.com/support/troubleshooting) for more details.
+
+Upgrade - VERY IMPORTANT
+
+Upgrading from 1.2.3 to 2.0: The plugins/audio-player.php file is no longer needed and MUST be deleted. The audio-player.php file now lives in plugins/audio-player/
+
+== Changelog ==
+
+= 2.0.4.6 =
+
+Player swf fix
+
+= 2.0.4.5 =
+
+Fixed option page button styling
+
+= 2.0.4.4 =
+
+Fixed time display
+
+= 2.0.4.3 =
+
+Security update
+
+= 2.0.4.1 =
+
+* RTL layout was set as default (oops)
+
+= 2.0.4 =
+
+* Reverted RTL play button (again, needs more flexible options)
+* Added "remove all enclosures" option
+* Fixed PHP 4 compatibility (this caused players to not show in the Sermon Browser plugin)
+
+= 2.0.3.1 =
+
+* Fixed path to plugins folder (in case plugins are stored in a non-standard place)
+
+= 2.0.3 =
+
+* Play button now points to the left in RTL layout
+* Alternate content is now hidden before player loads
+* Fixed Spanish translation file problem
+* Added Danish language file and fixed small errors in all others
+* Ampersands in mp3 file names are now properly decoded
+* Fixed an issue with migrating the transparent background option to version 2.x
+
+= 2.0.2 =
+
+* Updated SWFObject to version 2.2
+* Added translation files for German and Spanish
+
+= 2.0.1 =
+
+* Fixed a bug where custom track titles were being ignored
+
+== Frequently Asked Questions ==
+
+View the complete FAQs [here](http://wpaudioplayer.com/frequently-asked-questions).
diff --git a/typo3/contrib/flashmedia/player.swf b/typo3/sysext/mediace/Resources/Contrib/flashmedia/player.swf
similarity index 100%
rename from typo3/contrib/flashmedia/player.swf
rename to typo3/sysext/mediace/Resources/Contrib/flashmedia/player.swf
diff --git a/typo3/contrib/flashmedia/qtobject/qtobject.js b/typo3/sysext/mediace/Resources/Contrib/flashmedia/qtobject/qtobject.js
similarity index 99%
rename from typo3/contrib/flashmedia/qtobject/qtobject.js
rename to typo3/sysext/mediace/Resources/Contrib/flashmedia/qtobject/qtobject.js
index aebfc9a91ecf..f5173c408970 100644
--- a/typo3/contrib/flashmedia/qtobject/qtobject.js
+++ b/typo3/sysext/mediace/Resources/Contrib/flashmedia/qtobject/qtobject.js
@@ -12,7 +12,7 @@
*
* myQTObject = new QTObject("path/to/mov.mov", "movid", "width", "height");
* myQTObject.altTxt = "Upgrade your Quicktime Player!"; // optional
-
+
* myQTObject.addParam("controller", "false"); // optional
* myQTObject.write();
*
@@ -105,7 +105,7 @@ QTObject.prototype.write = function(elementId) {
document.write(this.altTxt +""+ this.bypassTxt);
}
}
- }
+ }
}
function isQTInstalled() {
diff --git a/typo3/contrib/flashmedia/src/doc_core_mediace.sxw b/typo3/sysext/mediace/Resources/Contrib/flashmedia/src/doc_core_mediace.sxw
similarity index 100%
rename from typo3/contrib/flashmedia/src/doc_core_mediace.sxw
rename to typo3/sysext/mediace/Resources/Contrib/flashmedia/src/doc_core_mediace.sxw
diff --git a/typo3/contrib/flashmedia/src/flvplayer.as b/typo3/sysext/mediace/Resources/Contrib/flashmedia/src/flvplayer.as
similarity index 97%
rename from typo3/contrib/flashmedia/src/flvplayer.as
rename to typo3/sysext/mediace/Resources/Contrib/flashmedia/src/flvplayer.as
index 6acf44277d31..76497d3c6a58 100644
--- a/typo3/contrib/flashmedia/src/flvplayer.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flashmedia/src/flvplayer.as
@@ -33,11 +33,11 @@ function fullScreen()
}
var stageSize:Object = new Object();
-stageSize.onResize = function()
+stageSize.onResize = function()
{
w = Stage.width;
h = Stage.height;
- setDims(w,h);
+ setDims(w,h);
}
Stage.addListener(stageSize);
@@ -143,7 +143,7 @@ ns.onMetaData = function(obj) {
};
// retrieve status messages from netstream
-ns.onStatus = function(object) {
+ns.onStatus = function(object) {
if(object.code == "NetStream.Play.Stop") {
// rewind and pause on when movie is finished
ns.seek(0);
@@ -162,7 +162,7 @@ ns.onStatus = function(object) {
showClick(true);
}
if (info.code == "NetStream.Buffer.Full") {
- if(makePre) {
+ if(makePre) {
ns.seek(previewSeek);
makePre = false;
}
@@ -293,7 +293,7 @@ progressBar.loa.onPress = function() {
};
// stop playhead scrubbing
-progressBar.loa.onRelease = progressBar.loa.onReleaseOutside = function () {
+progressBar.loa.onRelease = progressBar.loa.onReleaseOutside = function () {
delete this.onEnterFrame;
pauseBut._visible == false ? videoDisplay.pause() : null;
};
@@ -359,10 +359,10 @@ function setDims(w,h) {
playText1._y = h/2-20;
playText2._x = playText1._x + 1;
playText2._y = playText1._y + 1;
-
- // resize the controlbar items ..
+
+ // resize the controlbar items ..
if(_root.fs == "true") {
- colorBar._y = playBut._y = pauseBut._y = progressBar._y = FSBut._y = volumeBar._y = h-30;
+ colorBar._y = playBut._y = pauseBut._y = progressBar._y = FSBut._y = volumeBar._y = h-30;
playBut._x = pauseBut._x = colorBar._x = w/2-150;
colorBar._width = 300;
colorBar._alpha = 25;
@@ -376,7 +376,7 @@ function setDims(w,h) {
progressBar._width = w-56;
colorBar._width = w;
volumeBar._x = w-38;
- if(_root.allowFullScreen == "true") {
+ if(_root.allowFullScreen == "true") {
FSBut._visible = true;
progressBar._width -=17;
FSBut._x = w-55;
@@ -411,7 +411,7 @@ if (autoStart == true) {
ns.play(file);
ns.seek(previewSeek);
} else {
- if(_root.image) {
+ if(_root.image) {
imageStr = _root.image;
} else {
imageStr = file.substring(0,file.length-3)+"jpg";
diff --git a/typo3/contrib/flashmedia/src/flvplayer.fla b/typo3/sysext/mediace/Resources/Contrib/flashmedia/src/flvplayer.fla
similarity index 100%
rename from typo3/contrib/flashmedia/src/flvplayer.fla
rename to typo3/sysext/mediace/Resources/Contrib/flashmedia/src/flvplayer.fla
diff --git a/typo3/contrib/flashmedia/swfobject/expressInstall.swf b/typo3/sysext/mediace/Resources/Contrib/flashmedia/swfobject/expressInstall.swf
similarity index 100%
rename from typo3/contrib/flashmedia/swfobject/expressInstall.swf
rename to typo3/sysext/mediace/Resources/Contrib/flashmedia/swfobject/expressInstall.swf
diff --git a/typo3/contrib/flashmedia/swfobject/swfobject.js b/typo3/sysext/mediace/Resources/Contrib/flashmedia/swfobject/swfobject.js
similarity index 99%
rename from typo3/contrib/flashmedia/swfobject/swfobject.js
rename to typo3/sysext/mediace/Resources/Contrib/flashmedia/swfobject/swfobject.js
index 8eafe9dd83f9..acc7da4fe007 100644
--- a/typo3/contrib/flashmedia/swfobject/swfobject.js
+++ b/typo3/sysext/mediace/Resources/Contrib/flashmedia/swfobject/swfobject.js
@@ -1,4 +1,4 @@
-/* SWFObject v2.2 <http://code.google.com/p/swfobject/>
- is released under the MIT License <http://www.opensource.org/licenses/mit-license.php>
+/* SWFObject v2.2 <http://code.google.com/p/swfobject/>
+ is released under the MIT License <http://www.opensource.org/licenses/mit-license.php>
*/
var swfobject=function(){var D="undefined",r="object",S="Shockwave Flash",W="ShockwaveFlash.ShockwaveFlash",q="application/x-shockwave-flash",R="SWFObjectExprInst",x="onreadystatechange",O=window,j=document,t=navigator,T=false,U=[h],o=[],N=[],I=[],l,Q,E,B,J=false,a=false,n,G,m=true,M=function(){var aa=typeof j.getElementById!=D&&typeof j.getElementsByTagName!=D&&typeof j.createElement!=D,ah=t.userAgent.toLowerCase(),Y=t.platform.toLowerCase(),ae=Y?/win/.test(Y):/win/.test(ah),ac=Y?/mac/.test(Y):/mac/.test(ah),af=/webkit/.test(ah)?parseFloat(ah.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,X=!+"\v1",ag=[0,0,0],ab=null;if(typeof t.plugins!=D&&typeof t.plugins[S]==r){ab=t.plugins[S].description;if(ab&&!(typeof t.mimeTypes!=D&&t.mimeTypes[q]&&!t.mimeTypes[q].enabledPlugin)){T=true;X=false;ab=ab.replace(/^.*\s+(\S+\s+\S+$)/,"$1");ag[0]=parseInt(ab.replace(/^(.*)\..*$/,"$1"),10);ag[1]=parseInt(ab.replace(/^.*\.(.*)\s.*$/,"$1"),10);ag[2]=/[a-zA-Z]/.test(ab)?parseInt(ab.replace(/^.*[a-zA-Z]+(.*)$/,"$1"),10):0}}else{if(typeof O.ActiveXObject!=D){try{var ad=new ActiveXObject(W);if(ad){ab=ad.GetVariable("$version");if(ab){X=true;ab=ab.split(" ")[1].split(",");ag=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)]}}}catch(Z){}}}return{w3:aa,pv:ag,wk:af,ie:X,win:ae,mac:ac}}(),k=function(){if(!M.w3){return}if((typeof j.readyState!=D&&j.readyState=="complete")||(typeof j.readyState==D&&(j.getElementsByTagName("body")[0]||j.body))){f()}if(!J){if(typeof j.addEventListener!=D){j.addEventListener("DOMContentLoaded",f,false)}if(M.ie&&M.win){j.attachEvent(x,function(){if(j.readyState=="complete"){j.detachEvent(x,arguments.callee);f()}});if(O==top){(function(){if(J){return}try{j.documentElement.doScroll("left")}catch(X){setTimeout(arguments.callee,0);return}f()})()}}if(M.wk){(function(){if(J){return}if(!/loaded|complete/.test(j.readyState)){setTimeout(arguments.callee,0);return}f()})()}s(f)}}();function f(){if(J){return}try{var Z=j.getElementsByTagName("body")[0].appendChild(C("span"));Z.parentNode.removeChild(Z)}catch(aa){return}J=true;var X=U.length;for(var Y=0;Y<X;Y++){U[Y]()}}function K(X){if(J){X()}else{U[U.length]=X}}function s(Y){if(typeof O.addEventListener!=D){O.addEventListener("load",Y,false)}else{if(typeof j.addEventListener!=D){j.addEventListener("load",Y,false)}else{if(typeof O.attachEvent!=D){i(O,"onload",Y)}else{if(typeof O.onload=="function"){var X=O.onload;O.onload=function(){X();Y()}}else{O.onload=Y}}}}}function h(){if(T){V()}else{H()}}function V(){var X=j.getElementsByTagName("body")[0];var aa=C(r);aa.setAttribute("type",q);var Z=X.appendChild(aa);if(Z){var Y=0;(function(){if(typeof Z.GetVariable!=D){var ab=Z.GetVariable("$version");if(ab){ab=ab.split(" ")[1].split(",");M.pv=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)]}}else{if(Y<10){Y++;setTimeout(arguments.callee,10);return}}X.removeChild(aa);Z=null;H()})()}else{H()}}function H(){var ag=o.length;if(ag>0){for(var af=0;af<ag;af++){var Y=o[af].id;var ab=o[af].callbackFn;var aa={success:false,id:Y};if(M.pv[0]>0){var ae=c(Y);if(ae){if(F(o[af].swfVersion)&&!(M.wk&&M.wk<312)){w(Y,true);if(ab){aa.success=true;aa.ref=z(Y);ab(aa)}}else{if(o[af].expressInstall&&A()){var ai={};ai.data=o[af].expressInstall;ai.width=ae.getAttribute("width")||"0";ai.height=ae.getAttribute("height")||"0";if(ae.getAttribute("class")){ai.styleclass=ae.getAttribute("class")}if(ae.getAttribute("align")){ai.align=ae.getAttribute("align")}var ah={};var X=ae.getElementsByTagName("param");var ac=X.length;for(var ad=0;ad<ac;ad++){if(X[ad].getAttribute("name").toLowerCase()!="movie"){ah[X[ad].getAttribute("name")]=X[ad].getAttribute("value")}}P(ai,ah,Y,ab)}else{p(ae);if(ab){ab(aa)}}}}}else{w(Y,true);if(ab){var Z=z(Y);if(Z&&typeof Z.SetVariable!=D){aa.success=true;aa.ref=Z}ab(aa)}}}}}function z(aa){var X=null;var Y=c(aa);if(Y&&Y.nodeName=="OBJECT"){if(typeof Y.SetVariable!=D){X=Y}else{var Z=Y.getElementsByTagName(r)[0];if(Z){X=Z}}}return X}function A(){return !a&&F("6.0.65")&&(M.win||M.mac)&&!(M.wk&&M.wk<312)}function P(aa,ab,X,Z){a=true;E=Z||null;B={success:false,id:X};var ae=c(X);if(ae){if(ae.nodeName=="OBJECT"){l=g(ae);Q=null}else{l=ae;Q=X}aa.id=R;if(typeof aa.width==D||(!/%$/.test(aa.width)&&parseInt(aa.width,10)<310)){aa.width="310"}if(typeof aa.height==D||(!/%$/.test(aa.height)&&parseInt(aa.height,10)<137)){aa.height="137"}j.title=j.title.slice(0,47)+" - Flash Player Installation";var ad=M.ie&&M.win?"ActiveX":"PlugIn",ac="MMredirectURL="+O.location.toString().replace(/&/g,"%26")+"&MMplayerType="+ad+"&MMdoctitle="+j.title;if(typeof ab.flashvars!=D){ab.flashvars+="&"+ac}else{ab.flashvars=ac}if(M.ie&&M.win&&ae.readyState!=4){var Y=C("div");X+="SWFObjectNew";Y.setAttribute("id",X);ae.parentNode.insertBefore(Y,ae);ae.style.display="none";(function(){if(ae.readyState==4){ae.parentNode.removeChild(ae)}else{setTimeout(arguments.callee,10)}})()}u(aa,ab,X)}}function p(Y){if(M.ie&&M.win&&Y.readyState!=4){var X=C("div");Y.parentNode.insertBefore(X,Y);X.parentNode.replaceChild(g(Y),X);Y.style.display="none";(function(){if(Y.readyState==4){Y.parentNode.removeChild(Y)}else{setTimeout(arguments.callee,10)}})()}else{Y.parentNode.replaceChild(g(Y),Y)}}function g(ab){var aa=C("div");if(M.win&&M.ie){aa.innerHTML=ab.innerHTML}else{var Y=ab.getElementsByTagName(r)[0];if(Y){var ad=Y.childNodes;if(ad){var X=ad.length;for(var Z=0;Z<X;Z++){if(!(ad[Z].nodeType==1&&ad[Z].nodeName=="PARAM")&&!(ad[Z].nodeType==8)){aa.appendChild(ad[Z].cloneNode(true))}}}}}return aa}function u(ai,ag,Y){var X,aa=c(Y);if(M.wk&&M.wk<312){return X}if(aa){if(typeof ai.id==D){ai.id=Y}if(M.ie&&M.win){var ah="";for(var ae in ai){if(ai[ae]!=Object.prototype[ae]){if(ae.toLowerCase()=="data"){ag.movie=ai[ae]}else{if(ae.toLowerCase()=="styleclass"){ah+=' class="'+ai[ae]+'"'}else{if(ae.toLowerCase()!="classid"){ah+=" "+ae+'="'+ai[ae]+'"'}}}}}var af="";for(var ad in ag){if(ag[ad]!=Object.prototype[ad]){af+='<param name="'+ad+'" value="'+ag[ad]+'" />'}}aa.outerHTML='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"'+ah+">"+af+"</object>";N[N.length]=ai.id;X=c(ai.id)}else{var Z=C(r);Z.setAttribute("type",q);for(var ac in ai){if(ai[ac]!=Object.prototype[ac]){if(ac.toLowerCase()=="styleclass"){Z.setAttribute("class",ai[ac])}else{if(ac.toLowerCase()!="classid"){Z.setAttribute(ac,ai[ac])}}}}for(var ab in ag){if(ag[ab]!=Object.prototype[ab]&&ab.toLowerCase()!="movie"){e(Z,ab,ag[ab])}}aa.parentNode.replaceChild(Z,aa);X=Z}}return X}function e(Z,X,Y){var aa=C("param");aa.setAttribute("name",X);aa.setAttribute("value",Y);Z.appendChild(aa)}function y(Y){var X=c(Y);if(X&&X.nodeName=="OBJECT"){if(M.ie&&M.win){X.style.display="none";(function(){if(X.readyState==4){b(Y)}else{setTimeout(arguments.callee,10)}})()}else{X.parentNode.removeChild(X)}}}function b(Z){var Y=c(Z);if(Y){for(var X in Y){if(typeof Y[X]=="function"){Y[X]=null}}Y.parentNode.removeChild(Y)}}function c(Z){var X=null;try{X=j.getElementById(Z)}catch(Y){}return X}function C(X){return j.createElement(X)}function i(Z,X,Y){Z.attachEvent(X,Y);I[I.length]=[Z,X,Y]}function F(Z){var Y=M.pv,X=Z.split(".");X[0]=parseInt(X[0],10);X[1]=parseInt(X[1],10)||0;X[2]=parseInt(X[2],10)||0;return(Y[0]>X[0]||(Y[0]==X[0]&&Y[1]>X[1])||(Y[0]==X[0]&&Y[1]==X[1]&&Y[2]>=X[2]))?true:false}function v(ac,Y,ad,ab){if(M.ie&&M.mac){return}var aa=j.getElementsByTagName("head")[0];if(!aa){return}var X=(ad&&typeof ad=="string")?ad:"screen";if(ab){n=null;G=null}if(!n||G!=X){var Z=C("style");Z.setAttribute("type","text/css");Z.setAttribute("media",X);n=aa.appendChild(Z);if(M.ie&&M.win&&typeof j.styleSheets!=D&&j.styleSheets.length>0){n=j.styleSheets[j.styleSheets.length-1]}G=X}if(M.ie&&M.win){if(n&&typeof n.addRule==r){n.addRule(ac,Y)}}else{if(n&&typeof j.createTextNode!=D){n.appendChild(j.createTextNode(ac+" {"+Y+"}"))}}}function w(Z,X){if(!m){return}var Y=X?"visible":"hidden";if(J&&c(Z)){c(Z).style.visibility=Y}else{v("#"+Z,"visibility:"+Y)}}function L(Y){var Z=/[\\\"<>\.;]/;var X=Z.exec(Y)!=null;return X&&typeof encodeURIComponent!=D?encodeURIComponent(Y):Y}var d=function(){if(M.ie&&M.win){window.attachEvent("onunload",function(){var ac=I.length;for(var ab=0;ab<ac;ab++){I[ab][0].detachEvent(I[ab][1],I[ab][2])}var Z=N.length;for(var aa=0;aa<Z;aa++){y(N[aa])}for(var Y in M){M[Y]=null}M=null;for(var X in swfobject){swfobject[X]=null}swfobject=null})}}();return{registerObject:function(ab,X,aa,Z){if(M.w3&&ab&&X){var Y={};Y.id=ab;Y.swfVersion=X;Y.expressInstall=aa;Y.callbackFn=Z;o[o.length]=Y;w(ab,false)}else{if(Z){Z({success:false,id:ab})}}},getObjectById:function(X){if(M.w3){return z(X)}},embedSWF:function(ab,ah,ae,ag,Y,aa,Z,ad,af,ac){var X={success:false,id:ah};if(M.w3&&!(M.wk&&M.wk<312)&&ab&&ah&&ae&&ag&&Y){w(ah,false);K(function(){ae+="";ag+="";var aj={};if(af&&typeof af===r){for(var al in af){aj[al]=af[al]}}aj.data=ab;aj.width=ae;aj.height=ag;var am={};if(ad&&typeof ad===r){for(var ak in ad){am[ak]=ad[ak]}}if(Z&&typeof Z===r){for(var ai in Z){if(typeof am.flashvars!=D){am.flashvars+="&"+ai+"="+Z[ai]}else{am.flashvars=ai+"="+Z[ai]}}}if(F(Y)){var an=u(aj,am,ah);if(aj.id==ah){w(ah,true)}X.success=true;X.ref=an}else{if(aa&&A()){aj.data=aa;P(aj,am,ah,ac);return}else{w(ah,true)}}if(ac){ac(X)}})}else{if(ac){ac(X)}}},switchOffAutoHideShow:function(){m=false},ua:M,getFlashPlayerVersion:function(){return{major:M.pv[0],minor:M.pv[1],release:M.pv[2]}},hasFlashPlayerVersion:F,createSWF:function(Z,Y,X){if(M.w3){return u(Z,Y,X)}else{return undefined}},showExpressInstall:function(Z,aa,X,Y){if(M.w3&&A()){P(Z,aa,X,Y)}},removeSWF:function(X){if(M.w3){y(X)}},createCSS:function(aa,Z,Y,X){if(M.w3){v(aa,Z,Y,X)}},addDomLoadEvent:K,addLoadEvent:s,getQueryParamValue:function(aa){var Z=j.location.search||j.location.hash;if(Z){if(/\?/.test(Z)){Z=Z.split("?")[1]}if(aa==null){return L(Z)}var Y=Z.split("&");for(var X=0;X<Y.length;X++){if(Y[X].substring(0,Y[X].indexOf("="))==aa){return L(Y[X].substring((Y[X].indexOf("=")+1)))}}}return""},expressInstallCallback:function(){if(a){var X=c(R);if(X&&l){X.parentNode.replaceChild(l,X);if(Q){w(Q,true);if(M.ie&&M.win){l.style.display="block"}}if(E){E(B)}}a=false}}}}();
\ No newline at end of file
diff --git a/typo3/contrib/flowplayer/LICENSE-exception.txt b/typo3/sysext/mediace/Resources/Contrib/flowplayer/LICENSE-exception.txt
similarity index 95%
rename from typo3/contrib/flowplayer/LICENSE-exception.txt
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/LICENSE-exception.txt
index 2b4b6332975f..f1668632b299 100644
--- a/typo3/contrib/flowplayer/LICENSE-exception.txt
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/LICENSE-exception.txt
@@ -11,12 +11,12 @@ In-Reply-To: <4EB12708.8030406@typo3.org>
Hi Oliver,
-You can use our Free version that is under our GPL 2 based license. You
-have my blessing for this and you can archive this email for any future
+You can use our Free version that is under our GPL 2 based license. You
+have my blessing for this and you can archive this email for any future
needs.
-Let me know if you need something more from us. I think it would make
-sense for us to include this kind of exception in our website, just like
+Let me know if you need something more from us. I think it would make
+sense for us to include this kind of exception in our website, just like
Sencha does.
Regards,
diff --git a/typo3/contrib/flowplayer/LICENSE.txt b/typo3/sysext/mediace/Resources/Contrib/flowplayer/LICENSE.txt
similarity index 99%
rename from typo3/contrib/flowplayer/LICENSE.txt
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/LICENSE.txt
index 2a00962f2293..94ca95aec9e7 100644
--- a/typo3/contrib/flowplayer/LICENSE.txt
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/LICENSE.txt
@@ -35,7 +35,7 @@ the full screen (and non-fullscreen equivalent, if activated) notice
should read: "Based on Flowplayer source code"; in the context menu
(right-click menu), the link to "About Flowplayer free version #.#.#"
can remain. The copyright notice can remain, but must be supplemented with
-an additional notice, stating that the licensee modified the Flowplayer.
+an additional notice, stating that the licensee modified the Flowplayer.
A suitable notice might read "Flowplayer Source code modified by ModOrg 2009";
for the canvas, the notice should read "Based on Flowplayer source code".
In addition, licensees that modify the Program must give the modified
diff --git a/typo3/contrib/flowplayer/LICENSE_COMMERCIAL.txt b/typo3/sysext/mediace/Resources/Contrib/flowplayer/LICENSE_COMMERCIAL.txt
similarity index 99%
rename from typo3/contrib/flowplayer/LICENSE_COMMERCIAL.txt
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/LICENSE_COMMERCIAL.txt
index e3b5a2a79f29..dfa1b4449488 100644
--- a/typo3/contrib/flowplayer/LICENSE_COMMERCIAL.txt
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/LICENSE_COMMERCIAL.txt
@@ -163,4 +163,3 @@ Waiver of Breach
================
No term or provision of this License shall be deemed waived and no breach excused, unless such
waiver or consent shall be in writing and signed by Licensor.
-
diff --git a/typo3/contrib/flowplayer/LICENSE_MULTIDOMAIN.txt b/typo3/sysext/mediace/Resources/Contrib/flowplayer/LICENSE_MULTIDOMAIN.txt
similarity index 100%
rename from typo3/contrib/flowplayer/LICENSE_MULTIDOMAIN.txt
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/LICENSE_MULTIDOMAIN.txt
diff --git a/typo3/contrib/flowplayer/LICENSE_UNLIMITED.txt b/typo3/sysext/mediace/Resources/Contrib/flowplayer/LICENSE_UNLIMITED.txt
similarity index 100%
rename from typo3/contrib/flowplayer/LICENSE_UNLIMITED.txt
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/LICENSE_UNLIMITED.txt
diff --git a/typo3/contrib/flowplayer/README.txt b/typo3/sysext/mediace/Resources/Contrib/flowplayer/README.txt
similarity index 99%
rename from typo3/contrib/flowplayer/README.txt
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/README.txt
index 1375e00f505d..3c0643dab406 100644
--- a/typo3/contrib/flowplayer/README.txt
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/README.txt
@@ -193,8 +193,8 @@ when it automatically loads the controls plugin.
-----
- canvas, controlbar and the content plugin backgound color and border color can be now given with rgb() and rgba() CSS style syntax
- Added onMouseOver() and onMouseOut() listener registration methods to the Flowplayer API
-- enhancements to RSS playlist. Converted parsing to E4X, yahoo media and flowplayer namespace support.
-- added feature to obtain bitrate and dimension information to a new clip custom property "bitrates" for future support for bitrate choosing.
+- enhancements to RSS playlist. Converted parsing to E4X, yahoo media and flowplayer namespace support.
+- added feature to obtain bitrate and dimension information to a new clip custom property "bitrates" for future support for bitrate choosing.
- added getter for playerSwfName config
- if clip.url has the string "mp3:" in it, the clip.type will report 'audio'
- added setKeyboardShortcutsEnabled(), addKeyListener(), removeKeyListener() to FlowplayerBase
@@ -307,7 +307,7 @@ Bug fixes:
because the server does not send metadata if replaying the same stream.
- the scrubber is disabled if the clip is not seekable in the first frame: http://flowplayer.org/forum/8/16526
By default if the clip has one of following extensions (the typical flash video extensions) it is seekable
- in the first frame: 'f4b', 'f4p', 'f4v', 'flv'. Added new clip property seekableOnBegin that can be used to override the default.
+ in the first frame: 'f4b', 'f4p', 'f4v', 'flv'. Added new clip property seekableOnBegin that can be used to override the default.
3.0.6
-----
@@ -327,7 +327,7 @@ Fixes:
// disable the play button and the buffering animation
play: null
// disable the buffering animation
- buffering: null
+ buffering: null
- Added possibility to seek when in the buffering state: http://flowplayer.org/forum/3/13896
- Added copyright notices and other GPL required entries to the user interface
@@ -367,7 +367,7 @@ Fixes:
- now displays a live feed even when the RTMP server does not send any metadata and the onStart method is not therefore dispatched
- added onMetaData clip event
- fixed 'orig' scaling: the player went to 'fit' scaling after coming back from fullscreen. This is now fixed and the original dimensions are preserved in non-fullscreen mode.
-- cuepoint times are now given in milliseconds, the firing precision is 100 ms. All cuepoint times are rounded to the nearest 100 ms value (for example 1120 rounds to 1100)
+- cuepoint times are now given in milliseconds, the firing precision is 100 ms. All cuepoint times are rounded to the nearest 100 ms value (for example 1120 rounds to 1100)
- backgroundGradient was drawn over the background image in the canvas and in the content and controlbar plugins. Now it's drawn below the image.
- added cuepointMultiplier property to clips. This can be used to multiply the time values read from cuepoint metadata embedded into video files.
- the player's framerate was increased to 24 FPS, makes all animations smoother
@@ -414,7 +414,7 @@ RC4
- Should not stop playback too early before the clip is really completed
- The START event is now delayed so that the metadata is available when the event is fired, METADATA event was removed,
new event BEGIN that is dispatched when the playback has been successfully started. Metadata is not normally
- available when BEGIN is fired.
+ available when BEGIN is fired.
RC3
---
diff --git a/typo3/contrib/flowplayer/build.properties b/typo3/sysext/mediace/Resources/Contrib/flowplayer/build.properties
similarity index 99%
rename from typo3/contrib/flowplayer/build.properties
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/build.properties
index 2ef5d3a5e190..42b64fa2e049 100644
--- a/typo3/contrib/flowplayer/build.properties
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/build.properties
@@ -2,7 +2,7 @@
# you need to adjust following to point to your Flex SDK
flexdir=/Users/Api/flex_sdk_4.5.0.19786
-# change following to point to .exe files when running on Windows
+# change following to point to .exe files when running on Windows
mxmlc_bin= ${flexbindir}/mxmlc
compc_bin= ${flexbindir}/compc
asdoc_bin= /Users/Api/flex_sdk_3/bin/asdoc
@@ -54,7 +54,7 @@ compiler.defines=
# following can usually be left as they are
flexbindir=${flexdir}/bin
flexlibsdir=${flexdir}/frameworks/libs
-flashplayer_bin=
+flashplayer_bin=
framerate=24
bgcolor=0xFFFFFF
width=500
diff --git a/typo3/contrib/flowplayer/build.xml b/typo3/sysext/mediace/Resources/Contrib/flowplayer/build.xml
similarity index 99%
rename from typo3/contrib/flowplayer/build.xml
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/build.xml
index a25281ae93ce..adf7d4e3173d 100644
--- a/typo3/contrib/flowplayer/build.xml
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/build.xml
@@ -38,7 +38,7 @@
<condition property="plugin-skin" value="${controls}" else="modern">
<isset property="controls"/>
</condition>
-
+
<condition property="has-slowmotion-buttons" value="true" else="false">
<equals arg1="${plugin-skin}" arg2="modern"/>
</condition>
@@ -221,7 +221,7 @@
<arg line="-debug=@{debug}"/>
<arg line="-frame 'player' org.flowplayer.view.Launcher"/>
-
+
<arg line="-file-specs '${src-as}/org/flowplayer/view/Preloader.as'"/>
<arg line="-output '${build-dir}/@{binary}'"/>
@@ -563,7 +563,7 @@
<target name="debug-js">
<get src="http://flowplayer.org/js/tools/tools.flashembed-1.0.4.js" dest="${dist-dir}/flowplayer-debug.js"/>
-
+
<concat destfile="${dist-dir}/flowplayer-debug.js" append="true">
<fileset dir="${src-js}/flowplayer.js" includes="flowplayer-src.js"/>
diff --git a/typo3/contrib/flowplayer/example/index.html.tmpl b/typo3/sysext/mediace/Resources/Contrib/flowplayer/example/index.html.tmpl
similarity index 78%
rename from typo3/contrib/flowplayer/example/index.html.tmpl
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/example/index.html.tmpl
index 8aaccf74962d..15e05a6c1eef 100644
--- a/typo3/contrib/flowplayer/example/index.html.tmpl
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/example/index.html.tmpl
@@ -1,61 +1,61 @@
<html><head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<!-- A minimal Flowplayer setup to get you started -->
-
- <!--
- include flowplayer JavaScript file that does
+
+ <!--
+ include flowplayer JavaScript file that does
Flash embedding and provides the Flowplayer API.
-->
<script type="text/javascript" src="../flowplayer-@FLOWPLAYER_JS_VERSION_INFO@.min.js"></script>
-
+
<!-- some minimal styling, can be removed -->
<link rel="stylesheet" type="text/css" href="style.css">
-
+
<!-- page title -->
<title>Minimal Flowplayer setup</title>
</head><body>
<div id="page">
-
+
<h1>Minimal Flowplayer setup</h1>
-
+
<p>View commented source code to get familiar with Flowplayer installation.</p>
-
+
<!-- this A tag is where your Flowplayer will be placed. it can be anywhere -->
- <a
+ <a
href="http://pseudo01.hddn.com/vod/demo.flowplayervod/flowplayer-700.flv"
- style="display:block;width:520px;height:330px"
- id="player">
- </a>
-
+ style="display:block;width:520px;height:330px"
+ id="player">
+ </a>
+
<!-- this will install flowplayer inside previous A- tag. -->
<script>
flowplayer("player", "@PLAYER_SWF@");
</script>
-
-
-
- <!--
- after this line is purely informational stuff.
- does not affect on Flowplayer functionality
+
+
+
+ <!--
+ after this line is purely informational stuff.
+ does not affect on Flowplayer functionality
-->
- <p>
- If you are running these examples <strong>locally</strong> and not on some webserver you must edit your
+ <p>
+ If you are running these examples <strong>locally</strong> and not on some webserver you must edit your
<a href="http://www.macromedia.com/support/documentation/en/flashplayer/help/settings_manager04.html">
- Flash security settings</a>.
+ Flash security settings</a>.
</p>
-
+
<p class="less">
Select "Edit locations" > "Add location" > "Browse for files" and select
flowplayer-x.x.x.swf you just downloaded.
</p>
-
-
+
+
<h2>Documentation</h2>
-
+
<p>
<a href="http://flowplayer.org/documentation/installation/index.html">Flowplayer installation</a>
</p>
@@ -65,10 +65,10 @@
</p>
<p>
- See this identical page on <a href="http://flowplayer.org/demos/example/index.htm">Flowplayer website</a>
+ See this identical page on <a href="http://flowplayer.org/demos/example/index.htm">Flowplayer website</a>
</p>
-
+
</div>
-
-
+
+
</body></html>
\ No newline at end of file
diff --git a/typo3/contrib/flowplayer/example/style.css b/typo3/sysext/mediace/Resources/Contrib/flowplayer/example/style.css
similarity index 87%
rename from typo3/contrib/flowplayer/example/style.css
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/example/style.css
index 98f090c3c76d..582a545b211a 100644
--- a/typo3/contrib/flowplayer/example/style.css
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/example/style.css
@@ -1,6 +1,6 @@
body {
- background-color:#fff;
+ background-color:#fff;
font-family:"Lucida Grande","bitstream vera sans","trebuchet ms",verdana,arial;
text-align:center;
}
@@ -19,7 +19,7 @@ body {
h1, h2 {
letter-spacing:-1px;
color:#2D5AC3;
- font-weight:normal;
+ font-weight:normal;
margin-bottom:-10px;
}
@@ -37,5 +37,5 @@ h2 {
}
a {
- color:#295c72;
+ color:#295c72;
}
diff --git a/typo3/contrib/flowplayer/express-install/express-install.css b/typo3/sysext/mediace/Resources/Contrib/flowplayer/express-install/express-install.css
similarity index 100%
rename from typo3/contrib/flowplayer/express-install/express-install.css
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/express-install/express-install.css
diff --git a/typo3/contrib/flowplayer/express-install/flashplayerlogo.jpg b/typo3/sysext/mediace/Resources/Contrib/flowplayer/express-install/flashplayerlogo.jpg
similarity index 100%
rename from typo3/contrib/flowplayer/express-install/flashplayerlogo.jpg
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/express-install/flashplayerlogo.jpg
diff --git a/typo3/contrib/flowplayer/expressinstall.swf b/typo3/sysext/mediace/Resources/Contrib/flowplayer/expressinstall.swf
similarity index 100%
rename from typo3/contrib/flowplayer/expressinstall.swf
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/expressinstall.swf
diff --git a/typo3/contrib/flowplayer/flowplayer-3.2.12.min.js b/typo3/sysext/mediace/Resources/Contrib/flowplayer/flowplayer-3.2.12.min.js
similarity index 100%
rename from typo3/contrib/flowplayer/flowplayer-3.2.12.min.js
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/flowplayer-3.2.12.min.js
diff --git a/typo3/contrib/flowplayer/flowplayer-3.2.16.swf b/typo3/sysext/mediace/Resources/Contrib/flowplayer/flowplayer-3.2.16.swf
similarity index 100%
rename from typo3/contrib/flowplayer/flowplayer-3.2.16.swf
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/flowplayer-3.2.16.swf
diff --git a/typo3/contrib/flowplayer/flowplayer.controls-3.2.15.swf b/typo3/sysext/mediace/Resources/Contrib/flowplayer/flowplayer.controls-3.2.15.swf
similarity index 100%
rename from typo3/contrib/flowplayer/flowplayer.controls-3.2.15.swf
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/flowplayer.controls-3.2.15.swf
diff --git a/typo3/contrib/flowplayer/lib/corelib/license.txt b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/license.txt
similarity index 98%
rename from typo3/contrib/flowplayer/lib/corelib/license.txt
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/license.txt
index d95fea60d9cd..603e74a16635 100644
--- a/typo3/contrib/flowplayer/lib/corelib/license.txt
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/license.txt
@@ -1,24 +1,24 @@
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
+
Adobe Systems Incorporated grants to you a perpetual, worldwide,
non-exclusive, no-charge, royalty-free, irrevocable copyright license,
to reproduce, prepare derivative works of, publicly display, publicly
perform, and distribute this source code and such derivative works in
source or object code form without any attribution requirements.
-
+
The name "Adobe Systems Incorporated" must not be used to endorse or
promote products derived from the source code without prior written
permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems
Incorporated from and against any loss, damage, claims or lawsuits,
including attorney's fees that arise or result from your use or
distribution of the source code.
-
+
THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT ANY
TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
diff --git a/typo3/contrib/flowplayer/lib/corelib/readme.txt b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/readme.txt
similarity index 100%
rename from typo3/contrib/flowplayer/lib/corelib/readme.txt
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/readme.txt
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/crypto/MD5.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/crypto/MD5.as
similarity index 95%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/crypto/MD5.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/crypto/MD5.as
index d1bba3fb9503..7a6e6c9a997b 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/crypto/MD5.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/crypto/MD5.as
@@ -1,256 +1,256 @@
-/*
-Adobe Systems Incorporated(r) Source Code License Agreement
-Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
-Please read this Source Code License Agreement carefully before using
-the source code.
-
-Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable copyright license, to reproduce,
-prepare derivative works of, publicly display, publicly perform, and
-distribute this source code and such derivative works in source or
-object code form without any attribution requirements.
-
-The name "Adobe Systems Incorporated" must not be used to endorse or promote products
-derived from the source code without prior written permission.
-
-You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
-against any loss, damage, claims or lawsuits, including attorney's
-fees that arise or result from your use or distribution of the source
-code.
-
-THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
-ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
-NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
-OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-package com.adobe.crypto {
-
- import com.adobe.utils.IntUtil;
-
- /**
- * The MD5 Message-Digest Algorithm
- *
- * Implementation based on algorithm description at
- * http://www.faqs.org/rfcs/rfc1321.html
- */
- public class MD5 {
-
- /**
- * Performs the MD5 hash algorithm on a string.
- *
- * @param s The string to hash
- * @return A string containing the hash value of s
- * @langversion ActionScript 3.0
- * @playerversion Flash 9.0
- * @tiptext
- */
- public static function hash( s:String ):String {
- // initialize the md buffers
- var a:int = 1732584193;
- var b:int = -271733879;
- var c:int = -1732584194;
- var d:int = 271733878;
-
- // variables to store previous values
- var aa:int;
- var bb:int;
- var cc:int;
- var dd:int;
-
- // create the blocks from the string and
- // save the length as a local var to reduce
- // lookup in the loop below
- var x:Array = createBlocks( s );
- var len:int = x.length;
-
- // loop over all of the blocks
- for ( var i:int = 0; i < len; i += 16) {
- // save previous values
- aa = a;
- bb = b;
- cc = c;
- dd = d;
-
- // Round 1
- a = ff( a, b, c, d, x[i+ 0], 7, -680876936 ); // 1
- d = ff( d, a, b, c, x[i+ 1], 12, -389564586 ); // 2
- c = ff( c, d, a, b, x[i+ 2], 17, 606105819 ); // 3
- b = ff( b, c, d, a, x[i+ 3], 22, -1044525330 ); // 4
- a = ff( a, b, c, d, x[i+ 4], 7, -176418897 ); // 5
- d = ff( d, a, b, c, x[i+ 5], 12, 1200080426 ); // 6
- c = ff( c, d, a, b, x[i+ 6], 17, -1473231341 ); // 7
- b = ff( b, c, d, a, x[i+ 7], 22, -45705983 ); // 8
- a = ff( a, b, c, d, x[i+ 8], 7, 1770035416 ); // 9
- d = ff( d, a, b, c, x[i+ 9], 12, -1958414417 ); // 10
- c = ff( c, d, a, b, x[i+10], 17, -42063 ); // 11
- b = ff( b, c, d, a, x[i+11], 22, -1990404162 ); // 12
- a = ff( a, b, c, d, x[i+12], 7, 1804603682 ); // 13
- d = ff( d, a, b, c, x[i+13], 12, -40341101 ); // 14
- c = ff( c, d, a, b, x[i+14], 17, -1502002290 ); // 15
- b = ff( b, c, d, a, x[i+15], 22, 1236535329 ); // 16
-
- // Round 2
- a = gg( a, b, c, d, x[i+ 1], 5, -165796510 ); // 17
- d = gg( d, a, b, c, x[i+ 6], 9, -1069501632 ); // 18
- c = gg( c, d, a, b, x[i+11], 14, 643717713 ); // 19
- b = gg( b, c, d, a, x[i+ 0], 20, -373897302 ); // 20
- a = gg( a, b, c, d, x[i+ 5], 5, -701558691 ); // 21
- d = gg( d, a, b, c, x[i+10], 9, 38016083 ); // 22
- c = gg( c, d, a, b, x[i+15], 14, -660478335 ); // 23
- b = gg( b, c, d, a, x[i+ 4], 20, -405537848 ); // 24
- a = gg( a, b, c, d, x[i+ 9], 5, 568446438 ); // 25
- d = gg( d, a, b, c, x[i+14], 9, -1019803690 ); // 26
- c = gg( c, d, a, b, x[i+ 3], 14, -187363961 ); // 27
- b = gg( b, c, d, a, x[i+ 8], 20, 1163531501 ); // 28
- a = gg( a, b, c, d, x[i+13], 5, -1444681467 ); // 29
- d = gg( d, a, b, c, x[i+ 2], 9, -51403784 ); // 30
- c = gg( c, d, a, b, x[i+ 7], 14, 1735328473 ); // 31
- b = gg( b, c, d, a, x[i+12], 20, -1926607734 ); // 32
-
- // Round 3
- a = hh( a, b, c, d, x[i+ 5], 4, -378558 ); // 33
- d = hh( d, a, b, c, x[i+ 8], 11, -2022574463 ); // 34
- c = hh( c, d, a, b, x[i+11], 16, 1839030562 ); // 35
- b = hh( b, c, d, a, x[i+14], 23, -35309556 ); // 36
- a = hh( a, b, c, d, x[i+ 1], 4, -1530992060 ); // 37
- d = hh( d, a, b, c, x[i+ 4], 11, 1272893353 ); // 38
- c = hh( c, d, a, b, x[i+ 7], 16, -155497632 ); // 39
- b = hh( b, c, d, a, x[i+10], 23, -1094730640 ); // 40
- a = hh( a, b, c, d, x[i+13], 4, 681279174 ); // 41
- d = hh( d, a, b, c, x[i+ 0], 11, -358537222 ); // 42
- c = hh( c, d, a, b, x[i+ 3], 16, -722521979 ); // 43
- b = hh( b, c, d, a, x[i+ 6], 23, 76029189 ); // 44
- a = hh( a, b, c, d, x[i+ 9], 4, -640364487 ); // 45
- d = hh( d, a, b, c, x[i+12], 11, -421815835 ); // 46
- c = hh( c, d, a, b, x[i+15], 16, 530742520 ); // 47
- b = hh( b, c, d, a, x[i+ 2], 23, -995338651 ); // 48
-
- // Round 4
- a = ii( a, b, c, d, x[i+ 0], 6, -198630844 ); // 49
- d = ii( d, a, b, c, x[i+ 7], 10, 1126891415 ); // 50
- c = ii( c, d, a, b, x[i+14], 15, -1416354905 ); // 51
- b = ii( b, c, d, a, x[i+ 5], 21, -57434055 ); // 52
- a = ii( a, b, c, d, x[i+12], 6, 1700485571 ); // 53
- d = ii( d, a, b, c, x[i+ 3], 10, -1894986606 ); // 54
- c = ii( c, d, a, b, x[i+10], 15, -1051523 ); // 55
- b = ii( b, c, d, a, x[i+ 1], 21, -2054922799 ); // 56
- a = ii( a, b, c, d, x[i+ 8], 6, 1873313359 ); // 57
- d = ii( d, a, b, c, x[i+15], 10, -30611744 ); // 58
- c = ii( c, d, a, b, x[i+ 6], 15, -1560198380 ); // 59
- b = ii( b, c, d, a, x[i+13], 21, 1309151649 ); // 60
- a = ii( a, b, c, d, x[i+ 4], 6, -145523070 ); // 61
- d = ii( d, a, b, c, x[i+11], 10, -1120210379 ); // 62
- c = ii( c, d, a, b, x[i+ 2], 15, 718787259 ); // 63
- b = ii( b, c, d, a, x[i+ 9], 21, -343485551 ); // 64
-
- a += aa;
- b += bb;
- c += cc;
- d += dd;
- }
-
- // Finish up by concatening the buffers with their hex output
- return IntUtil.toHex( a ) + IntUtil.toHex( b ) + IntUtil.toHex( c ) + IntUtil.toHex( d );
- }
-
- /**
- * Auxiliary function f as defined in RFC
- */
- private static function f( x:int, y:int, z:int ):int {
- return ( x & y ) | ( (~x) & z );
- }
-
- /**
- * Auxiliary function g as defined in RFC
- */
- private static function g( x:int, y:int, z:int ):int {
- return ( x & z ) | ( y & (~z) );
- }
-
- /**
- * Auxiliary function h as defined in RFC
- */
- private static function h( x:int, y:int, z:int ):int {
- return x ^ y ^ z;
- }
-
- /**
- * Auxiliary function i as defined in RFC
- */
- private static function i( x:int, y:int, z:int ):int {
- return y ^ ( x | (~z) );
- }
-
- /**
- * A generic transformation function. The logic of ff, gg, hh, and
- * ii are all the same, minus the function used, so pull that logic
- * out and simplify the method bodies for the transoformation functions.
- */
- private static function transform( func:Function, a:int, b:int, c:int, d:int, x:int, s:int, t:int):int {
- var tmp:int = a + int( func( b, c, d ) ) + x + t;
- return IntUtil.rol( tmp, s ) + b;
- }
-
- /**
- * ff transformation function
- */
- private static function ff ( a:int, b:int, c:int, d:int, x:int, s:int, t:int ):int {
- return transform( f, a, b, c, d, x, s, t );
- }
-
- /**
- * gg transformation function
- */
- private static function gg ( a:int, b:int, c:int, d:int, x:int, s:int, t:int ):int {
- return transform( g, a, b, c, d, x, s, t );
- }
-
- /**
- * hh transformation function
- */
- private static function hh ( a:int, b:int, c:int, d:int, x:int, s:int, t:int ):int {
- return transform( h, a, b, c, d, x, s, t );
- }
-
- /**
- * ii transformation function
- */
- private static function ii ( a:int, b:int, c:int, d:int, x:int, s:int, t:int ):int {
- return transform( i, a, b, c, d, x, s, t );
- }
-
- /**
- * Converts a string to a sequence of 16-word blocks
- * that we'll do the processing on. Appends padding
- * and length in the process.
- *
- * @param s The string to split into blocks
- * @return An array containing the blocks that s was
- * split into.
- */
- private static function createBlocks( s:String ):Array {
- var blocks:Array = new Array();
- var len:int = s.length * 8;
- var mask:int = 0xFF; // ignore hi byte of characters > 0xFF
- for( var i:int = 0; i < len; i += 8 ) {
- blocks[ i >> 5 ] |= ( s.charCodeAt( i / 8 ) & mask ) << ( i % 32 );
- }
-
- // append padding and length
- blocks[ len >> 5 ] |= 0x80 << ( len % 32 );
- blocks[ ( ( ( len + 64 ) >>> 9 ) << 4 ) + 14 ] = len;
- return blocks;
- }
-
- }
+/*
+Adobe Systems Incorporated(r) Source Code License Agreement
+Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
+
+Please read this Source Code License Agreement carefully before using
+the source code.
+
+Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
+no-charge, royalty-free, irrevocable copyright license, to reproduce,
+prepare derivative works of, publicly display, publicly perform, and
+distribute this source code and such derivative works in source or
+object code form without any attribution requirements.
+
+The name "Adobe Systems Incorporated" must not be used to endorse or promote products
+derived from the source code without prior written permission.
+
+You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
+against any loss, damage, claims or lawsuits, including attorney's
+fees that arise or result from your use or distribution of the source
+code.
+
+THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
+ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
+NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
+OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.crypto {
+
+ import com.adobe.utils.IntUtil;
+
+ /**
+ * The MD5 Message-Digest Algorithm
+ *
+ * Implementation based on algorithm description at
+ * http://www.faqs.org/rfcs/rfc1321.html
+ */
+ public class MD5 {
+
+ /**
+ * Performs the MD5 hash algorithm on a string.
+ *
+ * @param s The string to hash
+ * @return A string containing the hash value of s
+ * @langversion ActionScript 3.0
+ * @playerversion Flash 9.0
+ * @tiptext
+ */
+ public static function hash( s:String ):String {
+ // initialize the md buffers
+ var a:int = 1732584193;
+ var b:int = -271733879;
+ var c:int = -1732584194;
+ var d:int = 271733878;
+
+ // variables to store previous values
+ var aa:int;
+ var bb:int;
+ var cc:int;
+ var dd:int;
+
+ // create the blocks from the string and
+ // save the length as a local var to reduce
+ // lookup in the loop below
+ var x:Array = createBlocks( s );
+ var len:int = x.length;
+
+ // loop over all of the blocks
+ for ( var i:int = 0; i < len; i += 16) {
+ // save previous values
+ aa = a;
+ bb = b;
+ cc = c;
+ dd = d;
+
+ // Round 1
+ a = ff( a, b, c, d, x[i+ 0], 7, -680876936 ); // 1
+ d = ff( d, a, b, c, x[i+ 1], 12, -389564586 ); // 2
+ c = ff( c, d, a, b, x[i+ 2], 17, 606105819 ); // 3
+ b = ff( b, c, d, a, x[i+ 3], 22, -1044525330 ); // 4
+ a = ff( a, b, c, d, x[i+ 4], 7, -176418897 ); // 5
+ d = ff( d, a, b, c, x[i+ 5], 12, 1200080426 ); // 6
+ c = ff( c, d, a, b, x[i+ 6], 17, -1473231341 ); // 7
+ b = ff( b, c, d, a, x[i+ 7], 22, -45705983 ); // 8
+ a = ff( a, b, c, d, x[i+ 8], 7, 1770035416 ); // 9
+ d = ff( d, a, b, c, x[i+ 9], 12, -1958414417 ); // 10
+ c = ff( c, d, a, b, x[i+10], 17, -42063 ); // 11
+ b = ff( b, c, d, a, x[i+11], 22, -1990404162 ); // 12
+ a = ff( a, b, c, d, x[i+12], 7, 1804603682 ); // 13
+ d = ff( d, a, b, c, x[i+13], 12, -40341101 ); // 14
+ c = ff( c, d, a, b, x[i+14], 17, -1502002290 ); // 15
+ b = ff( b, c, d, a, x[i+15], 22, 1236535329 ); // 16
+
+ // Round 2
+ a = gg( a, b, c, d, x[i+ 1], 5, -165796510 ); // 17
+ d = gg( d, a, b, c, x[i+ 6], 9, -1069501632 ); // 18
+ c = gg( c, d, a, b, x[i+11], 14, 643717713 ); // 19
+ b = gg( b, c, d, a, x[i+ 0], 20, -373897302 ); // 20
+ a = gg( a, b, c, d, x[i+ 5], 5, -701558691 ); // 21
+ d = gg( d, a, b, c, x[i+10], 9, 38016083 ); // 22
+ c = gg( c, d, a, b, x[i+15], 14, -660478335 ); // 23
+ b = gg( b, c, d, a, x[i+ 4], 20, -405537848 ); // 24
+ a = gg( a, b, c, d, x[i+ 9], 5, 568446438 ); // 25
+ d = gg( d, a, b, c, x[i+14], 9, -1019803690 ); // 26
+ c = gg( c, d, a, b, x[i+ 3], 14, -187363961 ); // 27
+ b = gg( b, c, d, a, x[i+ 8], 20, 1163531501 ); // 28
+ a = gg( a, b, c, d, x[i+13], 5, -1444681467 ); // 29
+ d = gg( d, a, b, c, x[i+ 2], 9, -51403784 ); // 30
+ c = gg( c, d, a, b, x[i+ 7], 14, 1735328473 ); // 31
+ b = gg( b, c, d, a, x[i+12], 20, -1926607734 ); // 32
+
+ // Round 3
+ a = hh( a, b, c, d, x[i+ 5], 4, -378558 ); // 33
+ d = hh( d, a, b, c, x[i+ 8], 11, -2022574463 ); // 34
+ c = hh( c, d, a, b, x[i+11], 16, 1839030562 ); // 35
+ b = hh( b, c, d, a, x[i+14], 23, -35309556 ); // 36
+ a = hh( a, b, c, d, x[i+ 1], 4, -1530992060 ); // 37
+ d = hh( d, a, b, c, x[i+ 4], 11, 1272893353 ); // 38
+ c = hh( c, d, a, b, x[i+ 7], 16, -155497632 ); // 39
+ b = hh( b, c, d, a, x[i+10], 23, -1094730640 ); // 40
+ a = hh( a, b, c, d, x[i+13], 4, 681279174 ); // 41
+ d = hh( d, a, b, c, x[i+ 0], 11, -358537222 ); // 42
+ c = hh( c, d, a, b, x[i+ 3], 16, -722521979 ); // 43
+ b = hh( b, c, d, a, x[i+ 6], 23, 76029189 ); // 44
+ a = hh( a, b, c, d, x[i+ 9], 4, -640364487 ); // 45
+ d = hh( d, a, b, c, x[i+12], 11, -421815835 ); // 46
+ c = hh( c, d, a, b, x[i+15], 16, 530742520 ); // 47
+ b = hh( b, c, d, a, x[i+ 2], 23, -995338651 ); // 48
+
+ // Round 4
+ a = ii( a, b, c, d, x[i+ 0], 6, -198630844 ); // 49
+ d = ii( d, a, b, c, x[i+ 7], 10, 1126891415 ); // 50
+ c = ii( c, d, a, b, x[i+14], 15, -1416354905 ); // 51
+ b = ii( b, c, d, a, x[i+ 5], 21, -57434055 ); // 52
+ a = ii( a, b, c, d, x[i+12], 6, 1700485571 ); // 53
+ d = ii( d, a, b, c, x[i+ 3], 10, -1894986606 ); // 54
+ c = ii( c, d, a, b, x[i+10], 15, -1051523 ); // 55
+ b = ii( b, c, d, a, x[i+ 1], 21, -2054922799 ); // 56
+ a = ii( a, b, c, d, x[i+ 8], 6, 1873313359 ); // 57
+ d = ii( d, a, b, c, x[i+15], 10, -30611744 ); // 58
+ c = ii( c, d, a, b, x[i+ 6], 15, -1560198380 ); // 59
+ b = ii( b, c, d, a, x[i+13], 21, 1309151649 ); // 60
+ a = ii( a, b, c, d, x[i+ 4], 6, -145523070 ); // 61
+ d = ii( d, a, b, c, x[i+11], 10, -1120210379 ); // 62
+ c = ii( c, d, a, b, x[i+ 2], 15, 718787259 ); // 63
+ b = ii( b, c, d, a, x[i+ 9], 21, -343485551 ); // 64
+
+ a += aa;
+ b += bb;
+ c += cc;
+ d += dd;
+ }
+
+ // Finish up by concatening the buffers with their hex output
+ return IntUtil.toHex( a ) + IntUtil.toHex( b ) + IntUtil.toHex( c ) + IntUtil.toHex( d );
+ }
+
+ /**
+ * Auxiliary function f as defined in RFC
+ */
+ private static function f( x:int, y:int, z:int ):int {
+ return ( x & y ) | ( (~x) & z );
+ }
+
+ /**
+ * Auxiliary function g as defined in RFC
+ */
+ private static function g( x:int, y:int, z:int ):int {
+ return ( x & z ) | ( y & (~z) );
+ }
+
+ /**
+ * Auxiliary function h as defined in RFC
+ */
+ private static function h( x:int, y:int, z:int ):int {
+ return x ^ y ^ z;
+ }
+
+ /**
+ * Auxiliary function i as defined in RFC
+ */
+ private static function i( x:int, y:int, z:int ):int {
+ return y ^ ( x | (~z) );
+ }
+
+ /**
+ * A generic transformation function. The logic of ff, gg, hh, and
+ * ii are all the same, minus the function used, so pull that logic
+ * out and simplify the method bodies for the transoformation functions.
+ */
+ private static function transform( func:Function, a:int, b:int, c:int, d:int, x:int, s:int, t:int):int {
+ var tmp:int = a + int( func( b, c, d ) ) + x + t;
+ return IntUtil.rol( tmp, s ) + b;
+ }
+
+ /**
+ * ff transformation function
+ */
+ private static function ff ( a:int, b:int, c:int, d:int, x:int, s:int, t:int ):int {
+ return transform( f, a, b, c, d, x, s, t );
+ }
+
+ /**
+ * gg transformation function
+ */
+ private static function gg ( a:int, b:int, c:int, d:int, x:int, s:int, t:int ):int {
+ return transform( g, a, b, c, d, x, s, t );
+ }
+
+ /**
+ * hh transformation function
+ */
+ private static function hh ( a:int, b:int, c:int, d:int, x:int, s:int, t:int ):int {
+ return transform( h, a, b, c, d, x, s, t );
+ }
+
+ /**
+ * ii transformation function
+ */
+ private static function ii ( a:int, b:int, c:int, d:int, x:int, s:int, t:int ):int {
+ return transform( i, a, b, c, d, x, s, t );
+ }
+
+ /**
+ * Converts a string to a sequence of 16-word blocks
+ * that we'll do the processing on. Appends padding
+ * and length in the process.
+ *
+ * @param s The string to split into blocks
+ * @return An array containing the blocks that s was
+ * split into.
+ */
+ private static function createBlocks( s:String ):Array {
+ var blocks:Array = new Array();
+ var len:int = s.length * 8;
+ var mask:int = 0xFF; // ignore hi byte of characters > 0xFF
+ for( var i:int = 0; i < len; i += 8 ) {
+ blocks[ i >> 5 ] |= ( s.charCodeAt( i / 8 ) & mask ) << ( i % 32 );
+ }
+
+ // append padding and length
+ blocks[ len >> 5 ] |= 0x80 << ( len % 32 );
+ blocks[ ( ( ( len + 64 ) >>> 9 ) << 4 ) + 14 ] = len;
+ return blocks;
+ }
+
+ }
}
\ No newline at end of file
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/crypto/SHA1.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/crypto/SHA1.as
similarity index 97%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/crypto/SHA1.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/crypto/SHA1.as
index 793157d4a917..701c3d98f631 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/crypto/SHA1.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/crypto/SHA1.as
@@ -1,24 +1,24 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
+
Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
distribute this source code and such derivative works in source or
object code form without any attribution requirements.
-
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
against any loss, damage, claims or lawsuits, including attorney's
fees that arise or result from your use or distribution of the source
code.
-
+
THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -38,11 +38,11 @@ package com.adobe.crypto
import com.adobe.utils.IntUtil;
import flash.utils.ByteArray;
import mx.utils.Base64Encoder;
-
+
/**
* US Secure Hash Algorithm 1 (SHA1)
*
- * Implementation based on algorithm description at
+ * Implementation based on algorithm description at
* http://www.faqs.org/rfcs/rfc3174.html
*/
public class SHA1
@@ -60,14 +60,14 @@ package com.adobe.crypto
{
var blocks:Array = createBlocksFromString( s );
var byteArray:ByteArray = hashBlocks( blocks );
-
+
return IntUtil.toHex( byteArray.readInt(), true )
+ IntUtil.toHex( byteArray.readInt(), true )
+ IntUtil.toHex( byteArray.readInt(), true )
+ IntUtil.toHex( byteArray.readInt(), true )
+ IntUtil.toHex( byteArray.readInt(), true );
}
-
+
/**
* Performs the SHA1 hash algorithm on a ByteArray.
*
@@ -80,14 +80,14 @@ package com.adobe.crypto
{
var blocks:Array = SHA1.createBlocksFromByteArray( data );
var byteArray:ByteArray = hashBlocks(blocks);
-
+
return IntUtil.toHex( byteArray.readInt(), true )
+ IntUtil.toHex( byteArray.readInt(), true )
+ IntUtil.toHex( byteArray.readInt(), true )
+ IntUtil.toHex( byteArray.readInt(), true )
+ IntUtil.toHex( byteArray.readInt(), true );
}
-
+
/**
* Performs the SHA1 hash algorithm on a string, then does
* Base64 encoding on the result.
@@ -119,7 +119,7 @@ package com.adobe.crypto
encoder.encode(charsInByteArray);
return encoder.flush();
}
-
+
private static function hashBlocks( blocks:Array ):ByteArray
{
// initialize the h's
@@ -128,25 +128,25 @@ package com.adobe.crypto
var h2:int = 0x98badcfe;
var h3:int = 0x10325476;
var h4:int = 0xc3d2e1f0;
-
+
var len:int = blocks.length;
var w:Array = new Array( 80 );
-
+
// loop over all of the blocks
for ( var i:int = 0; i < len; i += 16 ) {
-
+
// 6.1.c
var a:int = h0;
var b:int = h1;
var c:int = h2;
var d:int = h3;
var e:int = h4;
-
+
// 80 steps to process each block
// TODO: unroll for faster execution, or 4 loops of
// 20 each to avoid the k and f function calls
for ( var t:int = 0; t < 80; t++ ) {
-
+
if ( t < 16 ) {
// 6.1.a
w[ t ] = blocks[ i + t ];
@@ -154,25 +154,25 @@ package com.adobe.crypto
// 6.1.b
w[ t ] = IntUtil.rol( w[ t - 3 ] ^ w[ t - 8 ] ^ w[ t - 14 ] ^ w[ t - 16 ], 1 );
}
-
+
// 6.1.d
var temp:int = IntUtil.rol( a, 5 ) + f( t, b, c, d ) + e + int( w[ t ] ) + k( t );
-
+
e = d;
d = c;
c = IntUtil.rol( b, 30 );
b = a;
a = temp;
}
-
+
// 6.1.e
h0 += a;
h1 += b;
h2 += c;
h3 += d;
- h4 += e;
+ h4 += e;
}
-
+
var byteArray:ByteArray = new ByteArray();
byteArray.writeInt(h0);
byteArray.writeInt(h1);
@@ -196,7 +196,7 @@ package com.adobe.crypto
}
return b ^ c ^ d;
}
-
+
/**
* Determines the constant value based on t
*/
@@ -210,7 +210,7 @@ package com.adobe.crypto
}
return 0xca62c1d6;
}
-
+
/**
* Converts a ByteArray to a sequence of 16-word blocks
* that we'll do the processing on. Appends padding
@@ -223,7 +223,7 @@ package com.adobe.crypto
{
var oldPosition:int = data.position;
data.position = 0;
-
+
var blocks:Array = new Array();
var len:int = data.length * 8;
var mask:int = 0xFF; // ignore hi byte of characters > 0xFF
@@ -231,16 +231,16 @@ package com.adobe.crypto
{
blocks[ i >> 5 ] |= ( data.readByte() & mask ) << ( 24 - i % 32 );
}
-
+
// append padding and length
blocks[ len >> 5 ] |= 0x80 << ( 24 - len % 32 );
blocks[ ( ( ( len + 64 ) >> 9 ) << 4 ) + 15 ] = len;
-
+
data.position = oldPosition;
-
+
return blocks;
}
-
+
/**
* Converts a string to a sequence of 16-word blocks
* that we'll do the processing on. Appends padding
@@ -257,12 +257,12 @@ package com.adobe.crypto
for( var i:int = 0; i < len; i += 8 ) {
blocks[ i >> 5 ] |= ( s.charCodeAt( i / 8 ) & mask ) << ( 24 - i % 32 );
}
-
+
// append padding and length
blocks[ len >> 5 ] |= 0x80 << ( 24 - len % 32 );
blocks[ ( ( ( len + 64 ) >> 9 ) << 4 ) + 15 ] = len;
return blocks;
}
-
+
}
}
\ No newline at end of file
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/crypto/SHA224.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/crypto/SHA224.as
similarity index 98%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/crypto/SHA224.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/crypto/SHA224.as
index d1c46d0c9084..989773689df1 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/crypto/SHA224.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/crypto/SHA224.as
@@ -1,24 +1,24 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
+
Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
distribute this source code and such derivative works in source or
object code form without any attribution requirements.
-
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
against any loss, damage, claims or lawsuits, including attorney's
fees that arise or result from your use or distribution of the source
code.
-
+
THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -38,15 +38,15 @@ package com.adobe.crypto
import com.adobe.utils.IntUtil;
import flash.utils.ByteArray;
import mx.utils.Base64Encoder;
-
+
/**
* The SHA-224 algorithm
- *
+ *
* @see http://csrc.nist.gov/publications/fips/fips180-2/fips180-2withchangenotice.pdf
*/
public class SHA224
{
-
+
/**
* Performs the SHA224 hash algorithm on a string.
*
@@ -67,7 +67,7 @@ package com.adobe.crypto
+ IntUtil.toHex( byteArray.readInt(), true )
+ IntUtil.toHex( byteArray.readInt(), true );
}
-
+
/**
* Performs the SHA224 hash algorithm on a ByteArray.
*
@@ -88,7 +88,7 @@ package com.adobe.crypto
+ IntUtil.toHex( byteArray.readInt(), true )
+ IntUtil.toHex( byteArray.readInt(), true );
}
-
+
/**
* Performs the SHA224 hash algorithm on a string, then does
* Base64 encoding on the result.
@@ -120,7 +120,7 @@ package com.adobe.crypto
encoder.encode(charsInByteArray);
return encoder.flush();
}
-
+
private static function hashBlocks( blocks:Array ):ByteArray {
var h0:int = 0xc1059ed8;
var h1:int = 0x367cd507;
@@ -130,15 +130,15 @@ package com.adobe.crypto
var h5:int = 0x68581511;
var h6:int = 0x64f98fa7;
var h7:int = 0xbefa4fa4;
-
+
var k:Array = new Array(0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5, 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da, 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967, 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, 0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070, 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3, 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2);
-
+
var len:int = blocks.length;
var w:Array = new Array();
-
+
// loop over all of the blocks
for ( var i:int = 0; i < len; i += 16 ) {
-
+
var a:int = h0;
var b:int = h1;
var c:int = h2;
@@ -147,9 +147,9 @@ package com.adobe.crypto
var f:int = h5;
var g:int = h6;
var h:int = h7;
-
+
for(var t:int = 0; t < 64; t++) {
-
+
if ( t < 16 ) {
w[t] = blocks[ i + t ];
if(isNaN(w[t])) { w[t] = 0; }
@@ -158,14 +158,14 @@ package com.adobe.crypto
var ws1:int = IntUtil.ror(w[t-2], 17) ^ IntUtil.ror(w[t-2], 19) ^ (w[t-2] >>> 10);
w[t] = w[t-16] + ws0 + w[t-7] + ws1;
}
-
+
var s0:int = IntUtil.ror(a, 2) ^ IntUtil.ror(a, 13) ^ IntUtil.ror(a, 22);
var maj:int = (a & b) ^ (a & c) ^ (b & c);
var t2:int = s0 + maj;
var s1:int = IntUtil.ror(e, 6) ^ IntUtil.ror(e, 11) ^ IntUtil.ror(e, 25);
var ch:int = (e & f) ^ ((~e) & g);
var t1:int = h + s1 + ch + k[t] + w[t];
-
+
h = g;
g = f;
f = e;
@@ -175,7 +175,7 @@ package com.adobe.crypto
b = a;
a = t1 + t2;
}
-
+
//Add this chunk's hash to result so far:
h0 += a;
h1 += b;
@@ -186,7 +186,7 @@ package com.adobe.crypto
h6 += g;
h7 += h;
}
-
+
var byteArray:ByteArray = new ByteArray();
byteArray.writeInt(h0);
byteArray.writeInt(h1);
@@ -198,7 +198,7 @@ package com.adobe.crypto
byteArray.position = 0;
return byteArray;
}
-
+
/**
* Converts a ByteArray to a sequence of 16-word blocks
* that we'll do the processing on. Appends padding
@@ -211,7 +211,7 @@ package com.adobe.crypto
{
var oldPosition:int = data.position;
data.position = 0;
-
+
var blocks:Array = new Array();
var len:int = data.length * 8;
var mask:int = 0xFF; // ignore hi byte of characters > 0xFF
@@ -219,16 +219,16 @@ package com.adobe.crypto
{
blocks[ i >> 5 ] |= ( data.readByte() & mask ) << ( 24 - i % 32 );
}
-
+
// append padding and length
blocks[ len >> 5 ] |= 0x80 << ( 24 - len % 32 );
blocks[ ( ( ( len + 64 ) >> 9 ) << 4 ) + 15 ] = len;
-
+
data.position = oldPosition;
-
+
return blocks;
}
-
+
/**
* Converts a string to a sequence of 16-word blocks
* that we'll do the processing on. Appends padding
@@ -245,7 +245,7 @@ package com.adobe.crypto
for( var i:int = 0; i < len; i += 8 ) {
blocks[ i >> 5 ] |= ( s.charCodeAt( i / 8 ) & mask ) << ( 24 - i % 32 );
}
-
+
// append padding and length
blocks[ len >> 5 ] |= 0x80 << ( 24 - len % 32 );
blocks[ ( ( ( len + 64 ) >> 9 ) << 4 ) + 15 ] = len;
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/crypto/SHA256.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/crypto/SHA256.as
similarity index 98%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/crypto/SHA256.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/crypto/SHA256.as
index 00108b648537..f1654cf95024 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/crypto/SHA256.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/crypto/SHA256.as
@@ -1,24 +1,24 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
+
Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
distribute this source code and such derivative works in source or
object code form without any attribution requirements.
-
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
against any loss, damage, claims or lawsuits, including attorney's
fees that arise or result from your use or distribution of the source
code.
-
+
THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -38,15 +38,15 @@ package com.adobe.crypto
import com.adobe.utils.IntUtil;
import flash.utils.ByteArray;
import mx.utils.Base64Encoder;
-
+
/**
* The SHA-256 algorithm
- *
+ *
* @see http://csrc.nist.gov/publications/fips/fips180-2/fips180-2withchangenotice.pdf
*/
public class SHA256
{
-
+
/**
* Performs the SHA256 hash algorithm on a string.
*
@@ -59,7 +59,7 @@ package com.adobe.crypto
public static function hash( s:String ):String {
var blocks:Array = createBlocksFromString( s );
var byteArray:ByteArray = hashBlocks( blocks );
-
+
return IntUtil.toHex( byteArray.readInt(), true )
+ IntUtil.toHex( byteArray.readInt(), true )
+ IntUtil.toHex( byteArray.readInt(), true )
@@ -69,7 +69,7 @@ package com.adobe.crypto
+ IntUtil.toHex( byteArray.readInt(), true )
+ IntUtil.toHex( byteArray.readInt(), true );
}
-
+
/**
* Performs the SHA256 hash algorithm on a ByteArray.
*
@@ -82,7 +82,7 @@ package com.adobe.crypto
{
var blocks:Array = createBlocksFromByteArray( data );
var byteArray:ByteArray = hashBlocks(blocks);
-
+
return IntUtil.toHex( byteArray.readInt(), true )
+ IntUtil.toHex( byteArray.readInt(), true )
+ IntUtil.toHex( byteArray.readInt(), true )
@@ -92,7 +92,7 @@ package com.adobe.crypto
+ IntUtil.toHex( byteArray.readInt(), true )
+ IntUtil.toHex( byteArray.readInt(), true );
}
-
+
/**
* Performs the SHA256 hash algorithm on a string, then does
* Base64 encoding on the result.
@@ -124,7 +124,7 @@ package com.adobe.crypto
encoder.encode(charsInByteArray);
return encoder.flush();
}
-
+
private static function hashBlocks( blocks:Array ):ByteArray {
var h0:int = 0x6a09e667;
var h1:int = 0xbb67ae85;
@@ -134,15 +134,15 @@ package com.adobe.crypto
var h5:int = 0x9b05688c;
var h6:int = 0x1f83d9ab;
var h7:int = 0x5be0cd19;
-
+
var k:Array = new Array(0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5, 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da, 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967, 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, 0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070, 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3, 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2);
-
+
var len:int = blocks.length;
var w:Array = new Array( 64 );
-
+
// loop over all of the blocks
for ( var i:int = 0; i < len; i += 16 ) {
-
+
var a:int = h0;
var b:int = h1;
var c:int = h2;
@@ -151,9 +151,9 @@ package com.adobe.crypto
var f:int = h5;
var g:int = h6;
var h:int = h7;
-
+
for(var t:int = 0; t < 64; t++) {
-
+
if ( t < 16 ) {
w[t] = blocks[ i + t ];
if(isNaN(w[t])) { w[t] = 0; }
@@ -162,14 +162,14 @@ package com.adobe.crypto
var ws1:int = IntUtil.ror(w[t-2], 17) ^ IntUtil.ror(w[t-2], 19) ^ (w[t-2] >>> 10);
w[t] = w[t-16] + ws0 + w[t-7] + ws1;
}
-
+
var s0:int = IntUtil.ror(a, 2) ^ IntUtil.ror(a, 13) ^ IntUtil.ror(a, 22);
var maj:int = (a & b) ^ (a & c) ^ (b & c);
var t2:int = s0 + maj;
var s1:int = IntUtil.ror(e, 6) ^ IntUtil.ror(e, 11) ^ IntUtil.ror(e, 25);
var ch:int = (e & f) ^ ((~e) & g);
var t1:int = h + s1 + ch + k[t] + w[t];
-
+
h = g;
g = f;
f = e;
@@ -179,7 +179,7 @@ package com.adobe.crypto
b = a;
a = t1 + t2;
}
-
+
//Add this chunk's hash to result so far:
h0 += a;
h1 += b;
@@ -190,7 +190,7 @@ package com.adobe.crypto
h6 += g;
h7 += h;
}
-
+
var byteArray:ByteArray = new ByteArray();
byteArray.writeInt(h0);
byteArray.writeInt(h1);
@@ -203,7 +203,7 @@ package com.adobe.crypto
byteArray.position = 0;
return byteArray;
}
-
+
/**
* Converts a ByteArray to a sequence of 16-word blocks
* that we'll do the processing on. Appends padding
@@ -216,7 +216,7 @@ package com.adobe.crypto
{
var oldPosition:int = data.position;
data.position = 0;
-
+
var blocks:Array = new Array();
var len:int = data.length * 8;
var mask:int = 0xFF; // ignore hi byte of characters > 0xFF
@@ -224,16 +224,16 @@ package com.adobe.crypto
{
blocks[ i >> 5 ] |= ( data.readByte() & mask ) << ( 24 - i % 32 );
}
-
+
// append padding and length
blocks[ len >> 5 ] |= 0x80 << ( 24 - len % 32 );
blocks[ ( ( ( len + 64 ) >> 9 ) << 4 ) + 15 ] = len;
-
+
data.position = oldPosition;
-
+
return blocks;
}
-
+
/**
* Converts a string to a sequence of 16-word blocks
* that we'll do the processing on. Appends padding
@@ -250,7 +250,7 @@ package com.adobe.crypto
for( var i:int = 0; i < len; i += 8 ) {
blocks[ i >> 5 ] |= ( s.charCodeAt( i / 8 ) & mask ) << ( 24 - i % 32 );
}
-
+
// append padding and length
blocks[ len >> 5 ] |= 0x80 << ( 24 - len % 32 );
blocks[ ( ( ( len + 64 ) >> 9 ) << 4 ) + 15 ] = len;
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/crypto/WSSEUsernameToken.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/crypto/WSSEUsernameToken.as
similarity index 97%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/crypto/WSSEUsernameToken.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/crypto/WSSEUsernameToken.as
index 58a33604c2fa..960f838686f7 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/crypto/WSSEUsernameToken.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/crypto/WSSEUsernameToken.as
@@ -1,24 +1,24 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
+
Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
distribute this source code and such derivative works in source or
object code form without any attribution requirements.
-
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
against any loss, damage, claims or lawsuits, including attorney's
fees that arise or result from your use or distribution of the source
code.
-
+
THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -37,11 +37,11 @@ package com.adobe.crypto
{
import mx.formatters.DateFormatter;
import mx.utils.Base64Encoder;
-
+
/**
* Web Services Security Username Token
*
- * Implementation based on algorithm description at
+ * Implementation based on algorithm description at
* http://www.oasis-open.org/committees/wss/documents/WSS-Username-02-0223-merged.pdf
*/
public class WSSEUsernameToken
@@ -67,13 +67,13 @@ package com.adobe.crypto
nonce = generateNonce();
}
nonce = base64Encode(nonce);
-
+
var created:String = generateTimestamp(timestamp);
-
+
var password64:String = getBase64Digest(nonce,
created,
password);
-
+
var token:String = new String("UsernameToken Username=\"");
token += username + "\", " +
"PasswordDigest=\"" + password64 + "\", " +
@@ -81,7 +81,7 @@ package com.adobe.crypto
"Created=\"" + created + "\"";
return token;
}
-
+
private static function generateNonce():String
{
// Math.random returns a Number between 0 and 1. We don't want our
@@ -90,14 +90,14 @@ package com.adobe.crypto
var s:String = Math.random().toString();
return s.replace(".", "");
}
-
+
internal static function base64Encode(s:String):String
{
var encoder:Base64Encoder = new Base64Encoder();
encoder.encode(s);
return encoder.flush();
}
-
+
internal static function generateTimestamp(timestamp:Date):String
{
if (timestamp == null)
@@ -108,7 +108,7 @@ package com.adobe.crypto
dateFormatter.formatString = "YYYY-MM-DDTJJ:NN:SS"
return dateFormatter.format(timestamp) + "Z";
}
-
+
internal static function getBase64Digest(nonce:String, created:String, password:String):String
{
return SHA1.hashToBase64(nonce + created + password);
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/errors/IllegalStateError.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/errors/IllegalStateError.as
similarity index 94%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/errors/IllegalStateError.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/errors/IllegalStateError.as
index 2c83e363d768..b691cfcc3fa5 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/errors/IllegalStateError.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/errors/IllegalStateError.as
@@ -1,34 +1,34 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
- Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
+
+ Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
- distribute this source code and such derivative works in source or
- object code form without any attribution requirements.
-
+ distribute this source code and such derivative works in source or
+ object code form without any attribution requirements.
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
- against any loss, damage, claims or lawsuits, including attorney's
- fees that arise or result from your use or distribution of the source
+ against any loss, damage, claims or lawsuits, including attorney's
+ fees that arise or result from your use or distribution of the source
code.
-
- THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
+
+ THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/Address.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/Address.as
similarity index 93%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/Address.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/Address.as
index 25852049f803..01808ec27360 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/Address.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/Address.as
@@ -1,34 +1,34 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
- Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
+
+ Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
- distribute this source code and such derivative works in source or
- object code form without any attribution requirements.
-
+ distribute this source code and such derivative works in source or
+ object code form without any attribution requirements.
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
- against any loss, damage, claims or lawsuits, including attorney's
- fees that arise or result from your use or distribution of the source
+ against any loss, damage, claims or lawsuits, including attorney's
+ fees that arise or result from your use or distribution of the source
code.
-
- THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
+
+ THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
@@ -41,7 +41,7 @@ package com.adobe.fileformats.vcard
public var city:String;
public var state:String;
public var postalCode:String;
-
+
public function toString():String
{
return (street + " " + city + ", " + state + " " + postalCode);
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/Email.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/Email.as
similarity index 92%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/Email.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/Email.as
index c0b16ffc29ed..735ce0421489 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/Email.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/Email.as
@@ -1,34 +1,34 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
- Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
+
+ Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
- distribute this source code and such derivative works in source or
- object code form without any attribution requirements.
-
+ distribute this source code and such derivative works in source or
+ object code form without any attribution requirements.
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
- against any loss, damage, claims or lawsuits, including attorney's
- fees that arise or result from your use or distribution of the source
+ against any loss, damage, claims or lawsuits, including attorney's
+ fees that arise or result from your use or distribution of the source
code.
-
- THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
+
+ THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/Phone.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/Phone.as
similarity index 92%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/Phone.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/Phone.as
index 8159cc937559..8a2589e5e180 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/Phone.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/Phone.as
@@ -1,34 +1,34 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
- Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
+
+ Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
- distribute this source code and such derivative works in source or
- object code form without any attribution requirements.
-
+ distribute this source code and such derivative works in source or
+ object code form without any attribution requirements.
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
- against any loss, damage, claims or lawsuits, including attorney's
- fees that arise or result from your use or distribution of the source
+ against any loss, damage, claims or lawsuits, including attorney's
+ fees that arise or result from your use or distribution of the source
code.
-
- THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
+
+ THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/VCard.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/VCard.as
similarity index 93%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/VCard.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/VCard.as
index e8c873011b51..a473cdb87cd5 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/VCard.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/VCard.as
@@ -1,34 +1,34 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
- Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
+
+ Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
- distribute this source code and such derivative works in source or
- object code form without any attribution requirements.
-
+ distribute this source code and such derivative works in source or
+ object code form without any attribution requirements.
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
- against any loss, damage, claims or lawsuits, including attorney's
- fees that arise or result from your use or distribution of the source
+ against any loss, damage, claims or lawsuits, including attorney's
+ fees that arise or result from your use or distribution of the source
code.
-
- THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
+
+ THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
@@ -45,7 +45,7 @@ package com.adobe.fileformats.vcard
public var phones:Array;
public var emails:Array;
public var addresses:Array;
-
+
public function VCard()
{
orgs = new Array();
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/VCardParser.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/VCardParser.as
similarity index 97%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/VCardParser.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/VCardParser.as
index 51f9ebcd7ce2..64abe8cc5f4d 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/VCardParser.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/fileformats/vcard/VCardParser.as
@@ -1,34 +1,34 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
- Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
+
+ Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
- distribute this source code and such derivative works in source or
- object code form without any attribution requirements.
-
+ distribute this source code and such derivative works in source or
+ object code form without any attribution requirements.
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
- against any loss, damage, claims or lawsuits, including attorney's
- fees that arise or result from your use or distribution of the source
+ against any loss, damage, claims or lawsuits, including attorney's
+ fees that arise or result from your use or distribution of the source
code.
-
- THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
+
+ THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
@@ -36,7 +36,7 @@ package com.adobe.fileformats.vcard
{
import mx.utils.Base64Decoder;
import mx.utils.StringUtil;
-
+
public class VCardParser
{
public static function parse(vcardStr:String):Array
@@ -101,7 +101,7 @@ package com.adobe.fileformats.vcard
number = phoneToken.substring(phoneToken.indexOf(":")+1, phoneToken.length);
}
else
- {
+ {
typeTmp = phoneToken.substring(5, phoneToken.length);
}
@@ -142,7 +142,7 @@ package com.adobe.fileformats.vcard
emailAddress = emailToken.substring(emailToken.indexOf(":")+1, emailToken.length);
}
else
- {
+ {
typeTmp = emailToken.substring(5, emailToken.length);
}
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/images/BitString.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/images/BitString.as
similarity index 92%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/images/BitString.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/images/BitString.as
index 5d89c93bb146..dd91555398ba 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/images/BitString.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/images/BitString.as
@@ -1,34 +1,34 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
- Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
+
+ Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
- distribute this source code and such derivative works in source or
- object code form without any attribution requirements.
-
+ distribute this source code and such derivative works in source or
+ object code form without any attribution requirements.
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
- against any loss, damage, claims or lawsuits, including attorney's
- fees that arise or result from your use or distribution of the source
+ against any loss, damage, claims or lawsuits, including attorney's
+ fees that arise or result from your use or distribution of the source
code.
-
- THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
+
+ THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/images/JPGEncoder.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/images/JPGEncoder.as
similarity index 95%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/images/JPGEncoder.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/images/JPGEncoder.as
index 4c6ad63711d8..0d2eee82e998 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/images/JPGEncoder.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/images/JPGEncoder.as
@@ -1,651 +1,651 @@
-/*
- Adobe Systems Incorporated(r) Source Code License Agreement
- Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
- Please read this Source Code License Agreement carefully before using
- the source code.
-
- Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
- no-charge, royalty-free, irrevocable copyright license, to reproduce,
- prepare derivative works of, publicly display, publicly perform, and
- distribute this source code and such derivative works in source or
- object code form without any attribution requirements.
-
- The name "Adobe Systems Incorporated" must not be used to endorse or promote products
- derived from the source code without prior written permission.
-
- You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
- against any loss, damage, claims or lawsuits, including attorney's
- fees that arise or result from your use or distribution of the source
- code.
-
- THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
- ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
- BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
- NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
- OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-package com.adobe.images
-{
- import flash.geom.*;
- import flash.display.*;
- import flash.utils.*;
-
- /**
- * Class that converts BitmapData into a valid JPEG
- */
- public class JPGEncoder
- {
-
- // Static table initialization
-
- private var ZigZag:Array = [
- 0, 1, 5, 6,14,15,27,28,
- 2, 4, 7,13,16,26,29,42,
- 3, 8,12,17,25,30,41,43,
- 9,11,18,24,31,40,44,53,
- 10,19,23,32,39,45,52,54,
- 20,22,33,38,46,51,55,60,
- 21,34,37,47,50,56,59,61,
- 35,36,48,49,57,58,62,63
- ];
-
- private var YTable:Array = new Array(64);
- private var UVTable:Array = new Array(64);
- private var fdtbl_Y:Array = new Array(64);
- private var fdtbl_UV:Array = new Array(64);
-
- private function initQuantTables(sf:int):void
- {
- var i:int;
- var t:Number;
- var YQT:Array = [
- 16, 11, 10, 16, 24, 40, 51, 61,
- 12, 12, 14, 19, 26, 58, 60, 55,
- 14, 13, 16, 24, 40, 57, 69, 56,
- 14, 17, 22, 29, 51, 87, 80, 62,
- 18, 22, 37, 56, 68,109,103, 77,
- 24, 35, 55, 64, 81,104,113, 92,
- 49, 64, 78, 87,103,121,120,101,
- 72, 92, 95, 98,112,100,103, 99
- ];
- for (i = 0; i < 64; i++) {
- t = Math.floor((YQT[i]*sf+50)/100);
- if (t < 1) {
- t = 1;
- } else if (t > 255) {
- t = 255;
- }
- YTable[ZigZag[i]] = t;
- }
- var UVQT:Array = [
- 17, 18, 24, 47, 99, 99, 99, 99,
- 18, 21, 26, 66, 99, 99, 99, 99,
- 24, 26, 56, 99, 99, 99, 99, 99,
- 47, 66, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99
- ];
- for (i = 0; i < 64; i++) {
- t = Math.floor((UVQT[i]*sf+50)/100);
- if (t < 1) {
- t = 1;
- } else if (t > 255) {
- t = 255;
- }
- UVTable[ZigZag[i]] = t;
- }
- var aasf:Array = [
- 1.0, 1.387039845, 1.306562965, 1.175875602,
- 1.0, 0.785694958, 0.541196100, 0.275899379
- ];
- i = 0;
- for (var row:int = 0; row < 8; row++)
- {
- for (var col:int = 0; col < 8; col++)
- {
- fdtbl_Y[i] = (1.0 / (YTable [ZigZag[i]] * aasf[row] * aasf[col] * 8.0));
- fdtbl_UV[i] = (1.0 / (UVTable[ZigZag[i]] * aasf[row] * aasf[col] * 8.0));
- i++;
- }
- }
- }
-
- private var YDC_HT:Array;
- private var UVDC_HT:Array;
- private var YAC_HT:Array;
- private var UVAC_HT:Array;
-
- private function computeHuffmanTbl(nrcodes:Array, std_table:Array):Array
- {
- var codevalue:int = 0;
- var pos_in_table:int = 0;
- var HT:Array = new Array();
- for (var k:int=1; k<=16; k++) {
- for (var j:int=1; j<=nrcodes[k]; j++) {
- HT[std_table[pos_in_table]] = new BitString();
- HT[std_table[pos_in_table]].val = codevalue;
- HT[std_table[pos_in_table]].len = k;
- pos_in_table++;
- codevalue++;
- }
- codevalue*=2;
- }
- return HT;
- }
-
- private var std_dc_luminance_nrcodes:Array = [0,0,1,5,1,1,1,1,1,1,0,0,0,0,0,0,0];
- private var std_dc_luminance_values:Array = [0,1,2,3,4,5,6,7,8,9,10,11];
- private var std_ac_luminance_nrcodes:Array = [0,0,2,1,3,3,2,4,3,5,5,4,4,0,0,1,0x7d];
- private var std_ac_luminance_values:Array = [
- 0x01,0x02,0x03,0x00,0x04,0x11,0x05,0x12,
- 0x21,0x31,0x41,0x06,0x13,0x51,0x61,0x07,
- 0x22,0x71,0x14,0x32,0x81,0x91,0xa1,0x08,
- 0x23,0x42,0xb1,0xc1,0x15,0x52,0xd1,0xf0,
- 0x24,0x33,0x62,0x72,0x82,0x09,0x0a,0x16,
- 0x17,0x18,0x19,0x1a,0x25,0x26,0x27,0x28,
- 0x29,0x2a,0x34,0x35,0x36,0x37,0x38,0x39,
- 0x3a,0x43,0x44,0x45,0x46,0x47,0x48,0x49,
- 0x4a,0x53,0x54,0x55,0x56,0x57,0x58,0x59,
- 0x5a,0x63,0x64,0x65,0x66,0x67,0x68,0x69,
- 0x6a,0x73,0x74,0x75,0x76,0x77,0x78,0x79,
- 0x7a,0x83,0x84,0x85,0x86,0x87,0x88,0x89,
- 0x8a,0x92,0x93,0x94,0x95,0x96,0x97,0x98,
- 0x99,0x9a,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,
- 0xa8,0xa9,0xaa,0xb2,0xb3,0xb4,0xb5,0xb6,
- 0xb7,0xb8,0xb9,0xba,0xc2,0xc3,0xc4,0xc5,
- 0xc6,0xc7,0xc8,0xc9,0xca,0xd2,0xd3,0xd4,
- 0xd5,0xd6,0xd7,0xd8,0xd9,0xda,0xe1,0xe2,
- 0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,
- 0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,
- 0xf9,0xfa
- ];
-
- private var std_dc_chrominance_nrcodes:Array = [0,0,3,1,1,1,1,1,1,1,1,1,0,0,0,0,0];
- private var std_dc_chrominance_values:Array = [0,1,2,3,4,5,6,7,8,9,10,11];
- private var std_ac_chrominance_nrcodes:Array = [0,0,2,1,2,4,4,3,4,7,5,4,4,0,1,2,0x77];
- private var std_ac_chrominance_values:Array = [
- 0x00,0x01,0x02,0x03,0x11,0x04,0x05,0x21,
- 0x31,0x06,0x12,0x41,0x51,0x07,0x61,0x71,
- 0x13,0x22,0x32,0x81,0x08,0x14,0x42,0x91,
- 0xa1,0xb1,0xc1,0x09,0x23,0x33,0x52,0xf0,
- 0x15,0x62,0x72,0xd1,0x0a,0x16,0x24,0x34,
- 0xe1,0x25,0xf1,0x17,0x18,0x19,0x1a,0x26,
- 0x27,0x28,0x29,0x2a,0x35,0x36,0x37,0x38,
- 0x39,0x3a,0x43,0x44,0x45,0x46,0x47,0x48,
- 0x49,0x4a,0x53,0x54,0x55,0x56,0x57,0x58,
- 0x59,0x5a,0x63,0x64,0x65,0x66,0x67,0x68,
- 0x69,0x6a,0x73,0x74,0x75,0x76,0x77,0x78,
- 0x79,0x7a,0x82,0x83,0x84,0x85,0x86,0x87,
- 0x88,0x89,0x8a,0x92,0x93,0x94,0x95,0x96,
- 0x97,0x98,0x99,0x9a,0xa2,0xa3,0xa4,0xa5,
- 0xa6,0xa7,0xa8,0xa9,0xaa,0xb2,0xb3,0xb4,
- 0xb5,0xb6,0xb7,0xb8,0xb9,0xba,0xc2,0xc3,
- 0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xd2,
- 0xd3,0xd4,0xd5,0xd6,0xd7,0xd8,0xd9,0xda,
- 0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,
- 0xea,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,
- 0xf9,0xfa
- ];
-
- private function initHuffmanTbl():void
- {
- YDC_HT = computeHuffmanTbl(std_dc_luminance_nrcodes,std_dc_luminance_values);
- UVDC_HT = computeHuffmanTbl(std_dc_chrominance_nrcodes,std_dc_chrominance_values);
- YAC_HT = computeHuffmanTbl(std_ac_luminance_nrcodes,std_ac_luminance_values);
- UVAC_HT = computeHuffmanTbl(std_ac_chrominance_nrcodes,std_ac_chrominance_values);
- }
-
- private var bitcode:Array = new Array(65535);
- private var category:Array = new Array(65535);
-
- private function initCategoryNumber():void
- {
- var nrlower:int = 1;
- var nrupper:int = 2;
- var nr:int;
- for (var cat:int=1; cat<=15; cat++) {
- //Positive numbers
- for (nr=nrlower; nr<nrupper; nr++) {
- category[32767+nr] = cat;
- bitcode[32767+nr] = new BitString();
- bitcode[32767+nr].len = cat;
- bitcode[32767+nr].val = nr;
- }
- //Negative numbers
- for (nr=-(nrupper-1); nr<=-nrlower; nr++) {
- category[32767+nr] = cat;
- bitcode[32767+nr] = new BitString();
- bitcode[32767+nr].len = cat;
- bitcode[32767+nr].val = nrupper-1+nr;
- }
- nrlower <<= 1;
- nrupper <<= 1;
- }
- }
-
- // IO functions
-
- private var byteout:ByteArray;
- private var bytenew:int = 0;
- private var bytepos:int = 7;
-
- private function writeBits(bs:BitString):void
- {
- var value:int = bs.val;
- var posval:int = bs.len-1;
- while ( posval >= 0 ) {
- if (value & uint(1 << posval) ) {
- bytenew |= uint(1 << bytepos);
- }
- posval--;
- bytepos--;
- if (bytepos < 0) {
- if (bytenew == 0xFF) {
- writeByte(0xFF);
- writeByte(0);
- }
- else {
- writeByte(bytenew);
- }
- bytepos=7;
- bytenew=0;
- }
- }
- }
-
- private function writeByte(value:int):void
- {
- byteout.writeByte(value);
- }
-
- private function writeWord(value:int):void
- {
- writeByte((value>>8)&0xFF);
- writeByte((value )&0xFF);
- }
-
- // DCT & quantization core
-
- private function fDCTQuant(data:Array, fdtbl:Array):Array
- {
- var tmp0:Number, tmp1:Number, tmp2:Number, tmp3:Number, tmp4:Number, tmp5:Number, tmp6:Number, tmp7:Number;
- var tmp10:Number, tmp11:Number, tmp12:Number, tmp13:Number;
- var z1:Number, z2:Number, z3:Number, z4:Number, z5:Number, z11:Number, z13:Number;
- var i:int;
- /* Pass 1: process rows. */
- var dataOff:int=0;
- for (i=0; i<8; i++) {
- tmp0 = data[dataOff+0] + data[dataOff+7];
- tmp7 = data[dataOff+0] - data[dataOff+7];
- tmp1 = data[dataOff+1] + data[dataOff+6];
- tmp6 = data[dataOff+1] - data[dataOff+6];
- tmp2 = data[dataOff+2] + data[dataOff+5];
- tmp5 = data[dataOff+2] - data[dataOff+5];
- tmp3 = data[dataOff+3] + data[dataOff+4];
- tmp4 = data[dataOff+3] - data[dataOff+4];
-
- /* Even part */
- tmp10 = tmp0 + tmp3; /* phase 2 */
- tmp13 = tmp0 - tmp3;
- tmp11 = tmp1 + tmp2;
- tmp12 = tmp1 - tmp2;
-
- data[dataOff+0] = tmp10 + tmp11; /* phase 3 */
- data[dataOff+4] = tmp10 - tmp11;
-
- z1 = (tmp12 + tmp13) * 0.707106781; /* c4 */
- data[dataOff+2] = tmp13 + z1; /* phase 5 */
- data[dataOff+6] = tmp13 - z1;
-
- /* Odd part */
- tmp10 = tmp4 + tmp5; /* phase 2 */
- tmp11 = tmp5 + tmp6;
- tmp12 = tmp6 + tmp7;
-
- /* The rotator is modified from fig 4-8 to avoid extra negations. */
- z5 = (tmp10 - tmp12) * 0.382683433; /* c6 */
- z2 = 0.541196100 * tmp10 + z5; /* c2-c6 */
- z4 = 1.306562965 * tmp12 + z5; /* c2+c6 */
- z3 = tmp11 * 0.707106781; /* c4 */
-
- z11 = tmp7 + z3; /* phase 5 */
- z13 = tmp7 - z3;
-
- data[dataOff+5] = z13 + z2; /* phase 6 */
- data[dataOff+3] = z13 - z2;
- data[dataOff+1] = z11 + z4;
- data[dataOff+7] = z11 - z4;
-
- dataOff += 8; /* advance pointer to next row */
- }
-
- /* Pass 2: process columns. */
- dataOff = 0;
- for (i=0; i<8; i++) {
- tmp0 = data[dataOff+ 0] + data[dataOff+56];
- tmp7 = data[dataOff+ 0] - data[dataOff+56];
- tmp1 = data[dataOff+ 8] + data[dataOff+48];
- tmp6 = data[dataOff+ 8] - data[dataOff+48];
- tmp2 = data[dataOff+16] + data[dataOff+40];
- tmp5 = data[dataOff+16] - data[dataOff+40];
- tmp3 = data[dataOff+24] + data[dataOff+32];
- tmp4 = data[dataOff+24] - data[dataOff+32];
-
- /* Even part */
- tmp10 = tmp0 + tmp3; /* phase 2 */
- tmp13 = tmp0 - tmp3;
- tmp11 = tmp1 + tmp2;
- tmp12 = tmp1 - tmp2;
-
- data[dataOff+ 0] = tmp10 + tmp11; /* phase 3 */
- data[dataOff+32] = tmp10 - tmp11;
-
- z1 = (tmp12 + tmp13) * 0.707106781; /* c4 */
- data[dataOff+16] = tmp13 + z1; /* phase 5 */
- data[dataOff+48] = tmp13 - z1;
-
- /* Odd part */
- tmp10 = tmp4 + tmp5; /* phase 2 */
- tmp11 = tmp5 + tmp6;
- tmp12 = tmp6 + tmp7;
-
- /* The rotator is modified from fig 4-8 to avoid extra negations. */
- z5 = (tmp10 - tmp12) * 0.382683433; /* c6 */
- z2 = 0.541196100 * tmp10 + z5; /* c2-c6 */
- z4 = 1.306562965 * tmp12 + z5; /* c2+c6 */
- z3 = tmp11 * 0.707106781; /* c4 */
-
- z11 = tmp7 + z3; /* phase 5 */
- z13 = tmp7 - z3;
-
- data[dataOff+40] = z13 + z2; /* phase 6 */
- data[dataOff+24] = z13 - z2;
- data[dataOff+ 8] = z11 + z4;
- data[dataOff+56] = z11 - z4;
-
- dataOff++; /* advance pointer to next column */
- }
-
- // Quantize/descale the coefficients
- for (i=0; i<64; i++) {
- // Apply the quantization and scaling factor & Round to nearest integer
- data[i] = Math.round((data[i]*fdtbl[i]));
- }
- return data;
- }
-
- // Chunk writing
-
- private function writeAPP0():void
- {
- writeWord(0xFFE0); // marker
- writeWord(16); // length
- writeByte(0x4A); // J
- writeByte(0x46); // F
- writeByte(0x49); // I
- writeByte(0x46); // F
- writeByte(0); // = "JFIF",'\0'
- writeByte(1); // versionhi
- writeByte(1); // versionlo
- writeByte(0); // xyunits
- writeWord(1); // xdensity
- writeWord(1); // ydensity
- writeByte(0); // thumbnwidth
- writeByte(0); // thumbnheight
- }
-
- private function writeSOF0(width:int, height:int):void
- {
- writeWord(0xFFC0); // marker
- writeWord(17); // length, truecolor YUV JPG
- writeByte(8); // precision
- writeWord(height);
- writeWord(width);
- writeByte(3); // nrofcomponents
- writeByte(1); // IdY
- writeByte(0x11); // HVY
- writeByte(0); // QTY
- writeByte(2); // IdU
- writeByte(0x11); // HVU
- writeByte(1); // QTU
- writeByte(3); // IdV
- writeByte(0x11); // HVV
- writeByte(1); // QTV
- }
-
- private function writeDQT():void
- {
- writeWord(0xFFDB); // marker
- writeWord(132); // length
- writeByte(0);
- var i:int;
- for (i=0; i<64; i++) {
- writeByte(YTable[i]);
- }
- writeByte(1);
- for (i=0; i<64; i++) {
- writeByte(UVTable[i]);
- }
- }
-
- private function writeDHT():void
- {
- writeWord(0xFFC4); // marker
- writeWord(0x01A2); // length
- var i:int;
-
- writeByte(0); // HTYDCinfo
- for (i=0; i<16; i++) {
- writeByte(std_dc_luminance_nrcodes[i+1]);
- }
- for (i=0; i<=11; i++) {
- writeByte(std_dc_luminance_values[i]);
- }
-
- writeByte(0x10); // HTYACinfo
- for (i=0; i<16; i++) {
- writeByte(std_ac_luminance_nrcodes[i+1]);
- }
- for (i=0; i<=161; i++) {
- writeByte(std_ac_luminance_values[i]);
- }
-
- writeByte(1); // HTUDCinfo
- for (i=0; i<16; i++) {
- writeByte(std_dc_chrominance_nrcodes[i+1]);
- }
- for (i=0; i<=11; i++) {
- writeByte(std_dc_chrominance_values[i]);
- }
-
- writeByte(0x11); // HTUACinfo
- for (i=0; i<16; i++) {
- writeByte(std_ac_chrominance_nrcodes[i+1]);
- }
- for (i=0; i<=161; i++) {
- writeByte(std_ac_chrominance_values[i]);
- }
- }
-
- private function writeSOS():void
- {
- writeWord(0xFFDA); // marker
- writeWord(12); // length
- writeByte(3); // nrofcomponents
- writeByte(1); // IdY
- writeByte(0); // HTY
- writeByte(2); // IdU
- writeByte(0x11); // HTU
- writeByte(3); // IdV
- writeByte(0x11); // HTV
- writeByte(0); // Ss
- writeByte(0x3f); // Se
- writeByte(0); // Bf
- }
-
- // Core processing
- private var DU:Array = new Array(64);
-
- private function processDU(CDU:Array, fdtbl:Array, DC:Number, HTDC:Array, HTAC:Array):Number
- {
- var EOB:BitString = HTAC[0x00];
- var M16zeroes:BitString = HTAC[0xF0];
- var i:int;
-
- var DU_DCT:Array = fDCTQuant(CDU, fdtbl);
- //ZigZag reorder
- for (i=0;i<64;i++) {
- DU[ZigZag[i]]=DU_DCT[i];
- }
- var Diff:int = DU[0] - DC; DC = DU[0];
- //Encode DC
- if (Diff==0) {
- writeBits(HTDC[0]); // Diff might be 0
- } else {
- writeBits(HTDC[category[32767+Diff]]);
- writeBits(bitcode[32767+Diff]);
- }
- //Encode ACs
- var end0pos:int = 63;
- for (; (end0pos>0)&&(DU[end0pos]==0); end0pos--) {
- };
- //end0pos = first element in reverse order !=0
- if ( end0pos == 0) {
- writeBits(EOB);
- return DC;
- }
- i = 1;
- while ( i <= end0pos ) {
- var startpos:int = i;
- for (; (DU[i]==0) && (i<=end0pos); i++) {
- }
- var nrzeroes:int = i-startpos;
- if ( nrzeroes >= 16 ) {
- for (var nrmarker:int=1; nrmarker <= nrzeroes/16; nrmarker++) {
- writeBits(M16zeroes);
- }
- nrzeroes = int(nrzeroes&0xF);
- }
- writeBits(HTAC[nrzeroes*16+category[32767+DU[i]]]);
- writeBits(bitcode[32767+DU[i]]);
- i++;
- }
- if ( end0pos != 63 ) {
- writeBits(EOB);
- }
- return DC;
- }
-
- private var YDU:Array = new Array(64);
- private var UDU:Array = new Array(64);
- private var VDU:Array = new Array(64);
-
- private function RGB2YUV(img:BitmapData, xpos:int, ypos:int):void
- {
- var pos:int=0;
- for (var y:int=0; y<8; y++) {
- for (var x:int=0; x<8; x++) {
- var P:uint = img.getPixel32(xpos+x,ypos+y);
- var R:Number = Number((P>>16)&0xFF);
- var G:Number = Number((P>> 8)&0xFF);
- var B:Number = Number((P )&0xFF);
- YDU[pos]=((( 0.29900)*R+( 0.58700)*G+( 0.11400)*B))-128;
- UDU[pos]=(((-0.16874)*R+(-0.33126)*G+( 0.50000)*B));
- VDU[pos]=((( 0.50000)*R+(-0.41869)*G+(-0.08131)*B));
- pos++;
- }
- }
- }
-
- /**
- * Constructor for JPEGEncoder class
- *
- * @param quality The quality level between 1 and 100 that detrmines the
- * level of compression used in the generated JPEG
- * @langversion ActionScript 3.0
- * @playerversion Flash 9.0
- * @tiptext
- */
- public function JPGEncoder(quality:Number = 50)
- {
- if (quality <= 0) {
- quality = 1;
- }
- if (quality > 100) {
- quality = 100;
- }
- var sf:int = 0;
- if (quality < 50) {
- sf = int(5000 / quality);
- } else {
- sf = int(200 - quality*2);
- }
- // Create tables
- initHuffmanTbl();
- initCategoryNumber();
- initQuantTables(sf);
- }
-
- /**
- * Created a JPEG image from the specified BitmapData
- *
- * @param image The BitmapData that will be converted into the JPEG format.
- * @return a ByteArray representing the JPEG encoded image data.
- * @langversion ActionScript 3.0
- * @playerversion Flash 9.0
- * @tiptext
- */
- public function encode(image:BitmapData):ByteArray
- {
- // Initialize bit writer
- byteout = new ByteArray();
- bytenew=0;
- bytepos=7;
-
- // Add JPEG headers
- writeWord(0xFFD8); // SOI
- writeAPP0();
- writeDQT();
- writeSOF0(image.width,image.height);
- writeDHT();
- writeSOS();
-
-
- // Encode 8x8 macroblocks
- var DCY:Number=0;
- var DCU:Number=0;
- var DCV:Number=0;
- bytenew=0;
- bytepos=7;
- for (var ypos:int=0; ypos<image.height; ypos+=8) {
- for (var xpos:int=0; xpos<image.width; xpos+=8) {
- RGB2YUV(image, xpos, ypos);
- DCY = processDU(YDU, fdtbl_Y, DCY, YDC_HT, YAC_HT);
- DCU = processDU(UDU, fdtbl_UV, DCU, UVDC_HT, UVAC_HT);
- DCV = processDU(VDU, fdtbl_UV, DCV, UVDC_HT, UVAC_HT);
- }
- }
-
- // Do the bit alignment of the EOI marker
- if ( bytepos >= 0 ) {
- var fillbits:BitString = new BitString();
- fillbits.len = bytepos+1;
- fillbits.val = (1<<(bytepos+1))-1;
- writeBits(fillbits);
- }
-
- writeWord(0xFFD9); //EOI
- return byteout;
- }
- }
-}
+/*
+ Adobe Systems Incorporated(r) Source Code License Agreement
+ Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
+
+ Please read this Source Code License Agreement carefully before using
+ the source code.
+
+ Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
+ no-charge, royalty-free, irrevocable copyright license, to reproduce,
+ prepare derivative works of, publicly display, publicly perform, and
+ distribute this source code and such derivative works in source or
+ object code form without any attribution requirements.
+
+ The name "Adobe Systems Incorporated" must not be used to endorse or promote products
+ derived from the source code without prior written permission.
+
+ You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
+ against any loss, damage, claims or lawsuits, including attorney's
+ fees that arise or result from your use or distribution of the source
+ code.
+
+ THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
+ ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
+ BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
+ NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
+ OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+package com.adobe.images
+{
+ import flash.geom.*;
+ import flash.display.*;
+ import flash.utils.*;
+
+ /**
+ * Class that converts BitmapData into a valid JPEG
+ */
+ public class JPGEncoder
+ {
+
+ // Static table initialization
+
+ private var ZigZag:Array = [
+ 0, 1, 5, 6,14,15,27,28,
+ 2, 4, 7,13,16,26,29,42,
+ 3, 8,12,17,25,30,41,43,
+ 9,11,18,24,31,40,44,53,
+ 10,19,23,32,39,45,52,54,
+ 20,22,33,38,46,51,55,60,
+ 21,34,37,47,50,56,59,61,
+ 35,36,48,49,57,58,62,63
+ ];
+
+ private var YTable:Array = new Array(64);
+ private var UVTable:Array = new Array(64);
+ private var fdtbl_Y:Array = new Array(64);
+ private var fdtbl_UV:Array = new Array(64);
+
+ private function initQuantTables(sf:int):void
+ {
+ var i:int;
+ var t:Number;
+ var YQT:Array = [
+ 16, 11, 10, 16, 24, 40, 51, 61,
+ 12, 12, 14, 19, 26, 58, 60, 55,
+ 14, 13, 16, 24, 40, 57, 69, 56,
+ 14, 17, 22, 29, 51, 87, 80, 62,
+ 18, 22, 37, 56, 68,109,103, 77,
+ 24, 35, 55, 64, 81,104,113, 92,
+ 49, 64, 78, 87,103,121,120,101,
+ 72, 92, 95, 98,112,100,103, 99
+ ];
+ for (i = 0; i < 64; i++) {
+ t = Math.floor((YQT[i]*sf+50)/100);
+ if (t < 1) {
+ t = 1;
+ } else if (t > 255) {
+ t = 255;
+ }
+ YTable[ZigZag[i]] = t;
+ }
+ var UVQT:Array = [
+ 17, 18, 24, 47, 99, 99, 99, 99,
+ 18, 21, 26, 66, 99, 99, 99, 99,
+ 24, 26, 56, 99, 99, 99, 99, 99,
+ 47, 66, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99
+ ];
+ for (i = 0; i < 64; i++) {
+ t = Math.floor((UVQT[i]*sf+50)/100);
+ if (t < 1) {
+ t = 1;
+ } else if (t > 255) {
+ t = 255;
+ }
+ UVTable[ZigZag[i]] = t;
+ }
+ var aasf:Array = [
+ 1.0, 1.387039845, 1.306562965, 1.175875602,
+ 1.0, 0.785694958, 0.541196100, 0.275899379
+ ];
+ i = 0;
+ for (var row:int = 0; row < 8; row++)
+ {
+ for (var col:int = 0; col < 8; col++)
+ {
+ fdtbl_Y[i] = (1.0 / (YTable [ZigZag[i]] * aasf[row] * aasf[col] * 8.0));
+ fdtbl_UV[i] = (1.0 / (UVTable[ZigZag[i]] * aasf[row] * aasf[col] * 8.0));
+ i++;
+ }
+ }
+ }
+
+ private var YDC_HT:Array;
+ private var UVDC_HT:Array;
+ private var YAC_HT:Array;
+ private var UVAC_HT:Array;
+
+ private function computeHuffmanTbl(nrcodes:Array, std_table:Array):Array
+ {
+ var codevalue:int = 0;
+ var pos_in_table:int = 0;
+ var HT:Array = new Array();
+ for (var k:int=1; k<=16; k++) {
+ for (var j:int=1; j<=nrcodes[k]; j++) {
+ HT[std_table[pos_in_table]] = new BitString();
+ HT[std_table[pos_in_table]].val = codevalue;
+ HT[std_table[pos_in_table]].len = k;
+ pos_in_table++;
+ codevalue++;
+ }
+ codevalue*=2;
+ }
+ return HT;
+ }
+
+ private var std_dc_luminance_nrcodes:Array = [0,0,1,5,1,1,1,1,1,1,0,0,0,0,0,0,0];
+ private var std_dc_luminance_values:Array = [0,1,2,3,4,5,6,7,8,9,10,11];
+ private var std_ac_luminance_nrcodes:Array = [0,0,2,1,3,3,2,4,3,5,5,4,4,0,0,1,0x7d];
+ private var std_ac_luminance_values:Array = [
+ 0x01,0x02,0x03,0x00,0x04,0x11,0x05,0x12,
+ 0x21,0x31,0x41,0x06,0x13,0x51,0x61,0x07,
+ 0x22,0x71,0x14,0x32,0x81,0x91,0xa1,0x08,
+ 0x23,0x42,0xb1,0xc1,0x15,0x52,0xd1,0xf0,
+ 0x24,0x33,0x62,0x72,0x82,0x09,0x0a,0x16,
+ 0x17,0x18,0x19,0x1a,0x25,0x26,0x27,0x28,
+ 0x29,0x2a,0x34,0x35,0x36,0x37,0x38,0x39,
+ 0x3a,0x43,0x44,0x45,0x46,0x47,0x48,0x49,
+ 0x4a,0x53,0x54,0x55,0x56,0x57,0x58,0x59,
+ 0x5a,0x63,0x64,0x65,0x66,0x67,0x68,0x69,
+ 0x6a,0x73,0x74,0x75,0x76,0x77,0x78,0x79,
+ 0x7a,0x83,0x84,0x85,0x86,0x87,0x88,0x89,
+ 0x8a,0x92,0x93,0x94,0x95,0x96,0x97,0x98,
+ 0x99,0x9a,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,
+ 0xa8,0xa9,0xaa,0xb2,0xb3,0xb4,0xb5,0xb6,
+ 0xb7,0xb8,0xb9,0xba,0xc2,0xc3,0xc4,0xc5,
+ 0xc6,0xc7,0xc8,0xc9,0xca,0xd2,0xd3,0xd4,
+ 0xd5,0xd6,0xd7,0xd8,0xd9,0xda,0xe1,0xe2,
+ 0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,
+ 0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,
+ 0xf9,0xfa
+ ];
+
+ private var std_dc_chrominance_nrcodes:Array = [0,0,3,1,1,1,1,1,1,1,1,1,0,0,0,0,0];
+ private var std_dc_chrominance_values:Array = [0,1,2,3,4,5,6,7,8,9,10,11];
+ private var std_ac_chrominance_nrcodes:Array = [0,0,2,1,2,4,4,3,4,7,5,4,4,0,1,2,0x77];
+ private var std_ac_chrominance_values:Array = [
+ 0x00,0x01,0x02,0x03,0x11,0x04,0x05,0x21,
+ 0x31,0x06,0x12,0x41,0x51,0x07,0x61,0x71,
+ 0x13,0x22,0x32,0x81,0x08,0x14,0x42,0x91,
+ 0xa1,0xb1,0xc1,0x09,0x23,0x33,0x52,0xf0,
+ 0x15,0x62,0x72,0xd1,0x0a,0x16,0x24,0x34,
+ 0xe1,0x25,0xf1,0x17,0x18,0x19,0x1a,0x26,
+ 0x27,0x28,0x29,0x2a,0x35,0x36,0x37,0x38,
+ 0x39,0x3a,0x43,0x44,0x45,0x46,0x47,0x48,
+ 0x49,0x4a,0x53,0x54,0x55,0x56,0x57,0x58,
+ 0x59,0x5a,0x63,0x64,0x65,0x66,0x67,0x68,
+ 0x69,0x6a,0x73,0x74,0x75,0x76,0x77,0x78,
+ 0x79,0x7a,0x82,0x83,0x84,0x85,0x86,0x87,
+ 0x88,0x89,0x8a,0x92,0x93,0x94,0x95,0x96,
+ 0x97,0x98,0x99,0x9a,0xa2,0xa3,0xa4,0xa5,
+ 0xa6,0xa7,0xa8,0xa9,0xaa,0xb2,0xb3,0xb4,
+ 0xb5,0xb6,0xb7,0xb8,0xb9,0xba,0xc2,0xc3,
+ 0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xd2,
+ 0xd3,0xd4,0xd5,0xd6,0xd7,0xd8,0xd9,0xda,
+ 0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,
+ 0xea,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,
+ 0xf9,0xfa
+ ];
+
+ private function initHuffmanTbl():void
+ {
+ YDC_HT = computeHuffmanTbl(std_dc_luminance_nrcodes,std_dc_luminance_values);
+ UVDC_HT = computeHuffmanTbl(std_dc_chrominance_nrcodes,std_dc_chrominance_values);
+ YAC_HT = computeHuffmanTbl(std_ac_luminance_nrcodes,std_ac_luminance_values);
+ UVAC_HT = computeHuffmanTbl(std_ac_chrominance_nrcodes,std_ac_chrominance_values);
+ }
+
+ private var bitcode:Array = new Array(65535);
+ private var category:Array = new Array(65535);
+
+ private function initCategoryNumber():void
+ {
+ var nrlower:int = 1;
+ var nrupper:int = 2;
+ var nr:int;
+ for (var cat:int=1; cat<=15; cat++) {
+ //Positive numbers
+ for (nr=nrlower; nr<nrupper; nr++) {
+ category[32767+nr] = cat;
+ bitcode[32767+nr] = new BitString();
+ bitcode[32767+nr].len = cat;
+ bitcode[32767+nr].val = nr;
+ }
+ //Negative numbers
+ for (nr=-(nrupper-1); nr<=-nrlower; nr++) {
+ category[32767+nr] = cat;
+ bitcode[32767+nr] = new BitString();
+ bitcode[32767+nr].len = cat;
+ bitcode[32767+nr].val = nrupper-1+nr;
+ }
+ nrlower <<= 1;
+ nrupper <<= 1;
+ }
+ }
+
+ // IO functions
+
+ private var byteout:ByteArray;
+ private var bytenew:int = 0;
+ private var bytepos:int = 7;
+
+ private function writeBits(bs:BitString):void
+ {
+ var value:int = bs.val;
+ var posval:int = bs.len-1;
+ while ( posval >= 0 ) {
+ if (value & uint(1 << posval) ) {
+ bytenew |= uint(1 << bytepos);
+ }
+ posval--;
+ bytepos--;
+ if (bytepos < 0) {
+ if (bytenew == 0xFF) {
+ writeByte(0xFF);
+ writeByte(0);
+ }
+ else {
+ writeByte(bytenew);
+ }
+ bytepos=7;
+ bytenew=0;
+ }
+ }
+ }
+
+ private function writeByte(value:int):void
+ {
+ byteout.writeByte(value);
+ }
+
+ private function writeWord(value:int):void
+ {
+ writeByte((value>>8)&0xFF);
+ writeByte((value )&0xFF);
+ }
+
+ // DCT & quantization core
+
+ private function fDCTQuant(data:Array, fdtbl:Array):Array
+ {
+ var tmp0:Number, tmp1:Number, tmp2:Number, tmp3:Number, tmp4:Number, tmp5:Number, tmp6:Number, tmp7:Number;
+ var tmp10:Number, tmp11:Number, tmp12:Number, tmp13:Number;
+ var z1:Number, z2:Number, z3:Number, z4:Number, z5:Number, z11:Number, z13:Number;
+ var i:int;
+ /* Pass 1: process rows. */
+ var dataOff:int=0;
+ for (i=0; i<8; i++) {
+ tmp0 = data[dataOff+0] + data[dataOff+7];
+ tmp7 = data[dataOff+0] - data[dataOff+7];
+ tmp1 = data[dataOff+1] + data[dataOff+6];
+ tmp6 = data[dataOff+1] - data[dataOff+6];
+ tmp2 = data[dataOff+2] + data[dataOff+5];
+ tmp5 = data[dataOff+2] - data[dataOff+5];
+ tmp3 = data[dataOff+3] + data[dataOff+4];
+ tmp4 = data[dataOff+3] - data[dataOff+4];
+
+ /* Even part */
+ tmp10 = tmp0 + tmp3; /* phase 2 */
+ tmp13 = tmp0 - tmp3;
+ tmp11 = tmp1 + tmp2;
+ tmp12 = tmp1 - tmp2;
+
+ data[dataOff+0] = tmp10 + tmp11; /* phase 3 */
+ data[dataOff+4] = tmp10 - tmp11;
+
+ z1 = (tmp12 + tmp13) * 0.707106781; /* c4 */
+ data[dataOff+2] = tmp13 + z1; /* phase 5 */
+ data[dataOff+6] = tmp13 - z1;
+
+ /* Odd part */
+ tmp10 = tmp4 + tmp5; /* phase 2 */
+ tmp11 = tmp5 + tmp6;
+ tmp12 = tmp6 + tmp7;
+
+ /* The rotator is modified from fig 4-8 to avoid extra negations. */
+ z5 = (tmp10 - tmp12) * 0.382683433; /* c6 */
+ z2 = 0.541196100 * tmp10 + z5; /* c2-c6 */
+ z4 = 1.306562965 * tmp12 + z5; /* c2+c6 */
+ z3 = tmp11 * 0.707106781; /* c4 */
+
+ z11 = tmp7 + z3; /* phase 5 */
+ z13 = tmp7 - z3;
+
+ data[dataOff+5] = z13 + z2; /* phase 6 */
+ data[dataOff+3] = z13 - z2;
+ data[dataOff+1] = z11 + z4;
+ data[dataOff+7] = z11 - z4;
+
+ dataOff += 8; /* advance pointer to next row */
+ }
+
+ /* Pass 2: process columns. */
+ dataOff = 0;
+ for (i=0; i<8; i++) {
+ tmp0 = data[dataOff+ 0] + data[dataOff+56];
+ tmp7 = data[dataOff+ 0] - data[dataOff+56];
+ tmp1 = data[dataOff+ 8] + data[dataOff+48];
+ tmp6 = data[dataOff+ 8] - data[dataOff+48];
+ tmp2 = data[dataOff+16] + data[dataOff+40];
+ tmp5 = data[dataOff+16] - data[dataOff+40];
+ tmp3 = data[dataOff+24] + data[dataOff+32];
+ tmp4 = data[dataOff+24] - data[dataOff+32];
+
+ /* Even part */
+ tmp10 = tmp0 + tmp3; /* phase 2 */
+ tmp13 = tmp0 - tmp3;
+ tmp11 = tmp1 + tmp2;
+ tmp12 = tmp1 - tmp2;
+
+ data[dataOff+ 0] = tmp10 + tmp11; /* phase 3 */
+ data[dataOff+32] = tmp10 - tmp11;
+
+ z1 = (tmp12 + tmp13) * 0.707106781; /* c4 */
+ data[dataOff+16] = tmp13 + z1; /* phase 5 */
+ data[dataOff+48] = tmp13 - z1;
+
+ /* Odd part */
+ tmp10 = tmp4 + tmp5; /* phase 2 */
+ tmp11 = tmp5 + tmp6;
+ tmp12 = tmp6 + tmp7;
+
+ /* The rotator is modified from fig 4-8 to avoid extra negations. */
+ z5 = (tmp10 - tmp12) * 0.382683433; /* c6 */
+ z2 = 0.541196100 * tmp10 + z5; /* c2-c6 */
+ z4 = 1.306562965 * tmp12 + z5; /* c2+c6 */
+ z3 = tmp11 * 0.707106781; /* c4 */
+
+ z11 = tmp7 + z3; /* phase 5 */
+ z13 = tmp7 - z3;
+
+ data[dataOff+40] = z13 + z2; /* phase 6 */
+ data[dataOff+24] = z13 - z2;
+ data[dataOff+ 8] = z11 + z4;
+ data[dataOff+56] = z11 - z4;
+
+ dataOff++; /* advance pointer to next column */
+ }
+
+ // Quantize/descale the coefficients
+ for (i=0; i<64; i++) {
+ // Apply the quantization and scaling factor & Round to nearest integer
+ data[i] = Math.round((data[i]*fdtbl[i]));
+ }
+ return data;
+ }
+
+ // Chunk writing
+
+ private function writeAPP0():void
+ {
+ writeWord(0xFFE0); // marker
+ writeWord(16); // length
+ writeByte(0x4A); // J
+ writeByte(0x46); // F
+ writeByte(0x49); // I
+ writeByte(0x46); // F
+ writeByte(0); // = "JFIF",'\0'
+ writeByte(1); // versionhi
+ writeByte(1); // versionlo
+ writeByte(0); // xyunits
+ writeWord(1); // xdensity
+ writeWord(1); // ydensity
+ writeByte(0); // thumbnwidth
+ writeByte(0); // thumbnheight
+ }
+
+ private function writeSOF0(width:int, height:int):void
+ {
+ writeWord(0xFFC0); // marker
+ writeWord(17); // length, truecolor YUV JPG
+ writeByte(8); // precision
+ writeWord(height);
+ writeWord(width);
+ writeByte(3); // nrofcomponents
+ writeByte(1); // IdY
+ writeByte(0x11); // HVY
+ writeByte(0); // QTY
+ writeByte(2); // IdU
+ writeByte(0x11); // HVU
+ writeByte(1); // QTU
+ writeByte(3); // IdV
+ writeByte(0x11); // HVV
+ writeByte(1); // QTV
+ }
+
+ private function writeDQT():void
+ {
+ writeWord(0xFFDB); // marker
+ writeWord(132); // length
+ writeByte(0);
+ var i:int;
+ for (i=0; i<64; i++) {
+ writeByte(YTable[i]);
+ }
+ writeByte(1);
+ for (i=0; i<64; i++) {
+ writeByte(UVTable[i]);
+ }
+ }
+
+ private function writeDHT():void
+ {
+ writeWord(0xFFC4); // marker
+ writeWord(0x01A2); // length
+ var i:int;
+
+ writeByte(0); // HTYDCinfo
+ for (i=0; i<16; i++) {
+ writeByte(std_dc_luminance_nrcodes[i+1]);
+ }
+ for (i=0; i<=11; i++) {
+ writeByte(std_dc_luminance_values[i]);
+ }
+
+ writeByte(0x10); // HTYACinfo
+ for (i=0; i<16; i++) {
+ writeByte(std_ac_luminance_nrcodes[i+1]);
+ }
+ for (i=0; i<=161; i++) {
+ writeByte(std_ac_luminance_values[i]);
+ }
+
+ writeByte(1); // HTUDCinfo
+ for (i=0; i<16; i++) {
+ writeByte(std_dc_chrominance_nrcodes[i+1]);
+ }
+ for (i=0; i<=11; i++) {
+ writeByte(std_dc_chrominance_values[i]);
+ }
+
+ writeByte(0x11); // HTUACinfo
+ for (i=0; i<16; i++) {
+ writeByte(std_ac_chrominance_nrcodes[i+1]);
+ }
+ for (i=0; i<=161; i++) {
+ writeByte(std_ac_chrominance_values[i]);
+ }
+ }
+
+ private function writeSOS():void
+ {
+ writeWord(0xFFDA); // marker
+ writeWord(12); // length
+ writeByte(3); // nrofcomponents
+ writeByte(1); // IdY
+ writeByte(0); // HTY
+ writeByte(2); // IdU
+ writeByte(0x11); // HTU
+ writeByte(3); // IdV
+ writeByte(0x11); // HTV
+ writeByte(0); // Ss
+ writeByte(0x3f); // Se
+ writeByte(0); // Bf
+ }
+
+ // Core processing
+ private var DU:Array = new Array(64);
+
+ private function processDU(CDU:Array, fdtbl:Array, DC:Number, HTDC:Array, HTAC:Array):Number
+ {
+ var EOB:BitString = HTAC[0x00];
+ var M16zeroes:BitString = HTAC[0xF0];
+ var i:int;
+
+ var DU_DCT:Array = fDCTQuant(CDU, fdtbl);
+ //ZigZag reorder
+ for (i=0;i<64;i++) {
+ DU[ZigZag[i]]=DU_DCT[i];
+ }
+ var Diff:int = DU[0] - DC; DC = DU[0];
+ //Encode DC
+ if (Diff==0) {
+ writeBits(HTDC[0]); // Diff might be 0
+ } else {
+ writeBits(HTDC[category[32767+Diff]]);
+ writeBits(bitcode[32767+Diff]);
+ }
+ //Encode ACs
+ var end0pos:int = 63;
+ for (; (end0pos>0)&&(DU[end0pos]==0); end0pos--) {
+ };
+ //end0pos = first element in reverse order !=0
+ if ( end0pos == 0) {
+ writeBits(EOB);
+ return DC;
+ }
+ i = 1;
+ while ( i <= end0pos ) {
+ var startpos:int = i;
+ for (; (DU[i]==0) && (i<=end0pos); i++) {
+ }
+ var nrzeroes:int = i-startpos;
+ if ( nrzeroes >= 16 ) {
+ for (var nrmarker:int=1; nrmarker <= nrzeroes/16; nrmarker++) {
+ writeBits(M16zeroes);
+ }
+ nrzeroes = int(nrzeroes&0xF);
+ }
+ writeBits(HTAC[nrzeroes*16+category[32767+DU[i]]]);
+ writeBits(bitcode[32767+DU[i]]);
+ i++;
+ }
+ if ( end0pos != 63 ) {
+ writeBits(EOB);
+ }
+ return DC;
+ }
+
+ private var YDU:Array = new Array(64);
+ private var UDU:Array = new Array(64);
+ private var VDU:Array = new Array(64);
+
+ private function RGB2YUV(img:BitmapData, xpos:int, ypos:int):void
+ {
+ var pos:int=0;
+ for (var y:int=0; y<8; y++) {
+ for (var x:int=0; x<8; x++) {
+ var P:uint = img.getPixel32(xpos+x,ypos+y);
+ var R:Number = Number((P>>16)&0xFF);
+ var G:Number = Number((P>> 8)&0xFF);
+ var B:Number = Number((P )&0xFF);
+ YDU[pos]=((( 0.29900)*R+( 0.58700)*G+( 0.11400)*B))-128;
+ UDU[pos]=(((-0.16874)*R+(-0.33126)*G+( 0.50000)*B));
+ VDU[pos]=((( 0.50000)*R+(-0.41869)*G+(-0.08131)*B));
+ pos++;
+ }
+ }
+ }
+
+ /**
+ * Constructor for JPEGEncoder class
+ *
+ * @param quality The quality level between 1 and 100 that detrmines the
+ * level of compression used in the generated JPEG
+ * @langversion ActionScript 3.0
+ * @playerversion Flash 9.0
+ * @tiptext
+ */
+ public function JPGEncoder(quality:Number = 50)
+ {
+ if (quality <= 0) {
+ quality = 1;
+ }
+ if (quality > 100) {
+ quality = 100;
+ }
+ var sf:int = 0;
+ if (quality < 50) {
+ sf = int(5000 / quality);
+ } else {
+ sf = int(200 - quality*2);
+ }
+ // Create tables
+ initHuffmanTbl();
+ initCategoryNumber();
+ initQuantTables(sf);
+ }
+
+ /**
+ * Created a JPEG image from the specified BitmapData
+ *
+ * @param image The BitmapData that will be converted into the JPEG format.
+ * @return a ByteArray representing the JPEG encoded image data.
+ * @langversion ActionScript 3.0
+ * @playerversion Flash 9.0
+ * @tiptext
+ */
+ public function encode(image:BitmapData):ByteArray
+ {
+ // Initialize bit writer
+ byteout = new ByteArray();
+ bytenew=0;
+ bytepos=7;
+
+ // Add JPEG headers
+ writeWord(0xFFD8); // SOI
+ writeAPP0();
+ writeDQT();
+ writeSOF0(image.width,image.height);
+ writeDHT();
+ writeSOS();
+
+
+ // Encode 8x8 macroblocks
+ var DCY:Number=0;
+ var DCU:Number=0;
+ var DCV:Number=0;
+ bytenew=0;
+ bytepos=7;
+ for (var ypos:int=0; ypos<image.height; ypos+=8) {
+ for (var xpos:int=0; xpos<image.width; xpos+=8) {
+ RGB2YUV(image, xpos, ypos);
+ DCY = processDU(YDU, fdtbl_Y, DCY, YDC_HT, YAC_HT);
+ DCU = processDU(UDU, fdtbl_UV, DCU, UVDC_HT, UVAC_HT);
+ DCV = processDU(VDU, fdtbl_UV, DCV, UVDC_HT, UVAC_HT);
+ }
+ }
+
+ // Do the bit alignment of the EOI marker
+ if ( bytepos >= 0 ) {
+ var fillbits:BitString = new BitString();
+ fillbits.len = bytepos+1;
+ fillbits.val = (1<<(bytepos+1))-1;
+ writeBits(fillbits);
+ }
+
+ writeWord(0xFFD9); //EOI
+ return byteout;
+ }
+ }
+}
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/images/PNGEncoder.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/images/PNGEncoder.as
similarity index 93%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/images/PNGEncoder.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/images/PNGEncoder.as
index bb864446b007..ab854ccc6706 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/images/PNGEncoder.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/images/PNGEncoder.as
@@ -1,34 +1,34 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
- Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
+
+ Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
- distribute this source code and such derivative works in source or
- object code form without any attribution requirements.
-
+ distribute this source code and such derivative works in source or
+ object code form without any attribution requirements.
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
- against any loss, damage, claims or lawsuits, including attorney's
- fees that arise or result from your use or distribution of the source
+ against any loss, damage, claims or lawsuits, including attorney's
+ fees that arise or result from your use or distribution of the source
code.
-
- THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
+
+ THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
@@ -41,7 +41,7 @@ package com.adobe.images
/**
* Class that converts BitmapData into a valid PNG
- */
+ */
public class PNGEncoder
{
/**
@@ -52,7 +52,7 @@ package com.adobe.images
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
* @tiptext
- */
+ */
public static function encode(img:BitmapData):ByteArray {
// Create output byte array
var png:ByteArray = new ByteArray();
@@ -95,11 +95,11 @@ package com.adobe.images
// return PNG
return png;
}
-
+
private static var crcTable:Array;
private static var crcTableComputed:Boolean = false;
-
- private static function writeChunk(png:ByteArray,
+
+ private static function writeChunk(png:ByteArray,
type:uint, data:ByteArray):void {
if (!crcTableComputed) {
crcTableComputed = true;
@@ -109,7 +109,7 @@ package com.adobe.images
c = n;
for (var k:uint = 0; k < 8; k++) {
if (c & 1) {
- c = uint(uint(0xedb88320) ^
+ c = uint(uint(0xedb88320) ^
uint(c >>> 1));
} else {
c = uint(c >>> 1);
@@ -133,7 +133,7 @@ package com.adobe.images
c = 0xffffffff;
for (var i:int = 0; i < (e-p); i++) {
c = uint(crcTable[
- (c ^ png.readUnsignedByte()) &
+ (c ^ png.readUnsignedByte()) &
uint(0xff)] ^ uint(c >>> 8));
}
c = uint(c^uint(0xffffffff));
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/net/DynamicURLLoader.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/net/DynamicURLLoader.as
similarity index 90%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/net/DynamicURLLoader.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/net/DynamicURLLoader.as
index 9b16a610699c..ffed0df27d35 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/net/DynamicURLLoader.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/net/DynamicURLLoader.as
@@ -1,34 +1,34 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
- Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
+
+ Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
- distribute this source code and such derivative works in source or
- object code form without any attribution requirements.
-
+ distribute this source code and such derivative works in source or
+ object code form without any attribution requirements.
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
- against any loss, damage, claims or lawsuits, including attorney's
- fees that arise or result from your use or distribution of the source
+ against any loss, damage, claims or lawsuits, including attorney's
+ fees that arise or result from your use or distribution of the source
code.
-
- THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
+
+ THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
@@ -39,16 +39,16 @@ package com.adobe.net
/**
* Class that provides a dynamic implimentation of the URLLoader class.
- *
+ *
* This class provides no API implimentations. However, since the class is
* declared as dynamic, it can be used in place of URLLoader, and allow
* you to dynamically attach properties to it (which URLLoader does not allow).
- *
+ *
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
* @tiptext
- */
- public dynamic class DynamicURLLoader extends URLLoader
+ */
+ public dynamic class DynamicURLLoader extends URLLoader
{
public function DynamicURLLoader()
{
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/net/IURIResolver.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/net/IURIResolver.as
similarity index 94%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/net/IURIResolver.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/net/IURIResolver.as
index 658a95abfa00..4b8a2c29968e 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/net/IURIResolver.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/net/IURIResolver.as
@@ -1,34 +1,34 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
- Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
+
+ Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
- distribute this source code and such derivative works in source or
- object code form without any attribution requirements.
-
+ distribute this source code and such derivative works in source or
+ object code form without any attribution requirements.
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
- against any loss, damage, claims or lawsuits, including attorney's
- fees that arise or result from your use or distribution of the source
+ against any loss, damage, claims or lawsuits, including attorney's
+ fees that arise or result from your use or distribution of the source
code.
-
- THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
+
+ THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
@@ -41,27 +41,27 @@ package com.adobe.net
* an implementation of this interface to resolve the URI before the
* URI class makes any comparisons. For example, a web host has
* two aliases:
- *
+ *
* <p><code>
* http://www.site.com/
* http://www.site.net/
* </code></p>
- *
+ *
* <p>The application can provide an implementation that automatically
* resolves site.net to site.com before URI compares two URI objects.
* Only the application can know and understand the context in which
* the URI's are being used.</p>
- *
+ *
* <p>Use the URI.resolver accessor to assign a custom resolver to
* the URI class. Any resolver specified is global to all instances
* of URI.</p>
- *
+ *
* <p>URI will call this before performing URI comparisons in the
* URI.getRelation() and URI.getCommonParent() functions.
- *
+ *
* @see URI.getRelation
* @see URI.getCommonParent
- *
+ *
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
*/
@@ -70,7 +70,7 @@ package com.adobe.net
/**
* Implement this method to provide custom URI resolution for
* your application.
- *
+ *
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
*/
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/net/MimeTypeMap.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/net/MimeTypeMap.as
similarity index 99%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/net/MimeTypeMap.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/net/MimeTypeMap.as
index b788b6c6e1c7..43ad9c1ff544 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/net/MimeTypeMap.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/net/MimeTypeMap.as
@@ -30,7 +30,7 @@ package com.adobe.net
{
public class MimeTypeMap
{
- private var types:Array =
+ private var types:Array =
[["application/andrew-inset","ez"],
["application/atom+xml","atom"],
["application/mac-binhex40","hqx"],
@@ -141,7 +141,7 @@ package com.adobe.net
["video/x-msvideo","avi"],
["video/x-sgi-movie","movie"],
["x-conference/x-cooltalk","ice"]];
-
+
/**
* Returns the mimetype for the given extension.
*/
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/net/URI.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/net/URI.as
similarity index 97%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/net/URI.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/net/URI.as
index b6e230ec0174..14cd1025ff53 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/net/URI.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/net/URI.as
@@ -1,24 +1,24 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
+
Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
distribute this source code and such derivative works in source or
object code form without any attribution requirements.
-
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
against any loss, damage, claims or lawsuits, including attorney's
fees that arise or result from your use or distribution of the source
code.
-
+
THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -36,13 +36,13 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
package com.adobe.net
{
import flash.utils.ByteArray;
-
+
/**
* This class implements functions and utilities for working with URI's
* (Universal Resource Identifiers). For technical description of the
* URI syntax, please see RFC 3986 at http://www.ietf.org/rfc/rfc3986.txt
* or do a web search for "rfc 3986".
- *
+ *
* <p>The most important aspect of URI's to understand is that URI's
* and URL's are not strings. URI's are complex data structures that
* encapsulate many pieces of information. The string version of a
@@ -50,30 +50,30 @@ package com.adobe.net
* string serialization is used to provide a human readable
* representation and a means to transport the data over the network
* where it can then be parsed back into its' component parts.</p>
- *
+ *
* <p>URI's fall into one of three categories:
* <ul>
* <li><scheme>:<scheme-specific-part>#<fragment> (non-hierarchical)</li>
* <li><scheme>:<authority><path>?<query>#<fragment> (hierarchical)</li>
* <li><path>?<query>#<fragment> (relative hierarchical)</li>
* </ul></p>
- *
+ *
* <p>The query and fragment parts are optional.</p>
- *
+ *
* <p>This class supports both non-hierarchical and hierarchical URI's</p>
- *
+ *
* <p>This class is intended to be used "as-is" for the vast majority
* of common URI's. However, if your application requires a custom
* URI syntax (e.g. custom query syntax or special handling of
* non-hierarchical URI's), this class can be fully subclassed. If you
* intended to subclass URI, please see the source code for complete
* documation on protected members and protected fuctions.</p>
- *
+ *
* @langversion ActionScript 3.0
- * @playerversion Flash 9.0
+ * @playerversion Flash 9.0
*/
public class URI
- {
+ {
// Here we define which characters must be escaped for each
// URI part. The characters that must be escaped for each
// part differ depending on what would cause ambiguous parsing.
@@ -81,81 +81,81 @@ package com.adobe.net
// encoded when they would conflict with subcomponent delimiters.
// We don't want to over-do the escaping. We only want to escape
// the minimum needed to prevent parsing problems.
-
+
// space and % must be escaped in all cases. '%' is the delimiter
// for escaped characters.
public static const URImustEscape:String = " %";
-
+
// Baseline of what characters must be escaped
public static const URIbaselineEscape:String = URImustEscape + ":?#/@";
-
+
// Characters that must be escaped in the part part.
public static const URIpathEscape:String = URImustEscape + "?#";
-
+
// Characters that must be escaped in the query part, if setting
// the query as a whole string. If the query is set by
// name/value, URIqueryPartEscape is used instead.
public static const URIqueryEscape:String = URImustEscape + "#";
-
+
// This is what each name/value pair must escape "&=" as well
// so they don't conflict with the "param=value¶m2=value2"
// syntax.
public static const URIqueryPartEscape:String = URImustEscape + "#&=";
-
+
// Non-hierarchical URI's can have query and fragment parts, but
// we also want to prevent '/' otherwise it might end up looking
// like a hierarchical URI to the parser.
public static const URInonHierEscape:String = URImustEscape + "?#/";
-
+
// Baseline uninitialized setting for the URI scheme.
public static const UNKNOWN_SCHEME:String = "unknown";
-
+
// The following bitmaps are used for performance enhanced
// character escaping.
-
+
// Baseline characters that need to be escaped. Many parts use
// this.
protected static const URIbaselineExcludedBitmap:URIEncodingBitmap =
new URIEncodingBitmap(URIbaselineEscape);
-
+
// Scheme escaping bitmap
- protected static const URIschemeExcludedBitmap:URIEncodingBitmap =
+ protected static const URIschemeExcludedBitmap:URIEncodingBitmap =
URIbaselineExcludedBitmap;
-
+
// User/pass escaping bitmap
protected static const URIuserpassExcludedBitmap:URIEncodingBitmap =
URIbaselineExcludedBitmap;
-
+
// Authority escaping bitmap
protected static const URIauthorityExcludedBitmap:URIEncodingBitmap =
URIbaselineExcludedBitmap;
-
+
// Port escaping bitmap
- protected static const URIportExludedBitmap:URIEncodingBitmap =
+ protected static const URIportExludedBitmap:URIEncodingBitmap =
URIbaselineExcludedBitmap;
-
+
// Path escaping bitmap
protected static const URIpathExcludedBitmap:URIEncodingBitmap =
- new URIEncodingBitmap(URIpathEscape);
-
+ new URIEncodingBitmap(URIpathEscape);
+
// Query (whole) escaping bitmap
protected static const URIqueryExcludedBitmap:URIEncodingBitmap =
new URIEncodingBitmap(URIqueryEscape);
-
+
// Query (individual parts) escaping bitmap
protected static const URIqueryPartExcludedBitmap:URIEncodingBitmap =
new URIEncodingBitmap(URIqueryPartEscape);
-
+
// Fragments are the last part in the URI. They only need to
// escape space, '#', and '%'. Turns out that is what query
// uses too.
protected static const URIfragmentExcludedBitmap:URIEncodingBitmap =
URIqueryExcludedBitmap;
-
+
// Characters that need to be escaped in the non-hierarchical part
protected static const URInonHierexcludedBitmap:URIEncodingBitmap =
new URIEncodingBitmap(URInonHierEscape);
-
+
// Values used by getRelation()
public static const NOT_RELATED:int = 0;
public static const CHILD:int = 1;
@@ -183,7 +183,7 @@ package com.adobe.net
* URI Constructor. If no string is given, this will initialize
* this URI object to a blank URI.
*/
- public function URI(uri:String = null) : void
+ public function URI(uri:String = null) : void
{
if (uri == null)
initialize();
@@ -191,7 +191,7 @@ package com.adobe.net
constructURI(uri);
}
-
+
/**
* @private
* Method that loads the URI from the given string.
@@ -200,11 +200,11 @@ package com.adobe.net
{
if (!parseURI(uri))
_valid = false;
-
+
return isValid();
}
-
-
+
+
/**
* @private Private initializiation.
*/
@@ -212,7 +212,7 @@ package com.adobe.net
{
_valid = false;
_relative = false;
-
+
_scheme = UNKNOWN_SCHEME;
_authority = "";
_username = "";
@@ -221,10 +221,10 @@ package com.adobe.net
_path = "";
_query = "";
_fragment = "";
-
+
_nonHierarchical = "";
- }
-
+ }
+
/**
* @private Accessor to explicitly set/get the hierarchical
* state of the URI.
@@ -235,13 +235,13 @@ package com.adobe.net
{
// Clear the non-hierarchical data
_nonHierarchical = "";
-
+
// Also set the state vars while we are at it
if (_scheme == "" || _scheme == UNKNOWN_SCHEME)
_relative = true;
else
_relative = false;
-
+
if (_authority.length == 0 && _path.length == 0)
_valid = false;
else
@@ -255,9 +255,9 @@ package com.adobe.net
_password = "";
_port = "";
_path = "";
-
+
_relative = false;
-
+
if (_scheme == "" || _scheme == UNKNOWN_SCHEME)
_valid = false;
else
@@ -268,8 +268,8 @@ package com.adobe.net
{
return (_nonHierarchical.length == 0);
}
-
-
+
+
/**
* @private Functions that performs some basic consistency validation.
*/
@@ -286,7 +286,7 @@ package com.adobe.net
else if (verifyAlpha(_scheme) == false)
return false; // Scheme contains bad characters
}
-
+
if (hierState)
{
if (_path.search('\\') != -1)
@@ -299,12 +299,12 @@ package com.adobe.net
if (_nonHierarchical.search('\\') != -1)
return false; // some kind of local path
}
-
+
// Looks like it's ok.
return true;
}
-
-
+
+
/**
* @private
*
@@ -313,7 +313,7 @@ package com.adobe.net
* <scheme>:<authority><path>?<query>#<fragment>
*
* For simplicity, we parse the URI in the following order:
- *
+ *
* 1. Fragment (anchors)
* 2. Query (CGI stuff)
* 3. Scheme ("http")
@@ -328,7 +328,7 @@ package com.adobe.net
* them out first removes a large chance of parsing errors. This
* method expects well formed URI's, but performing the parse in
* this order makes us a little more tolerant of user error.
- *
+ *
* REGEXP
* Why doesn't this use regular expressions to parse the URI? We
* have found that in a real world scenario, URI's are not always
@@ -352,17 +352,17 @@ package com.adobe.net
* - absolute hierarchical (e.g. "http://something.com/index.html),
* - relative hierarchical (e.g. "../images/flower.gif"), or
* - non-hierarchical URIs (e.g. "mailto:jsmith@fungoo.com").
- *
+ *
* Anything else will probably result in a parsing error, or a bogus
* URI object.
- *
+ *
* Note that non-hierarchical URIs *MUST* have a scheme, otherwise
* they will be mistaken for relative URI's.
- *
+ *
* If you are not sure what is being passed to you (like manually
* entered text from UI), you can construct a blank URI object and
* call unknownToURI() passing in the unknown string.
- *
+ *
* @return true if successful, false if there was some kind of
* parsing error
*/
@@ -370,47 +370,47 @@ package com.adobe.net
{
var baseURI:String = uri;
var index:int, index2:int;
-
+
// Make sure this object is clean before we start. If it was used
// before and we are now parsing a new URI, we don't want any stale
// info lying around.
initialize();
-
+
// Remove any fragments (anchors) from the URI
index = baseURI.indexOf("#");
if (index != -1)
{
// Store the fragment piece if any
if (baseURI.length > (index + 1)) // +1 is to skip the '#'
- _fragment = baseURI.substr(index + 1, baseURI.length - (index + 1));
-
+ _fragment = baseURI.substr(index + 1, baseURI.length - (index + 1));
+
// Trim off the fragment
baseURI = baseURI.substr(0, index);
}
-
+
// We need to strip off any CGI parameters (eg '?param=bob')
index = baseURI.indexOf("?");
if (index != -1)
{
if (baseURI.length > (index + 1))
_query = baseURI.substr(index + 1, baseURI.length - (index + 1)); // +1 is to skip the '?'
-
+
// Trim off the query
baseURI = baseURI.substr(0, index);
}
-
+
// Now try to find the scheme part
index = baseURI.search(':');
index2 = baseURI.search('/');
-
+
var containsColon:Boolean = (index != -1);
var containsSlash:Boolean = (index2 != -1);
-
+
// This value is indeterminate if "containsColon" is false.
// (if there is no colon, does the slash come before or
// after said non-existing colon?)
var colonBeforeSlash:Boolean = (!containsSlash || index < index2);
-
+
// If it has a colon and it's before the first slash, we will treat
// it as a scheme. If a slash is before a colon, there must be a
// stray colon in a path or something. In which case, the colon is
@@ -421,17 +421,17 @@ package com.adobe.net
{
// We found a scheme
_scheme = baseURI.substr(0, index);
-
+
// Normalize the scheme
_scheme = _scheme.toLowerCase();
-
+
baseURI = baseURI.substr(index + 1);
-
+
if (baseURI.substr(0, 2) == "//")
{
// This is a hierarchical URI
_nonHierarchical = "";
-
+
// Trim off the "//"
baseURI = baseURI.substr(2, baseURI.length - 2);
}
@@ -439,10 +439,10 @@ package com.adobe.net
{
// This is a non-hierarchical URI like "mailto:bob@mail.com"
_nonHierarchical = baseURI;
-
+
if ((_valid = validateURI()) == false)
initialize(); // Bad URI. Clear it.
-
+
// No more parsing to do for this case
return isValid();
}
@@ -454,12 +454,12 @@ package com.adobe.net
_relative = true;
_nonHierarchical = "";
}
-
+
// Ok, what we have left is everything after the <scheme>://
-
+
// Now that we have stripped off any query and fragment parts, we
// need to split the authority from the path
-
+
if (isRelative())
{
// Don't bother looking for the authority. It's a relative URI
@@ -481,7 +481,7 @@ package com.adobe.net
while(baseURI.charAt(0) == "/")
baseURI = baseURI.substr(1, baseURI.length - 1);
}
-
+
index = baseURI.search('/');
if (index == -1)
{
@@ -494,7 +494,7 @@ package com.adobe.net
_authority = baseURI.substr(0, index);
_path = baseURI.substr(index, baseURI.length - index);
}
-
+
// Check to see if the URI has any username or password information.
// For example: ftp://username:password@server.com
index = _authority.search('@');
@@ -502,10 +502,10 @@ package com.adobe.net
{
// We have a username and possibly a password
_username = _authority.substr(0, index);
-
+
// Remove the username/password from the authority
_authority = _authority.substr(index + 1); // Skip the '@'
-
+
// Now check to see if the username also has a password
index = _username.search(':');
if (index != -1)
@@ -521,7 +521,7 @@ package com.adobe.net
_username = "";
_password = "";
}
-
+
// Lastly, check to see if the authorty has a port number.
// This is parsed after the username/password to avoid conflicting
// with the ':' in the 'username:password' if one exists.
@@ -535,19 +535,19 @@ package com.adobe.net
{
_port = "";
}
-
+
// Lastly, normalize the authority. Domain names
// are case insensitive.
_authority = _authority.toLowerCase();
}
-
+
if ((_valid = validateURI()) == false)
initialize(); // Bad URI. Clear it
-
+
return isValid();
}
-
-
+
+
/********************************************************************
* Copy function.
*/
@@ -562,12 +562,12 @@ package com.adobe.net
this._query = uri._query;
this._fragment = uri._fragment;
this._nonHierarchical = uri._nonHierarchical;
-
+
this._valid = uri._valid;
this._relative = uri._relative;
}
-
-
+
+
/**
* @private
* Checks if the given string only contains a-z or A-Z.
@@ -576,39 +576,39 @@ package com.adobe.net
{
var pattern:RegExp = /[^a-z]/;
var index:int;
-
+
str = str.toLowerCase();
index = str.search(pattern);
-
+
if (index == -1)
return true;
else
return false;
}
-
+
/**
* Is this a valid URI?
- *
+ *
* @return true if this object represents a valid URI, false
* otherwise.
*/
public function isValid() : Boolean
- {
+ {
return this._valid;
}
-
-
+
+
/**
* Is this URI an absolute URI? An absolute URI is a complete, fully
* qualified reference to a resource. e.g. http://site.com/index.htm
* Non-hierarchical URI's are always absolute.
*/
public function isAbsolute() : Boolean
- {
+ {
return !this._relative;
}
-
-
+
+
/**
* Is this URI a relative URI? Relative URI's do not have a scheme
* and only contain a relative path with optional anchor and query
@@ -616,20 +616,20 @@ package com.adobe.net
* will never be relative.
*/
public function isRelative() : Boolean
- {
+ {
return this._relative;
}
-
-
+
+
/**
* Does this URI point to a resource that is a directory/folder?
* The URI specification dictates that any path that ends in a slash
* is a directory. This is needed to be able to perform correct path
* logic when combining relative URI's with absolute URI's to
* obtain the correct absolute URI to a resource.
- *
+ *
* @see URI.chdir
- *
+ *
* @return true if this URI represents a directory resource, false
* if this URI represents a file resource.
*/
@@ -637,25 +637,25 @@ package com.adobe.net
{
if (_path.length == 0)
return false;
-
+
return (_path.charAt(path.length - 1) == '/');
}
-
-
+
+
/**
- * Is this URI a hierarchical URI? URI's can be
+ * Is this URI a hierarchical URI? URI's can be
*/
public function isHierarchical() : Boolean
- {
+ {
return hierState;
}
-
-
+
+
/**
* The scheme of the URI.
*/
public function get scheme() : String
- {
+ {
return URI.unescapeChars(_scheme);
}
public function set scheme(schemeStr:String) : void
@@ -664,8 +664,8 @@ package com.adobe.net
var normalized:String = schemeStr.toLowerCase();
_scheme = URI.fastEscapeChars(normalized, URI.URIschemeExcludedBitmap);
}
-
-
+
+
/**
* The authority (host) of the URI. Only valid for
* hierarchical URI's. If the URI is relative, this will
@@ -674,33 +674,33 @@ package com.adobe.net
* value, the resulting string is unescaped.
*/
public function get authority() : String
- {
+ {
return URI.unescapeChars(_authority);
}
public function set authority(authorityStr:String) : void
{
// Normalize the authority
authorityStr = authorityStr.toLowerCase();
-
+
_authority = URI.fastEscapeChars(authorityStr,
URI.URIauthorityExcludedBitmap);
-
+
// Only hierarchical URI's can have an authority, make
// sure this URI is of the proper format.
this.hierState = true;
}
-
-
+
+
/**
* The username of the URI. Only valid for hierarchical
* URI's. If the URI is relative, this will be an empty
* string.
- *
+ *
* <p>The URI specification allows for authentication
* credentials to be embedded in the URI as such:</p>
- *
+ *
* <p>http://user:passwd@host/path/to/file.htm</p>
- *
+ *
* <p>When setting this value, the string
* given is assumed to be unescaped. When retrieving this
* value, the resulting string is unescaped.</p>
@@ -712,12 +712,12 @@ package com.adobe.net
public function set username(usernameStr:String) : void
{
_username = URI.fastEscapeChars(usernameStr, URI.URIuserpassExcludedBitmap);
-
+
// Only hierarchical URI's can have a username.
this.hierState = true;
}
-
-
+
+
/**
* The password of the URI. Similar to username.
* @see URI.username
@@ -730,63 +730,63 @@ package com.adobe.net
{
_password = URI.fastEscapeChars(passwordStr,
URI.URIuserpassExcludedBitmap);
-
+
// Only hierarchical URI's can have a password.
this.hierState = true;
}
-
-
+
+
/**
* The host port number. Only valid for hierarchical URI's. If
* the URI is relative, this will be an empty string. URI's can
* contain the port number of the remote host:
- *
+ *
* <p>http://site.com:8080/index.htm</p>
*/
public function get port() : String
- {
+ {
return URI.unescapeChars(_port);
}
public function set port(portStr:String) : void
{
_port = URI.escapeChars(portStr);
-
+
// Only hierarchical URI's can have a port.
this.hierState = true;
}
-
-
+
+
/**
* The path portion of the URI. Only valid for hierarchical
* URI's. When setting this value, the string
* given is assumed to be unescaped. When retrieving this
* value, the resulting string is unescaped.
- *
+ *
* <p>The path portion can be in one of two formats. 1) an absolute
* path, or 2) a relative path. An absolute path starts with a
* slash ('/'), a relative path does not.</p>
- *
+ *
* <p>An absolute path may look like:</p>
* <listing>/full/path/to/my/file.htm</listing>
- *
+ *
* <p>A relative path may look like:</p>
* <listing>
* path/to/my/file.htm
* ../images/logo.gif
* ../../reports/index.htm
* </listing>
- *
+ *
* <p>Paths can be absolute or relative. Note that this not the same as
* an absolute or relative URI. An absolute URI can only have absolute
* paths. For example:</p>
- *
+ *
* <listing>http:/site.com/path/to/file.htm</listing>
- *
+ *
* <p>This absolute URI has an absolute path of "/path/to/file.htm".</p>
- *
+ *
* <p>Relative URI's can have either absolute paths or relative paths.
* All of the following relative URI's are valid:</p>
- *
+ *
* <listing>
* /absolute/path/to/file.htm
* path/to/file.htm
@@ -794,44 +794,44 @@ package com.adobe.net
* </listing>
*/
public function get path() : String
- {
+ {
return URI.unescapeChars(_path);
}
public function set path(pathStr:String) : void
- {
+ {
this._path = URI.fastEscapeChars(pathStr, URI.URIpathExcludedBitmap);
-
+
if (this._scheme == UNKNOWN_SCHEME)
{
// We set the path. This is a valid URI now.
this._scheme = "";
}
-
+
// Only hierarchical URI's can have a path.
hierState = true;
}
-
-
+
+
/**
* The query (CGI) portion of the URI. This part is valid for
* both hierarchical and non-hierarchical URI's.
- *
+ *
* <p>This accessor should only be used if a custom query syntax
* is used. This URI class supports the common "param=value"
* style query syntax via the get/setQueryValue() and
* get/setQueryByMap() functions. Those functions should be used
* instead if the common syntax is being used.
- *
+ *
* <p>The URI RFC does not specify any particular
* syntax for the query part of a URI. It is intended to allow
* any format that can be agreed upon by the two communicating hosts.
* However, most systems have standardized on the typical CGI
* format:</p>
- *
+ *
* <listing>http://site.com/script.php?param1=value1¶m2=value2</listing>
- *
+ *
* <p>This class has specific support for this query syntax</p>
- *
+ *
* <p>This common query format is an array of name/value
* pairs with its own syntax that is different from the overall URI
* syntax. The query has its own escaping logic. For a query part
@@ -842,24 +842,24 @@ package com.adobe.net
* regards to its syntax. If the contents of the query part are
* important, it is recommended that get/setQueryValue() or
* get/setQueryByMap() are used instead.</p>
- *
+ *
* If a different query syntax is being used, a subclass of URI
* can be created to handle that specific syntax.
- *
+ *
* @see URI.getQueryValue, URI.getQueryByMap
*/
public function get query() : String
- {
+ {
return URI.unescapeChars(_query);
}
public function set query(queryStr:String) : void
{
_query = URI.fastEscapeChars(queryStr, URI.URIqueryExcludedBitmap);
-
+
// both hierarchical and non-hierarchical URI's can
// have a query. Do not set the hierState.
}
-
+
/**
* Accessor to the raw query data. If you are using a custom query
* syntax, this accessor can be used to get and set the query part
@@ -882,7 +882,7 @@ package com.adobe.net
* both hierarchical and non-hierarchical URI's.
*/
public function get fragment() : String
- {
+ {
return URI.unescapeChars(_fragment);
}
public function set fragment(fragmentStr:String) : void
@@ -892,27 +892,27 @@ package com.adobe.net
// both hierarchical and non-hierarchical URI's can
// have a fragment. Do not set the hierState.
}
-
-
+
+
/**
* The non-hierarchical part of the URI. For example, if
* this URI object represents "mailto:somebody@company.com",
* this will contain "somebody@company.com". This is valid only
- * for non-hierarchical URI's.
+ * for non-hierarchical URI's.
*/
public function get nonHierarchical() : String
- {
+ {
return URI.unescapeChars(_nonHierarchical);
}
public function set nonHierarchical(nonHier:String) : void
{
_nonHierarchical = URI.fastEscapeChars(nonHier, URInonHierexcludedBitmap);
-
+
// This is a non-hierarchical URI.
this.hierState = false;
}
-
-
+
+
/**
* Quick shorthand accessor to set the parts of this URI.
* The given parts are assumed to be in unescaped form. If
@@ -932,28 +932,28 @@ package com.adobe.net
hierState = true;
}
-
-
+
+
/**
* URI escapes the given character string. This is similar in function
* to the global encodeURIComponent() function in ActionScript, but is
* slightly different in regards to which characters get escaped. This
* escapes the characters specified in the URIbaselineExluded set (see class
* static members). This is needed for this class to work properly.
- *
+ *
* <p>If a different set of characters need to be used for the escaping,
* you may use fastEscapeChars() and specify a custom URIEncodingBitmap
* that contains the characters your application needs escaped.</p>
- *
+ *
* <p>Never pass a full URI to this function. A URI can only be properly
* escaped/unescaped when split into its component parts (see RFC 3986
* section 2.4). This is due to the fact that the URI component separators
* could be characters that would normally need to be escaped.</p>
- *
+ *
* @param unescaped character string to be escaped.
- *
+ *
* @return escaped character string
- *
+ *
* @see encodeURIComponent
* @see fastEscapeChars
*/
@@ -962,19 +962,19 @@ package com.adobe.net
// This uses the excluded set by default.
return fastEscapeChars(unescaped, URI.URIbaselineExcludedBitmap);
}
-
+
/**
* Unescape any URI escaped characters in the given character
* string.
- *
+ *
* <p>Never pass a full URI to this function. A URI can only be properly
* escaped/unescaped when split into its component parts (see RFC 3986
* section 2.4). This is due to the fact that the URI component separators
* could be characters that would normally need to be escaped.</p>
- *
+ *
* @param escaped the escaped string to be unescaped.
- *
+ *
* @return unescaped string.
*/
static public function unescapeChars(escaped:String /*, onlyHighASCII:Boolean = false*/) : String
@@ -985,22 +985,22 @@ package com.adobe.net
unescaped = decodeURIComponent(escaped);
return unescaped;
}
-
+
/**
* Performance focused function that escapes the given character
* string using the given URIEncodingBitmap as the rule for what
* characters need to be escaped. This function is used by this
* class and can be used externally to this class to perform
* escaping on custom character sets.
- *
+ *
* <p>Never pass a full URI to this function. A URI can only be properly
* escaped/unescaped when split into its component parts (see RFC 3986
* section 2.4). This is due to the fact that the URI component separators
* could be characters that would normally need to be escaped.</p>
- *
+ *
* @param unescaped the unescaped string to be escaped
* @param bitmap the set of characters that need to be escaped
- *
+ *
* @return the escaped string.
*/
static public function fastEscapeChars(unescaped:String, bitmap:URIEncodingBitmap) : String
@@ -1008,36 +1008,36 @@ package com.adobe.net
var escaped:String = "";
var c:String;
var x:int, i:int;
-
+
for (i = 0; i < unescaped.length; i++)
{
c = unescaped.charAt(i);
-
+
x = bitmap.ShouldEscape(c);
if (x)
{
c = x.toString(16);
if (c.length == 1)
c = "0" + c;
-
+
c = "%" + c;
c = c.toUpperCase();
}
-
+
escaped += c;
}
-
+
return escaped;
}
-
+
/**
* Is this URI of a particular scheme type? For example,
* passing "http" to a URI object that represents the URI
* "http://site.com/" would return true.
- *
+ *
* @param scheme scheme to check for
- *
+ *
* @return true if this URI object is of the given type, false
* otherwise.
*/
@@ -1054,9 +1054,9 @@ package com.adobe.net
* assumes the query part of the URI is in the common
* "name1=value1&name2=value2" syntax. Do not call this function
* if you are using a custom query syntax.
- *
+ *
* @param name name of the query value to get.
- *
+ *
* @return the value of the query name, empty string if the
* query name does not exist.
*/
@@ -1065,9 +1065,9 @@ package com.adobe.net
var map:Object;
var item:String;
var value:String;
-
+
map = getQueryByMap();
-
+
for (item in map)
{
if (item == name)
@@ -1076,22 +1076,22 @@ package com.adobe.net
return value;
}
}
-
+
// Didn't find the specified key
return new String("");
}
-
+
/**
* Set the given value on the given query name. If the given name
* does not exist, it will automatically add this name/value pair
* to the query. If null is passed as the value, it will remove
* the given item from the query.
- *
+ *
* <p>This automatically escapes any characters that may conflict with
* the query syntax so that they are "safe" within the query. The
* strings passed are assumed to be literal unescaped name and value.</p>
- *
+ *
* @param name name of the query value to set
* @param value value of the query item to set. If null, this will
* force the removal of this item from the query.
@@ -1101,28 +1101,28 @@ package com.adobe.net
var map:Object;
map = getQueryByMap();
-
+
// If the key doesn't exist yet, this will create a new pair in
// the map. If it does exist, this will overwrite the previous
// value, which is what we want.
map[name] = value;
-
+
setQueryByMap(map);
}
-
+
/**
* Get the query of the URI in an Object class that allows for easy
* access to the query data via Object accessors. For example:
- *
+ *
* <listing>
* var query:Object = uri.getQueryByMap();
* var value:String = query["param"]; // get a value
* query["param2"] = "foo"; // set a new value
* </listing>
- *
+ *
* @return Object that contains the name/value pairs of the query.
- *
+ *
* @see #setQueryByMap
* @see #getQueryValue
* @see #setQueryValue
@@ -1136,47 +1136,47 @@ package com.adobe.net
var name:String, value:String;
var index:int;
var map:Object = new Object();
-
-
+
+
// We need the raw query string, no unescaping.
queryStr = this._query;
-
+
pairs = queryStr.split('&');
for each (pair in pairs)
{
if (pair.length == 0)
continue;
-
+
item = pair.split('=');
-
+
if (item.length > 0)
name = item[0];
else
continue; // empty array
-
+
if (item.length > 1)
value = item[1];
else
value = "";
-
+
name = queryPartUnescape(name);
value = queryPartUnescape(value);
-
+
map[name] = value;
}
-
+
return map;
}
-
+
/**
* Set the query part of this URI using the given object as the
* content source. Any member of the object that has a value of
* null will not be in the resulting query.
- *
+ *
* @param map object that contains the name/value pairs as
* members of that object.
- *
+ *
* @see #getQueryByMap
* @see #getQueryValue
* @see #setQueryValue
@@ -1188,23 +1188,23 @@ package com.adobe.net
var queryStr:String = "";
var tmpPair:String;
var foo:String;
-
+
for (item in map)
{
name = item;
value = map[item];
-
+
if (value == null)
value = "";
-
+
// Need to escape the name/value pair so that they
// don't conflict with the query syntax (specifically
// '=', '&', and <whitespace>).
name = queryPartEscape(name);
value = queryPartEscape(value);
-
+
tmpPair = name;
-
+
if (value.length > 0)
{
tmpPair += "=";
@@ -1213,18 +1213,18 @@ package com.adobe.net
if (queryStr.length != 0)
queryStr += '&'; // Add the separator
-
+
queryStr += tmpPair;
}
-
+
// We don't want to escape. We already escaped the
// individual name/value pairs. If we escaped the
// query string again by assigning it to "query",
// we would have double escaping.
_query = queryStr;
}
-
-
+
+
/**
* Similar to Escape(), except this also escapes characters that
* would conflict with the name/value pair query syntax. This is
@@ -1232,11 +1232,11 @@ package com.adobe.net
* in the query making sure that nothing in the name or value
* strings contain characters that would conflict with the query
* syntax (e.g. '=' and '&').
- *
+ *
* @param unescaped unescaped string that is to be escaped.
- *
+ *
* @return escaped string.
- *
+ *
* @see #queryUnescape
*/
static public function queryPartEscape(unescaped:String) : String
@@ -1245,15 +1245,15 @@ package com.adobe.net
escaped = URI.fastEscapeChars(unescaped, URI.URIqueryPartExcludedBitmap);
return escaped;
}
-
+
/**
* Unescape the individual name/value string pairs.
- *
+ *
* @param escaped escaped string to be unescaped
- *
+ *
* @return unescaped string
- *
+ *
* @see #queryEscape
*/
static public function queryPartUnescape(escaped:String) : String
@@ -1262,7 +1262,7 @@ package com.adobe.net
unescaped = unescapeChars(unescaped);
return unescaped;
}
-
+
/**
* Output this URI as a string. The resulting string is properly
* escaped and well formed for machine processing.
@@ -1274,7 +1274,7 @@ package com.adobe.net
else
return toStringInternal(false);
}
-
+
/**
* Output the URI as a string that is easily readable by a human.
* This outputs the URI with all escape sequences unescaped to
@@ -1284,32 +1284,32 @@ package com.adobe.net
* This function should only be used if you want to display a URI to
* a user. This function should never be used outside that specific
* case.
- *
+ *
* @return the URI in string format with all escape sequences
* unescaped.
- *
+ *
* @see #toString
*/
public function toDisplayString() : String
{
return toStringInternal(true);
}
-
-
+
+
/**
* @private
- *
+ *
* The guts of toString()
*/
protected function toStringInternal(forDisplay:Boolean) : String
{
var uri:String = "";
var part:String = "";
-
+
if (isHierarchical() == false)
{
// non-hierarchical URI
-
+
uri += (forDisplay ? this.scheme : _scheme);
uri += ":";
uri += (forDisplay ? this.nonHierarchical : _nonHierarchical);
@@ -1317,76 +1317,76 @@ package com.adobe.net
else
{
// Hierarchical URI
-
+
if (isRelative() == false)
{
// If it is not a relative URI, then we want the scheme and
// authority parts in the string. If it is relative, we
// do NOT want this stuff.
-
+
if (_scheme.length != 0)
{
part = (forDisplay ? this.scheme : _scheme);
uri += part + ":";
}
-
+
if (_authority.length != 0 || isOfType("file"))
{
uri += "//";
-
+
// Add on any username/password associated with this
// authority
if (_username.length != 0)
{
part = (forDisplay ? this.username : _username);
uri += part;
-
+
if (_password.length != 0)
{
part = (forDisplay ? this.password : _password);
uri += ":" + part;
}
-
+
uri += "@";
}
-
+
// add the authority
part = (forDisplay ? this.authority : _authority);
uri += part;
-
+
// Tack on the port number, if any
if (port.length != 0)
uri += ":" + port;
}
}
-
+
// Tack on the path
part = (forDisplay ? this.path : _path);
uri += part;
-
+
} // end hierarchical part
-
+
// Both non-hier and hierarchical have query and fragment parts
-
+
// Add on the query and fragment parts
if (_query.length != 0)
{
part = (forDisplay ? this.query : _query);
uri += "?" + part;
}
-
+
if (fragment.length != 0)
{
part = (forDisplay ? this.fragment : _fragment);
uri += "#" + part;
}
-
+
return uri;
}
-
+
/**
* Forcefully ensure that this URI is properly escaped.
- *
+ *
* <p>Sometimes URI's are constructed by hand using strings outside
* this class. In those cases, it is unlikely the URI has been
* properly escaped. This function forcefully escapes this URI
@@ -1401,13 +1401,13 @@ package com.adobe.net
{
// The accessors for each of the members will unescape
// and then re-escape as we get and assign them.
-
+
// Handle the parts that are common for both hierarchical
// and non-hierarchical URI's
this.scheme = this.scheme;
this.setQueryByMap(this.getQueryByMap());
this.fragment = this.fragment;
-
+
if (isHierarchical())
{
this.authority = this.authority;
@@ -1421,18 +1421,18 @@ package com.adobe.net
this.nonHierarchical = this.nonHierarchical;
}
}
-
-
+
+
/**
* Does this URI point to a resource of the given file type?
* Given a file extension (or just a file name, this will strip the
* extension), check to see if this URI points to a file of that
* type.
- *
+ *
* @param extension string that contains a file extension with or
* without a dot ("html" and ".html" are both valid), or a file
* name with an extension (e.g. "index.html").
- *
+ *
* @return true if this URI points to a resource with the same file
* file extension as the extension provided, false otherwise.
*/
@@ -1440,7 +1440,7 @@ package com.adobe.net
{
var thisExtension:String;
var index:int;
-
+
index = extension.lastIndexOf(".");
if (index != -1)
{
@@ -1453,31 +1453,31 @@ package com.adobe.net
// will assume that it is just a plain extension (e.g. "html").
// What they passed is exactly what we want
}
-
+
thisExtension = getExtension(true);
-
+
if (thisExtension == "")
return false;
-
+
// Compare the extensions ignoring case
if (compareStr(thisExtension, extension, false) == 0)
return true;
else
return false;
}
-
-
+
+
/**
* Get the ".xyz" file extension from the filename in the URI.
* For example, if we have the following URI:
- *
+ *
* <listing>http://something.com/path/to/my/page.html?form=yes&name=bob#anchor</listing>
- *
+ *
* <p>This will return ".html".</p>
- *
+ *
* @param minusDot If true, this will strip the dot from the extension.
* If true, the above example would have returned "html".
- *
+ *
* @return the file extension
*/
public function getExtension(minusDot:Boolean = false) : String
@@ -1485,36 +1485,36 @@ package com.adobe.net
var filename:String = getFilename();
var extension:String;
var index:int;
-
+
if (filename == "")
return String("");
-
+
index = filename.lastIndexOf(".");
-
+
// If it doesn't have an extension, or if it is a "hidden" file,
// it doesn't have an extension. Hidden files on unix start with
// a dot (e.g. ".login").
if (index == -1 || index == 0)
return String("");
-
+
extension = filename.substr(index);
-
+
// If the caller does not want the dot, remove it.
if (minusDot && extension.charAt(0) == ".")
extension = extension.substr(1);
-
+
return extension;
}
-
+
/**
* Quick function to retrieve the file name off the end of a URI.
- *
+ *
* <p>For example, if the URI is:</p>
* <listing>http://something.com/some/path/to/my/file.html</listing>
* <p>this function will return "file.html".</p>
- *
+ *
* @param minusExtension true if the file extension should be stripped
- *
+ *
* @return the file name. If this URI is a directory, the return
* value will be empty string.
*/
@@ -1522,36 +1522,36 @@ package com.adobe.net
{
if (isDirectory())
return String("");
-
+
var pathStr:String = this.path;
var filename:String;
var index:int;
-
+
// Find the last path separator.
index = pathStr.lastIndexOf("/");
-
+
if (index != -1)
filename = pathStr.substr(index + 1);
else
filename = pathStr;
-
+
if (minusExtension)
{
// The caller has requested that the extension be removed
index = filename.lastIndexOf(".");
-
+
if (index != -1)
filename = filename.substr(0, index);
}
-
+
return filename;
}
-
-
+
+
/**
* @private
* Helper function to compare strings.
- *
+ *
* @return true if the two strings are identical, false otherwise.
*/
static protected function compareStr(str1:String, str2:String,
@@ -1562,10 +1562,10 @@ package com.adobe.net
str1 = str1.toLowerCase();
str2 = str2.toLowerCase();
}
-
+
return (str1 == str2)
}
-
+
/**
* Based on the type of this URI (http, ftp, etc.) get
* the default port used for that protocol. This is
@@ -1588,10 +1588,10 @@ package com.adobe.net
return String("");
}
}
-
+
/**
* @private
- *
+ *
* This resolves the given URI if the application has a
* resolver interface defined. This function does not
* modify the passed in URI and returns a new URI.
@@ -1600,7 +1600,7 @@ package com.adobe.net
{
var copy:URI = new URI();
copy.copyURI(uri);
-
+
if (_resolver != null)
{
// A resolver class has been registered. Call it.
@@ -1613,7 +1613,7 @@ package com.adobe.net
return copy;
}
}
-
+
/**
* Accessor to set and get the resolver object used by all URI
* objects to dynamically resolve URI's before comparison.
@@ -1626,17 +1626,17 @@ package com.adobe.net
{
return _resolver;
}
-
+
/**
* Given another URI, return this URI object's relation to the one given.
* URI's can have 1 of 4 possible relationships. They can be unrelated,
* equal, parent, or a child of the given URI.
- *
+ *
* @param uri URI to compare this URI object to.
* @param caseSensitive true if the URI comparison should be done
* taking case into account, false if the comparison should be
* performed case insensitive.
- *
+ *
* @return URI.NOT_RELATED, URI.CHILD, URI.PARENT, or URI.EQUAL
*/
public function getRelation(uri:URI, caseSensitive:Boolean = true) : int
@@ -1644,7 +1644,7 @@ package com.adobe.net
// Give the app a chance to resolve these URI's before we compare them.
var thisURI:URI = URI.resolve(this);
var thatURI:URI = URI.resolve(uri);
-
+
if (thisURI.isRelative() || thatURI.isRelative())
{
// You cannot compare relative URI's due to their lack of context.
@@ -1671,40 +1671,40 @@ package com.adobe.net
// They are both non-hierarchical
if (thisURI.scheme != thatURI.scheme)
return URI.NOT_RELATED;
-
+
if (thisURI.nonHierarchical != thatURI.nonHierarchical)
return URI.NOT_RELATED;
-
+
// The two non-hierarcical URI's are equal.
return URI.EQUAL;
}
}
-
+
// Ok, this URI and the one we are being compared to are both
// absolute hierarchical URI's.
-
+
if (thisURI.scheme != thatURI.scheme)
return URI.NOT_RELATED;
-
+
if (thisURI.authority != thatURI.authority)
return URI.NOT_RELATED;
-
+
var thisPort:String = thisURI.port;
var thatPort:String = thatURI.port;
-
+
// Different ports are considered completely different servers.
if (thisPort == "")
thisPort = thisURI.getDefaultPort();
if (thatPort == "")
thatPort = thatURI.getDefaultPort();
-
+
// Check to see if the port is the default port.
if (thisPort != thatPort)
return URI.NOT_RELATED;
-
+
if (compareStr(thisURI.path, thatURI.path, caseSensitive))
return URI.EQUAL;
-
+
// Special case check. If we are here, the scheme, authority,
// and port match, and it is not a relative path, but the
// paths did not match. There is a special case where we
@@ -1714,14 +1714,14 @@ package com.adobe.net
// Technically, these are equal. So lets, check for this case.
var thisPath:String = thisURI.path;
var thatPath:String = thatURI.path;
-
+
if ( (thisPath == "/" || thatPath == "/") &&
(thisPath == "" || thatPath == "") )
{
// We hit the special case. These two are equal.
return URI.EQUAL;
}
-
+
// Ok, the paths do not match, but one path may be a parent/child
// of the other. For example, we may have:
// http://something.com/path/to/homepage/
@@ -1730,14 +1730,14 @@ package com.adobe.net
// is a child of the first, depending on which you compare to the
// other). To make this comparison, we must split the path into
// its component parts (split the string on the '/' path delimiter).
- // We then compare the
+ // We then compare the
var thisParts:Array, thatParts:Array;
var thisPart:String, thatPart:String;
var i:int;
-
+
thisParts = thisPath.split("/");
thatParts = thatPath.split("/");
-
+
if (thisParts.length > thatParts.length)
{
thatPart = thatParts[thatParts.length - 1];
@@ -1753,17 +1753,17 @@ package com.adobe.net
// Remove the empty trailing part
thatParts.pop();
}
-
+
// This may be a child of the one passed in
for (i = 0; i < thatParts.length; i++)
{
thisPart = thisParts[i];
thatPart = thatParts[i];
-
+
if (compareStr(thisPart, thatPart, caseSensitive) == false)
return URI.NOT_RELATED;
}
-
+
return URI.CHILD;
}
else if (thisParts.length < thatParts.length)
@@ -1781,17 +1781,17 @@ package com.adobe.net
// Remove the empty trailing part
thisParts.pop();
}
-
+
// This may be the parent of the one passed in
for (i = 0; i < thisParts.length; i++)
{
thisPart = thisParts[i];
thatPart = thatParts[i];
-
+
if (compareStr(thisPart, thatPart, caseSensitive) == false)
return URI.NOT_RELATED;
}
-
+
return URI.PARENT;
}
else
@@ -1801,28 +1801,28 @@ package com.adobe.net
// the two URI's are not related.
return URI.NOT_RELATED;
}
-
+
// If we got here, the scheme and authority are the same,
// but the paths pointed to two different locations that
// were in different parts of the file system tree
return URI.NOT_RELATED;
}
-
+
/**
* Given another URI, return the common parent between this one
* and the provided URI.
- *
+ *
* @param uri the other URI from which to find a common parent
* @para caseSensitive true if this operation should be done
* with case sensitive comparisons.
- *
+ *
* @return the parent URI if successful, null otherwise.
*/
public function getCommonParent(uri:URI, caseSensitive:Boolean = true) : URI
{
var thisURI:URI = URI.resolve(this);
var thatURI:URI = URI.resolve(uri);
-
+
if(!thisURI.isAbsolute() || !thatURI.isAbsolute() ||
thisURI.isHierarchical() == false ||
thatURI.isHierarchical() == false)
@@ -1831,7 +1831,7 @@ package com.adobe.net
// make sense.
return null;
}
-
+
var relation:int = thisURI.getRelation(thatURI);
if (relation == URI.NOT_RELATED)
{
@@ -1839,17 +1839,17 @@ package com.adobe.net
// common parent.
return null;
}
-
+
thisURI.chdir(".");
thatURI.chdir(".");
-
+
var strBefore:String, strAfter:String;
do
{
relation = thisURI.getRelation(thatURI, caseSensitive);
if(relation == URI.EQUAL || relation == URI.PARENT)
break;
-
+
// If strBefore and strAfter end up being the same,
// we know we are at the root of the path because
// chdir("..") is doing nothing.
@@ -1858,18 +1858,18 @@ package com.adobe.net
strAfter = thisURI.toString();
}
while(strBefore != strAfter);
-
+
return thisURI;
}
-
-
+
+
/**
* This function is used to move around in a URI in a way similar
* to the 'cd' or 'chdir' commands on Unix. These operations are
* completely string based, using the context of the URI to
* determine the position within the path. The heuristics used
* to determine the action are based off Appendix C in RFC 2396.
- *
+ *
* <p>URI paths that end in '/' are considered paths that point to
* directories, while paths that do not end in '/' are files. For
* example, if you execute chdir("d") on the following URI's:<br/>
@@ -1878,23 +1878,23 @@ package com.adobe.net
* you will get:<br/>
* 1. http://something.com/a/b/c/d<br/>
* 2. http://something.com/a/b/d<br/></p>
- *
+ *
* <p>See RFC 2396, Appendix C for more info.</p>
- *
+ *
* @param reference the URI or path to "cd" to.
* @param escape true if the passed reference string should be URI
* escaped before using it.
- *
+ *
* @return true if the chdir was successful, false otherwise.
*/
public function chdir(reference:String, escape:Boolean = false) : Boolean
{
var uriReference:URI;
var ref:String = reference;
-
+
if (escape)
ref = URI.escapeChars(reference);
-
+
if (ref == "")
{
// NOOP
@@ -1907,7 +1907,7 @@ package com.adobe.net
// intended to make working with chdir() a little more
// tolerant.
var finalStr:String = this.scheme + ":" + ref;
-
+
return constructURI(finalStr);
}
else if (ref.charAt(0) == "?")
@@ -1917,11 +1917,11 @@ package com.adobe.net
// of our logic work.
ref = "./" + ref;
}
-
+
// Parse the reference passed in as a URI. This way we
// get any query and fragments parsed out as well.
uriReference = new URI(ref);
-
+
if (uriReference.isAbsolute() ||
uriReference.isHierarchical() == false)
{
@@ -1929,8 +1929,8 @@ package com.adobe.net
copyURI(uriReference);
return true;
}
-
-
+
+
var thisPath:String, thatPath:String;
var thisParts:Array, thatParts:Array;
var thisIsDir:Boolean = false, thatIsDir:Boolean = false;
@@ -1938,20 +1938,20 @@ package com.adobe.net
var lastIsDotOperation:Boolean = false;
var curDir:String;
var i:int;
-
+
thisPath = this.path;
thatPath = uriReference.path;
-
+
if (thisPath.length > 0)
thisParts = thisPath.split("/");
else
thisParts = new Array();
-
+
if (thatPath.length > 0)
thatParts = thatPath.split("/");
else
thatParts = new Array();
-
+
if (thisParts.length > 0 && thisParts[0] == "")
{
thisIsAbs = true;
@@ -1962,7 +1962,7 @@ package com.adobe.net
thisIsDir = true;
thisParts.pop(); // pop the last one off the array
}
-
+
if (thatParts.length > 0 && thatParts[0] == "")
{
thatIsAbs = true;
@@ -1973,17 +1973,17 @@ package com.adobe.net
thatIsDir = true;
thatParts.pop(); // pop the last one off the array
}
-
+
if (thatIsAbs)
{
// The reference is an absolute path (starts with a slash).
// It replaces this path wholesale.
this.path = uriReference.path;
-
+
// And it inherits the query and fragment
this.queryRaw = uriReference.queryRaw;
this.fragment = uriReference.fragment;
-
+
return true;
}
else if (thatParts.length == 0 && uriReference.query == "")
@@ -2000,20 +2000,20 @@ package com.adobe.net
// This path ends in a file. It goes away no matter what.
thisParts.pop();
}
-
+
// By default, this assumes the query and fragment of the reference
this.queryRaw = uriReference.queryRaw;
this.fragment = uriReference.fragment;
-
+
// Append the parts of the path from the passed in reference
// to this object's path.
thisParts = thisParts.concat(thatParts);
-
+
for(i = 0; i < thisParts.length; i++)
{
curDir = thisParts[i];
lastIsDotOperation = false;
-
+
if (curDir == ".")
{
thisParts.splice(i, 1);
@@ -2040,7 +2040,7 @@ package com.adobe.net
else
{
// This is the first thing in the path.
-
+
if (isRelative())
{
// We can't collapse leading ".."s in a relative
@@ -2062,33 +2062,33 @@ package com.adobe.net
// # cd ../../../../../bin
// Which will put you in /bin. Essentially, the extra
// ".."'s will just get eaten.
-
+
thisParts.splice(i, 1);
i = i - 1; // account for the ".." we just removed
}
}
-
+
lastIsDotOperation = true;
}
}
-
+
var finalPath:String = "";
-
+
// If the last thing in the path was a "." or "..", then this thing is a
- // directory. If the last thing isn't a dot-op, then we don't want to
+ // directory. If the last thing isn't a dot-op, then we don't want to
// blow away any information about the directory (hence the "|=" binary
// assignment).
thatIsDir = thatIsDir || lastIsDotOperation;
-
+
// Reconstruct the path with the abs/dir info we have
finalPath = joinPath(thisParts, thisIsAbs, thatIsDir);
-
+
// Set the path (automatically escaping it)
this.path = finalPath;
-
+
return true;
}
-
+
/**
* @private
* Join an array of path parts back into a URI style path string.
@@ -2097,47 +2097,47 @@ package com.adobe.net
* function because we need to take into account the starting and
* ending path delimiters if this is an absolute path or a
* directory.
- *
+ *
* @param parts the Array that contains strings of each path part.
* @param isAbs true if the given path is absolute
* @param isDir true if the given path is a directory
- *
+ *
* @return the combined path string.
*/
protected function joinPath(parts:Array, isAbs:Boolean, isDir:Boolean) : String
{
var pathStr:String = "";
var i:int;
-
+
for (i = 0; i < parts.length; i++)
{
if (pathStr.length > 0)
pathStr += "/";
-
+
pathStr += parts[i];
}
-
+
// If this path is a directory, tack on the directory delimiter,
// but only if the path contains something. Adding this to an
// empty path would make it "/", which is an absolute path that
// starts at the root.
if (isDir && pathStr.length > 0)
pathStr += "/";
-
+
if (isAbs)
pathStr = "/" + pathStr;
-
+
return pathStr;
}
-
+
/**
* Given an absolute URI, make this relative URI absolute using
* the given URI as a base. This URI instance must be relative
* and the base_uri must be absolute.
- *
+ *
* @param base_uri URI to use as the base from which to make
* this relative URI into an absolute URI.
- *
+ *
* @return true if successful, false otherwise.
*/
public function makeAbsoluteURI(base_uri:URI) : Boolean
@@ -2148,46 +2148,46 @@ package com.adobe.net
// absolute otherwise we won't know what to do!
return false;
}
-
+
// Make a copy of the base URI. We don't want to modify
// the passed URI.
var base:URI = new URI();
base.copyURI(base_uri);
-
+
// ChDir on the base URI. This will preserve any query
// and fragment we have.
if (base.chdir(toString()) == false)
return false;
-
+
// It worked, so copy the base into this one
copyURI(base);
-
+
return true;
}
-
-
+
+
/**
* Given a URI to use as a base from which this object should be
* relative to, convert this object into a relative URI. For example,
* if you have:
- *
+ *
* <listing>
* var uri1:URI = new URI("http://something.com/path/to/some/file.html");
* var uri2:URI = new URI("http://something.com/path/to/another/file.html");
- *
+ *
* uri1.MakeRelativePath(uri2);</listing>
- *
+ *
* <p>uri1 will have a final value of "../some/file.html"</p>
- *
+ *
* <p>Note! This function is brute force. If you have two URI's
* that are completely unrelated, this will still attempt to make
* the relative URI. In that case, you will most likely get a
* relative path that looks something like:</p>
- *
+ *
* <p>../../../../../../some/path/to/my/file.html</p>
- *
+ *
* @param base_uri the URI from which to make this URI relative
- *
+ *
* @return true if successful, false if the base_uri and this URI
* are not related, of if error.
*/
@@ -2195,7 +2195,7 @@ package com.adobe.net
{
var base:URI = new URI();
base.copyURI(base_uri);
-
+
var thisParts:Array, thatParts:Array;
var finalParts:Array = new Array();
var thisPart:String, thatPart:String, finalPath:String;
@@ -2205,20 +2205,20 @@ package com.adobe.net
var i:int;
var diff:Boolean = false;
var isDir:Boolean = false;
-
+
if (isRelative())
{
// We're already relative.
return true;
}
-
+
if (base.isRelative())
{
// The base is relative. A relative base doesn't make sense.
return false;
}
-
-
+
+
if ( (isOfType(base_uri.scheme) == false) ||
(this.authority != base_uri.authority) )
{
@@ -2227,34 +2227,34 @@ package com.adobe.net
// unrelated.
return false;
}
-
+
// Record the state of this URI
isDir = isDirectory();
-
+
// We are based of the directory of the given URI. We need to
// make sure the URI is pointing to a directory. Changing
// directory to "." will remove any file name if the base is
// not a directory.
base.chdir(".");
-
+
thisParts = pathStr.split("/");
thatParts = base.path.split("/");
-
+
if (thisParts.length > 0 && thisParts[0] == "")
thisParts.shift();
-
+
if (thisParts.length > 0 && thisParts[thisParts.length - 1] == "")
{
isDir = true;
thisParts.pop();
}
-
+
if (thatParts.length > 0 && thatParts[0] == "")
thatParts.shift();
if (thatParts.length > 0 && thatParts[thatParts.length - 1] == "")
thatParts.pop();
-
-
+
+
// Now that we have the paths split into an array of directories,
// we can compare the two paths. We start from the left of side
// of the path and start comparing. When we either run out of
@@ -2285,10 +2285,10 @@ package com.adobe.net
// base.path = /a/b/c/d/e/ (thatParts)
break;
}
-
+
thisPart = thisParts[0];
thatPart = thatParts[0];
-
+
if (compareStr(thisPart, thatPart, caseSensitive))
{
thisParts.shift();
@@ -2297,7 +2297,7 @@ package com.adobe.net
else
break;
}
-
+
// If there are any path info left from the base URI, that means
// **this** object is above the given URI in the file tree. For
// each part left over in the given URI, we need to move up one
@@ -2307,39 +2307,39 @@ package com.adobe.net
{
finalParts.push(dotdot);
}
-
+
// Append the parts of this URI to any dot-dot's we have
finalParts = finalParts.concat(thisParts);
-
+
// Join the parts back into a path
finalPath = joinPath(finalParts, false /* not absolute */, isDir);
-
+
if (finalPath.length == 0)
{
// The two URI's are exactly the same. The proper relative
// path is:
finalPath = "./";
}
-
+
// Set the parts of the URI, preserving the original query and
// fragment parts.
setParts("", "", "", finalPath, queryStr, fragmentStr);
-
+
return true;
}
-
+
/**
* Given a string, convert it to a URI. The string could be a
* full URI that is improperly escaped, a malformed URI (e.g.
* missing a protocol like "www.something.com"), a relative URI,
* or any variation there of.
- *
+ *
* <p>The intention of this function is to take anything that a
* user might manually enter as a URI/URL and try to determine what
* they mean. This function differs from the URI constructor in
* that it makes some assumptions to make it easy to import user
* entered URI data.</p>
- *
+ *
* <p>This function is intended to be a helper function.
* It is not all-knowning and will probably make mistakes
* when attempting to parse a string of unknown origin. If
@@ -2348,7 +2348,7 @@ package com.adobe.net
* should be entering, and your application should be
* pre-processing the user's input to make sure it is well formed
* before passing it to this function.</p>
- *
+ *
* <p>It is assumed that the string given to this function is
* something the user may have manually entered. Given this,
* the URI string is probably unescaped or improperly escaped.
@@ -2362,23 +2362,23 @@ package com.adobe.net
* @param defaultScheme if it is determined that the passed string
* looks like a URI, but it is missing the scheme part, this
* string will be used as the missing scheme.
- *
+ *
* @return true if the given string was successfully parsed into
* a valid URI object, false otherwise.
*/
public function unknownToURI(unknown:String, defaultScheme:String = "http") : Boolean
{
var temp:String;
-
+
if (unknown.length == 0)
{
this.initialize();
return false;
}
-
+
// Some users love the backslash key. Fix it.
unknown = unknown.replace(/\\/g, "/");
-
+
// Check for any obviously missing scheme.
if (unknown.length >= 2)
{
@@ -2386,7 +2386,7 @@ package com.adobe.net
if (temp == "//")
unknown = defaultScheme + ":" + unknown;
}
-
+
if (unknown.length >= 3)
{
temp = unknown.substr(0, 3);
@@ -2396,7 +2396,7 @@ package com.adobe.net
// Try parsing it as a normal URI
var uri:URI = new URI(unknown);
-
+
if (uri.isHierarchical() == false)
{
if (uri.scheme == UNKNOWN_SCHEME)
@@ -2404,7 +2404,7 @@ package com.adobe.net
this.initialize();
return false;
}
-
+
// It's a non-hierarchical URI
copyURI(uri);
forceEscape();
@@ -2424,7 +2424,7 @@ package com.adobe.net
else if (uri.authority.length == 0 && uri.path.length == 0)
{
// It's is an incomplete URI (eg "http://")
-
+
setParts(uri.scheme, "", "", "", "", "");
return false;
}
@@ -2435,8 +2435,8 @@ package com.adobe.net
// that start with "." or "..". If it starts with something
// else, the parsing is ambiguous.
var path:String = uri.path;
-
- if (path == ".." || path == "." ||
+
+ if (path == ".." || path == "." ||
(path.length >= 3 && path.substr(0, 3) == "../") ||
(path.length >= 2 && path.substr(0, 2) == "./") )
{
@@ -2446,11 +2446,11 @@ package com.adobe.net
return true;
}
}
-
+
// Ok, it looks like we are just a normal URI missing the scheme. Tack
// on the scheme.
uri = new URI(defaultScheme + "://" + unknown);
-
+
// Check to see if we are good now
if (uri.scheme.length > 0 && uri.authority.length > 0)
{
@@ -2459,11 +2459,11 @@ package com.adobe.net
forceEscape(); // Make sure we are properly encoded.
return true;
}
-
+
// don't know what this is
this.initialize();
return false;
}
-
+
} // end URI class
} // end package
\ No newline at end of file
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/net/URIEncodingBitmap.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/net/URIEncodingBitmap.as
similarity index 93%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/net/URIEncodingBitmap.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/net/URIEncodingBitmap.as
index 9c0239cb945c..c6f01d69eafe 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/net/URIEncodingBitmap.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/net/URIEncodingBitmap.as
@@ -1,34 +1,34 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
- Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
+
+ Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
- distribute this source code and such derivative works in source or
- object code form without any attribution requirements.
-
+ distribute this source code and such derivative works in source or
+ object code form without any attribution requirements.
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
- against any loss, damage, claims or lawsuits, including attorney's
- fees that arise or result from your use or distribution of the source
+ against any loss, damage, claims or lawsuits, including attorney's
+ fees that arise or result from your use or distribution of the source
code.
-
- THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
+
+ THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
@@ -36,15 +36,15 @@
package com.adobe.net
{
import flash.utils.ByteArray;
-
+
/**
* This class implements an efficient lookup table for URI
* character escaping. This class is only needed if you
* create a derived class of URI to handle custom URI
* syntax. This class is used internally by URI.
- *
+ *
* @langversion ActionScript 3.0
- * @playerversion Flash 9.0*
+ * @playerversion Flash 9.0*
*/
public class URIEncodingBitmap extends ByteArray
{
@@ -52,7 +52,7 @@ package com.adobe.net
* Constructor. Creates an encoding bitmap using the given
* string of characters as the set of characters that need
* to be URI escaped.
- *
+ *
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
*/
@@ -60,21 +60,21 @@ package com.adobe.net
{
var i:int;
var data:ByteArray = new ByteArray();
-
+
// Initialize our 128 bits (16 bytes) to zero
for (i = 0; i < 16; i++)
this.writeByte(0);
-
+
data.writeUTFBytes(charsToEscape);
data.position = 0;
-
+
while (data.bytesAvailable)
{
var c:int = data.readByte();
-
+
if (c > 0x7f)
continue; // only escape low bytes
-
+
var enc:int;
this.position = (c >> 3);
enc = this.readByte();
@@ -83,34 +83,34 @@ package com.adobe.net
this.writeByte(enc);
}
}
-
+
/**
* Based on the data table contained in this object, check
* if the given character should be escaped.
- *
+ *
* @param char the character to be escaped. Only the first
* character in the string is used. Any other characters
* are ignored.
- *
+ *
* @return the integer value of the raw UTF8 character. For
* example, if '%' is given, the return value is 37 (0x25).
* If the character given does not need to be escaped, the
* return value is zero.
- *
+ *
* @langversion ActionScript 3.0
- * @playerversion Flash 9.0
+ * @playerversion Flash 9.0
*/
public function ShouldEscape(char:String) : int
{
var data:ByteArray = new ByteArray();
var c:int, mask:int;
-
+
// write the character into a ByteArray so
// we can pull it out as a raw byte value.
data.writeUTFBytes(char);
data.position = 0;
c = data.readByte();
-
+
if (c & 0x80)
{
// don't escape high byte characters. It can make international
@@ -123,10 +123,10 @@ package com.adobe.net
// control characters must be escaped.
return c;
}
-
+
this.position = (c >> 3);
mask = this.readByte();
-
+
if (mask & (1 << (c & 0x7)))
{
// we need to escape this, return the numeric value
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/net/proxies/RFC2817Socket.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/net/proxies/RFC2817Socket.as
similarity index 95%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/net/proxies/RFC2817Socket.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/net/proxies/RFC2817Socket.as
index c52ee39b606a..5bec6017f2ed 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/net/proxies/RFC2817Socket.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/net/proxies/RFC2817Socket.as
@@ -1,34 +1,34 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
- Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
+
+ Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
- distribute this source code and such derivative works in source or
- object code form without any attribution requirements.
-
+ distribute this source code and such derivative works in source or
+ object code form without any attribution requirements.
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
- against any loss, damage, claims or lawsuits, including attorney's
- fees that arise or result from your use or distribution of the source
+ against any loss, damage, claims or lawsuits, including attorney's
+ fees that arise or result from your use or distribution of the source
code.
-
- THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
+
+ THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
@@ -42,22 +42,22 @@ package com.adobe.net.proxies
/**
* This class allows TCP socket connections through HTTP proxies in accordance with
* RFC 2817:
- *
+ *
* ftp://ftp.rfc-editor.org/in-notes/rfc2817.txt
- *
+ *
* It can also be used to make direct connections to a destination, as well. If you
* pass the host and port into the constructor, no proxy will be used. You can also
* call connect, passing in the host and the port, and if you didn't set the proxy
* info, a direct connection will be made. A proxy is only used after you have called
* the setProxyInfo function.
- *
+ *
* The connection to and negotiation with the proxy is completely hidden. All the
* same events are thrown whether you are using a proxy or not, and the data you
* receive from the target server will look exact as it would if you were connected
* to it directly rather than through a proxy.
- *
+ *
* @author Christian Cantrell
- *
+ *
**/
public class RFC2817Socket
extends Socket
@@ -81,7 +81,7 @@ package com.adobe.net.proxies
super(host, port);
}
}
-
+
/**
* Set the proxy host and port number. Your connection will only proxied if
* this function has been called.
@@ -104,7 +104,7 @@ package com.adobe.net.proxies
super.removeEventListener(Event.CONNECT, deferredConnectHandler.listener, deferredConnectHandler.useCapture);
}
}
-
+
/**
* Connect to the specified host over the specified port. If you want your
* connection proxied, call the setProxyInfo function first.
@@ -133,7 +133,7 @@ package com.adobe.net.proxies
this.flush();
this.redirectConnectEvent();
}
-
+
private function onSocketData(event:ProgressEvent):void
{
while (this.bytesAvailable != 0)
@@ -146,7 +146,7 @@ package com.adobe.net.proxies
}
}
}
-
+
private function checkResponse(event:ProgressEvent):void
{
var responseCode:String = this.buffer.substr(this.buffer.indexOf(" ")+1, 3);
@@ -168,27 +168,27 @@ package com.adobe.net.proxies
}
this.buffer = null;
}
-
+
private function redirectConnectEvent():void
{
super.removeEventListener(Event.CONNECT, onConnect);
var deferredEventHandler:Object = this.deferredEventHandlers[Event.CONNECT];
if (deferredEventHandler != null)
{
- super.addEventListener(Event.CONNECT, deferredEventHandler.listener, deferredEventHandler.useCapture, deferredEventHandler.priority, deferredEventHandler.useWeakReference);
+ super.addEventListener(Event.CONNECT, deferredEventHandler.listener, deferredEventHandler.useCapture, deferredEventHandler.priority, deferredEventHandler.useWeakReference);
}
}
-
+
private function redirectSocketDataEvent():void
{
super.removeEventListener(ProgressEvent.SOCKET_DATA, onSocketData);
var deferredEventHandler:Object = this.deferredEventHandlers[ProgressEvent.SOCKET_DATA];
if (deferredEventHandler != null)
{
- super.addEventListener(ProgressEvent.SOCKET_DATA, deferredEventHandler.listener, deferredEventHandler.useCapture, deferredEventHandler.priority, deferredEventHandler.useWeakReference);
+ super.addEventListener(ProgressEvent.SOCKET_DATA, deferredEventHandler.listener, deferredEventHandler.useCapture, deferredEventHandler.priority, deferredEventHandler.useWeakReference);
}
}
-
+
public override function addEventListener(type:String, listener:Function, useCapture:Boolean = false, priority:int=0.0, useWeakReference:Boolean=false):void
{
if (type == Event.CONNECT || type == ProgressEvent.SOCKET_DATA)
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSON.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSON.as
similarity index 98%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSON.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSON.as
index 1d2477e21e56..c45b5ea5a541 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSON.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSON.as
@@ -1,24 +1,24 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
+
Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
distribute this source code and such derivative works in source or
object code form without any attribution requirements.
-
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
against any loss, damage, claims or lawsuits, including attorney's
fees that arise or result from your use or distribution of the source
code.
-
+
THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -48,8 +48,8 @@ package com.adobe.serialization.json {
* </code>
*/
public class JSON {
-
-
+
+
/**
* Encodes a object into a JSON string.
*
@@ -60,15 +60,15 @@ package com.adobe.serialization.json {
* @tiptext
*/
public static function encode( o:Object ):String {
-
+
var encoder:JSONEncoder = new JSONEncoder( o );
return encoder.getString();
-
+
}
-
+
/**
* Decodes a JSON string into a native object.
- *
+ *
* @param s The JSON string representing the object
* @return A native object as specified by s
* @throw JSONParseError
@@ -77,12 +77,12 @@ package com.adobe.serialization.json {
* @tiptext
*/
public static function decode( s:String ):* {
-
+
var decoder:JSONDecoder = new JSONDecoder( s )
return decoder.getValue();
-
+
}
-
+
}
}
\ No newline at end of file
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONDecoder.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONDecoder.as
similarity index 96%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONDecoder.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONDecoder.as
index ba35ebbccf08..098c756a368c 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONDecoder.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONDecoder.as
@@ -1,24 +1,24 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
+
Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
distribute this source code and such derivative works in source or
object code form without any attribution requirements.
-
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
against any loss, damage, claims or lawsuits, including attorney's
fees that arise or result from your use or distribution of the source
code.
-
+
THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -36,18 +36,18 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
package com.adobe.serialization.json {
public class JSONDecoder {
-
+
/** The value that will get parsed from the JSON string */
private var value:*;
-
+
/** The tokenizer designated to read the JSON string */
private var tokenizer:JSONTokenizer;
-
+
/** The current token from the tokenizer */
private var token:JSONToken;
-
+
/**
- * Constructs a new JSONDecoder to parse a JSON string
+ * Constructs a new JSONDecoder to parse a JSON string
* into a native object.
*
* @param s The JSON string to be converted
@@ -57,13 +57,13 @@ package com.adobe.serialization.json {
* @tiptext
*/
public function JSONDecoder( s:String ) {
-
+
tokenizer = new JSONTokenizer( s );
-
+
nextToken();
value = parseValue();
}
-
+
/**
* Gets the internal object that was created by parsing
* the JSON string passed to the constructor.
@@ -77,7 +77,7 @@ package com.adobe.serialization.json {
public function getValue():* {
return value;
}
-
+
/**
* Returns the next token from the tokenzier reading
* the JSON string
@@ -85,7 +85,7 @@ package com.adobe.serialization.json {
private function nextToken():JSONToken {
return token = tokenizer.getNextToken();
}
-
+
/**
* Attempt to parse an array
*/
@@ -93,26 +93,26 @@ package com.adobe.serialization.json {
// create an array internally that we're going to attempt
// to parse from the tokenizer
var a:Array = new Array();
-
+
// grab the next token from the tokenizer to move
// past the opening [
nextToken();
-
+
// check to see if we have an empty array
if ( token.type == JSONTokenType.RIGHT_BRACKET ) {
// we're done reading the array, so return it
return a;
}
-
+
// deal with elements of the array, and use an "infinite"
// loop because we could have any amount of elements
while ( true ) {
// read in the value and add it to the array
a.push ( parseValue() );
-
+
// after the value there should be a ] or a ,
nextToken();
-
+
if ( token.type == JSONTokenType.RIGHT_BRACKET ) {
// we're done reading the array, so return it
return a;
@@ -125,7 +125,7 @@ package com.adobe.serialization.json {
}
return null;
}
-
+
/**
* Attempt to parse an object
*/
@@ -133,46 +133,46 @@ package com.adobe.serialization.json {
// create the object internally that we're going to
// attempt to parse from the tokenizer
var o:Object = new Object();
-
+
// store the string part of an object member so
// that we can assign it a value in the object
var key:String
-
+
// grab the next token from the tokenizer
nextToken();
-
+
// check to see if we have an empty object
if ( token.type == JSONTokenType.RIGHT_BRACE ) {
// we're done reading the object, so return it
return o;
}
-
+
// deal with members of the object, and use an "infinite"
// loop because we could have any amount of members
while ( true ) {
-
+
if ( token.type == JSONTokenType.STRING ) {
// the string value we read is the key for the object
key = String( token.value );
-
+
// move past the string to see what's next
nextToken();
-
+
// after the string there should be a :
if ( token.type == JSONTokenType.COLON ) {
-
+
// move past the : and read/assign a value for the key
nextToken();
- o[key] = parseValue();
-
+ o[key] = parseValue();
+
// move past the value to see what's next
nextToken();
-
+
// after the value there's either a } or a ,
if ( token.type == JSONTokenType.RIGHT_BRACE ) {
// // we're done reading the object, so return it
return o;
-
+
} else if ( token.type == JSONTokenType.COMMA ) {
// skip past the comma and read another member
nextToken();
@@ -188,7 +188,7 @@ package com.adobe.serialization.json {
}
return null;
}
-
+
/**
* Attempt to parse a value
*/
@@ -199,14 +199,14 @@ package com.adobe.serialization.json {
{
tokenizer.parseError( "Unexpected end of input" );
}
-
+
switch ( token.type ) {
case JSONTokenType.LEFT_BRACE:
return parseObject();
-
+
case JSONTokenType.LEFT_BRACKET:
return parseArray();
-
+
case JSONTokenType.STRING:
case JSONTokenType.NUMBER:
case JSONTokenType.TRUE:
@@ -216,7 +216,7 @@ package com.adobe.serialization.json {
default:
tokenizer.parseError( "Unexpected " + token.value );
-
+
}
return null;
}
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONEncoder.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONEncoder.as
similarity index 95%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONEncoder.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONEncoder.as
index 05e38387ca06..4bd826f718a3 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONEncoder.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONEncoder.as
@@ -1,24 +1,24 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
+
Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
distribute this source code and such derivative works in source or
object code form without any attribution requirements.
-
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
against any loss, damage, claims or lawsuits, including attorney's
fees that arise or result from your use or distribution of the source
code.
-
+
THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -35,9 +35,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
package com.adobe.serialization.json {
import flash.utils.describeType;
-
+
public class JSONEncoder {
-
+
/** The string that is going to represent the object we're encoding */
private var jsonString:String;
@@ -51,9 +51,9 @@ package com.adobe.serialization.json {
*/
public function JSONEncoder( value:* ) {
jsonString = convertToString( value );
-
+
}
-
+
/**
* Gets the JSON string from the encoder.
*
@@ -66,43 +66,43 @@ package com.adobe.serialization.json {
public function getString():String {
return jsonString;
}
-
+
/**
* Converts a value to it's JSON string equivalent.
*
- * @param value The value to convert. Could be any
+ * @param value The value to convert. Could be any
* type (object, number, array, etc)
*/
private function convertToString( value:* ):String {
-
+
// determine what value is and convert it based on it's type
if ( value is String ) {
// escape the string so it's formatted correctly
return escapeString( value as String );
-
+
} else if ( value is Number ) {
-
+
// only encode numbers that finate
return isFinite( value as Number) ? value.toString() : "null";
} else if ( value is Boolean ) {
-
+
// convert boolean to string easily
return value ? "true" : "false";
} else if ( value is Array ) {
-
+
// call the helper method to convert an array
return arrayToString( value as Array );
-
+
} else if ( value is Object && value != null ) {
-
+
// call the helper method to convert an object
return objectToString( value );
}
return "null";
}
-
+
/**
* Escapes a string accoding to the JSON specification.
*
@@ -117,46 +117,46 @@ package com.adobe.serialization.json {
var ch:String;
// store the length in a local variable to reduce lookups
var len:Number = str.length;
-
+
// loop over all of the characters in the string
for ( var i:int = 0; i < len; i++ ) {
-
+
// examine the character to determine if we have to escape it
ch = str.charAt( i );
switch ( ch ) {
-
+
case '"': // quotation mark
s += "\\\"";
break;
-
+
//case '/': // solidus
// s += "\\/";
// break;
-
+
case '\\': // reverse solidus
s += "\\\\";
break;
-
+
case '\b': // bell
s += "\\b";
break;
-
+
case '\f': // form feed
s += "\\f";
break;
-
+
case '\n': // newline
s += "\\n";
break;
-
+
case '\r': // carriage return
s += "\\r";
break;
-
+
case '\t': // horizontal tab
s += "\\t";
break;
-
+
default: // everything else
if ( ch < ' ' || ch > '}' ) {
@@ -185,23 +185,23 @@ package com.adobe.serialization.json {
// ensure that there are 4 digits by adjusting
// the # of zeros accordingly.
var zeroPad:String = hexCode.length == 2 ? "00" : "000";
-
+
// create the unicode escape sequence with 4 hex digits
s += "\\u" + zeroPad + hexCode;
} else {
-
+
// no need to do any special encoding, just pass-through
s += ch;
-
+
}
*/
} // end switch
-
+
} // end for loop
-
+
return "\"" + s + "\"";
}
-
+
/**
* Converts an array to it's JSON string equivalent
*
@@ -211,7 +211,7 @@ package com.adobe.serialization.json {
private function arrayToString( a:Array ):String {
// create a string to store the array's jsonstring value
var s:String = "";
-
+
// loop over the elements in the array and add their converted
// values to the string
for ( var i:int = 0; i < a.length; i++ ) {
@@ -221,11 +221,11 @@ package com.adobe.serialization.json {
// we've already added an element, so add the comma separator
s += ","
}
-
+
// convert the value to a string
- s += convertToString( a[i] );
+ s += convertToString( a[i] );
}
-
+
// KNOWN ISSUE: In ActionScript, Arrays can also be associative
// objects and you can put anything in them, ie:
// myArray["foo"] = "bar";
@@ -241,11 +241,11 @@ package com.adobe.serialization.json {
// A possible solution is to instead encode the Array as an Object
// but then it won't get decoded correctly (and won't be an
// Array instance)
-
+
// close the array and return it's string value
return "[" + s + "]";
}
-
+
/**
* Converts an object to it's JSON string equivalent
*
@@ -257,49 +257,49 @@ package com.adobe.serialization.json {
// create a string to store the object's jsonstring value
var s:String = "";
-
+
// determine if o is a class instance or a plain object
var classInfo:XML = describeType( o );
-
+
if ( classInfo.@name.toString() == "Object" )
{
- // the value of o[key] in the loop below - store this
+ // the value of o[key] in the loop below - store this
// as a variable so we don't have to keep looking up o[key]
// when testing for valid values to convert
var value:Object;
-
+
// loop over the keys in the object and add their converted
// values to the string
for ( var key:String in o )
{
// assign value to a variable for quick lookup
value = o[key];
-
+
// don't add function's to the JSON string
if ( value is Function )
{
// skip this key and try another
continue;
}
-
+
// Modified by api, skip nulls
if (value == null) {
continue;
}
-
+
// when the length is 0 we're adding the first item so
// no comma is necessary
if ( s.length > 0 ) {
// we've already added an item, so add the comma separator
s += ",";
}
-
+
s += escapeString( key ) + ":" + convertToString( value );
}
}
else // o is a class instance
{
- // Loop over all of the variables and accessors in the class and
+ // Loop over all of the variables and accessors in the class and
// serialize them along with their values.
var exposed:XMLList = classInfo.*.(hasOwnProperty("metadata") && metadata.@name=="Value");
for each (var v:XML in exposed) {
@@ -312,17 +312,17 @@ package com.adobe.serialization.json {
// We've already added an item, so add the comma separator
s += ","
}
- s += (v.metadata.arg.@key == "name" ? v.metadata.arg.@value : escapeString(v.@name.toString())) + ":"
+ s += (v.metadata.arg.@key == "name" ? v.metadata.arg.@value : escapeString(v.@name.toString())) + ":"
+ convertToString( o[ v.@name ] );
}
}
-
+
}
-
+
return "{" + s + "}";
}
-
+
}
-
+
}
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONParseError.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONParseError.as
similarity index 99%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONParseError.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONParseError.as
index b8c0ecfadde7..c9c61c19555d 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONParseError.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONParseError.as
@@ -1,24 +1,24 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
+
Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
distribute this source code and such derivative works in source or
object code form without any attribution requirements.
-
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
against any loss, damage, claims or lawsuits, including attorney's
fees that arise or result from your use or distribution of the source
code.
-
+
THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -40,13 +40,13 @@ package com.adobe.serialization.json {
*
*/
public class JSONParseError extends Error {
-
+
/** The location in the string where the error occurred */
private var _location:int;
-
+
/** The string in which the parse error occurred */
private var _text:String;
-
+
/**
* Constructs a new JSONParseError.
*
@@ -73,7 +73,7 @@ package com.adobe.serialization.json {
public function get location():int {
return _location;
}
-
+
/**
* Provides read-only access to the text variable.
*
@@ -86,5 +86,5 @@ package com.adobe.serialization.json {
return _text;
}
}
-
+
}
\ No newline at end of file
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONToken.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONToken.as
similarity index 96%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONToken.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONToken.as
index 51e371495857..e70443917ae1 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONToken.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONToken.as
@@ -1,24 +1,24 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
+
Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
distribute this source code and such derivative works in source or
object code form without any attribution requirements.
-
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
against any loss, damage, claims or lawsuits, including attorney's
fees that arise or result from your use or distribution of the source
code.
-
+
THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -36,10 +36,10 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
package com.adobe.serialization.json {
public class JSONToken {
-
+
private var _type:int;
private var _value:Object;
-
+
/**
* Creates a new JSONToken with a specific token type and value.
*
@@ -53,7 +53,7 @@ package com.adobe.serialization.json {
_type = type;
_value = value;
}
-
+
/**
* Returns the type of the token.
*
@@ -63,9 +63,9 @@ package com.adobe.serialization.json {
* @tiptext
*/
public function get type():int {
- return _type;
+ return _type;
}
-
+
/**
* Sets the type of the token.
*
@@ -75,9 +75,9 @@ package com.adobe.serialization.json {
* @tiptext
*/
public function set type( value:int ):void {
- _type = value;
+ _type = value;
}
-
+
/**
* Gets the value of the token
*
@@ -87,9 +87,9 @@ package com.adobe.serialization.json {
* @tiptext
*/
public function get value():Object {
- return _value;
+ return _value;
}
-
+
/**
* Sets the value of the token
*
@@ -99,9 +99,9 @@ package com.adobe.serialization.json {
* @tiptext
*/
public function set value ( v:Object ):void {
- _value = v;
+ _value = v;
}
}
-
+
}
\ No newline at end of file
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONTokenType.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONTokenType.as
similarity index 97%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONTokenType.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONTokenType.as
index 398a0f47f8f6..54934f148e69 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONTokenType.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONTokenType.as
@@ -1,24 +1,24 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
+
Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
distribute this source code and such derivative works in source or
object code form without any attribution requirements.
-
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
against any loss, damage, claims or lawsuits, including attorney's
fees that arise or result from your use or distribution of the source
code.
-
+
THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -40,31 +40,31 @@ package com.adobe.serialization.json {
* of tokens in a JSON encoded string.
*/
public class JSONTokenType {
-
+
public static const UNKNOWN:int = -1;
-
+
public static const COMMA:int = 0;
-
+
public static const LEFT_BRACE:int = 1;
-
+
public static const RIGHT_BRACE:int = 2;
-
+
public static const LEFT_BRACKET:int = 3;
-
+
public static const RIGHT_BRACKET:int = 4;
-
+
public static const COLON:int = 6;
-
+
public static const TRUE:int = 7;
-
+
public static const FALSE:int = 8;
-
+
public static const NULL:int = 9;
-
+
public static const STRING:int = 10;
-
+
public static const NUMBER:int = 11;
-
+
}
-
+
}
\ No newline at end of file
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONTokenizer.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONTokenizer.as
similarity index 94%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONTokenizer.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONTokenizer.as
index 055047486fb3..401810ca905c 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONTokenizer.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/serialization/json/JSONTokenizer.as
@@ -1,24 +1,24 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
+
Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
distribute this source code and such derivative works in source or
object code form without any attribution requirements.
-
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
against any loss, damage, claims or lawsuits, including attorney's
fees that arise or result from your use or distribution of the source
code.
-
+
THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -36,21 +36,21 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
package com.adobe.serialization.json {
public class JSONTokenizer {
-
+
/** The object that will get parsed from the JSON string */
private var obj:Object;
-
+
/** The JSON string to be parsed */
private var jsonString:String;
-
+
/** The current parsing location in the JSON string */
private var loc:int;
-
+
/** The current character in the JSON string during parsing */
private var ch:String;
-
+
/**
- * Constructs a new JSONDecoder to parse a JSON string
+ * Constructs a new JSONDecoder to parse a JSON string
* into a native object.
*
* @param s The JSON string to be converted
@@ -59,64 +59,64 @@ package com.adobe.serialization.json {
public function JSONTokenizer( s:String ) {
jsonString = s;
loc = 0;
-
+
// prime the pump by getting the first character
nextChar();
}
-
+
/**
* Gets the next token in the input sting and advances
* the character to the next character after the token
*/
public function getNextToken():JSONToken {
var token:JSONToken = new JSONToken();
-
- // skip any whitespace / comments since the last
+
+ // skip any whitespace / comments since the last
// token was read
skipIgnored();
-
+
// examine the new character and see what we have...
switch ( ch ) {
-
+
case '{':
token.type = JSONTokenType.LEFT_BRACE;
token.value = '{';
nextChar();
break
-
+
case '}':
token.type = JSONTokenType.RIGHT_BRACE;
token.value = '}';
nextChar();
break
-
+
case '[':
token.type = JSONTokenType.LEFT_BRACKET;
token.value = '[';
nextChar();
break
-
+
case ']':
token.type = JSONTokenType.RIGHT_BRACKET;
token.value = ']';
nextChar();
break
-
+
case ',':
token.type = JSONTokenType.COMMA;
token.value = ',';
nextChar();
break
-
+
case ':':
token.type = JSONTokenType.COLON;
token.value = ':';
nextChar();
break;
-
+
case 't': // attempt to read true
var possibleTrue:String = "t" + nextChar() + nextChar() + nextChar();
-
+
if ( possibleTrue == "true" ) {
token.type = JSONTokenType.TRUE;
token.value = true;
@@ -124,12 +124,12 @@ package com.adobe.serialization.json {
} else {
parseError( "Expecting 'true' but found " + possibleTrue );
}
-
+
break;
-
+
case 'f': // attempt to read false
var possibleFalse:String = "f" + nextChar() + nextChar() + nextChar() + nextChar();
-
+
if ( possibleFalse == "false" ) {
token.type = JSONTokenType.FALSE;
token.value = false;
@@ -137,13 +137,13 @@ package com.adobe.serialization.json {
} else {
parseError( "Expecting 'false' but found " + possibleFalse );
}
-
+
break;
-
+
case 'n': // attempt to read null
-
+
var possibleNull:String = "n" + nextChar() + nextChar() + nextChar();
-
+
if ( possibleNull == "null" ) {
token.type = JSONTokenType.NULL;
token.value = null;
@@ -151,34 +151,34 @@ package com.adobe.serialization.json {
} else {
parseError( "Expecting 'null' but found " + possibleNull );
}
-
+
break;
-
+
case '"': // the start of a string
token = readString();
break;
-
+
case "'": // the start of a string
token = readString();
break;
-
- default:
+
+ default:
// see if we can read a number
if ( isDigit( ch ) || ch == '-' ) {
token = readNumber();
} else if ( ch == '' ) {
// check for reading past the end of the string
return null;
- } else {
+ } else {
// not sure what was in the input string - it's not
// anything we expected
parseError( "Unexpected " + ch + " encountered" );
}
}
-
+
return token;
}
-
+
/**
* Attempts to read a string from the input string. Places
* the character location at the first character after the
@@ -191,68 +191,68 @@ package com.adobe.serialization.json {
// the token for the string we'll try to read
var token:JSONToken = new JSONToken();
token.type = JSONTokenType.STRING;
-
+
// the string to store the string we'll try to read
var string:String = "";
-
+
// advance past the first "
nextChar();
-
+
while ( ch != '"' && ch != "'" && ch != '' ) {
-
+
// unescape the escape sequences in the string
if ( ch == '\\' ) {
-
+
// get the next character so we know what
// to unescape
nextChar();
-
+
switch ( ch ) {
-
+
case '"': // quotation mark
string += '"';
break;
-
+
case "'":
string += "'";
break;
-
+
case '/': // solidus
string += "/";
break;
-
+
case '\\': // reverse solidus
string += '\\';
break;
-
+
case 'b': // bell
string += '\b';
break;
-
+
case 'f': // form feed
string += '\f';
break;
-
+
case 'n': // newline
string += '\n';
break;
-
+
case 'r': // carriage return
string += '\r';
break;
-
+
case 't': // horizontal tab
string += '\t'
break;
-
+
case 'u':
// convert a unicode escape sequence
// to it's character value - expecting
// 4 hex digits
-
+
// save the characters as a string we'll convert to an int
var hexValue:String = "";
-
+
// try to find 4 hex characters
for ( var i:int = 0; i < 4; i++ ) {
// get the next character and determine
@@ -263,52 +263,52 @@ package com.adobe.serialization.json {
// valid, add it to the value
hexValue += ch;
}
-
+
// convert hexValue to an integer, and use that
// integrer value to create a character to add
// to our string.
string += String.fromCharCode( parseInt( hexValue, 16 ) );
-
+
break;
-
+
default:
// couldn't unescape the sequence, so just
// pass it through
string += '\\' + ch;
-
+
}
-
+
} else {
// didn't have to unescape, so add the character to the string
string += ch;
-
+
}
-
+
// move to the next character
nextChar();
-
+
}
-
+
// we read past the end of the string without closing it, which
// is a parse error
if ( ch == '' ) {
parseError( "Unterminated string literal" );
}
-
+
// move past the closing " in the input string
nextChar();
-
+
// attach to the string to the token so we can return it
token.value = string;
-
+
return token;
}
-
+
/**
* Attempts to read a number from the input string. Places
* the character location at the first character after the
* number.
- *
+ *
* @return The JSONToken with the number value if a number could
* be read. Throws an error otherwise.
*/
@@ -316,30 +316,30 @@ package com.adobe.serialization.json {
// the token for the number we'll try to read
var token:JSONToken = new JSONToken();
token.type = JSONTokenType.NUMBER;
-
+
// the string to accumulate the number characters
// into that we'll convert to a number at the end
var input:String = "";
-
+
// check for a negative number
if ( ch == '-' ) {
input += '-';
nextChar();
}
-
+
// the number must start with a digit
if ( !isDigit( ch ) )
{
parseError( "Expecting a digit" );
}
-
+
// 0 can only be the first digit if it
// is followed by a decimal point
if ( ch == '0' )
{
input += ch;
nextChar();
-
+
// make sure no other digits come after 0
if ( isDigit( ch ) )
{
@@ -354,25 +354,25 @@ package com.adobe.serialization.json {
nextChar();
}
}
-
+
// check for a decimal value
if ( ch == '.' ) {
input += '.';
nextChar();
-
+
// after the decimal there has to be a digit
if ( !isDigit( ch ) )
{
parseError( "Expecting a digit" );
}
-
+
// read more numbers to get the decimal value
while ( isDigit( ch ) ) {
input += ch;
nextChar();
}
}
-
+
// check for scientific notation
if ( ch == 'e' || ch == 'E' )
{
@@ -384,14 +384,14 @@ package com.adobe.serialization.json {
input += ch;
nextChar();
}
-
+
// require at least one number for the exponent
// in this case
if ( !isDigit( ch ) )
{
parseError( "Scientific notation number needs exponent value" );
}
-
+
// read in the exponent
while ( isDigit( ch ) )
{
@@ -399,10 +399,10 @@ package com.adobe.serialization.json {
nextChar();
}
}
-
+
// convert the string to a number value
var num:Number = Number( input );
-
+
if ( isFinite( num ) && !isNaN( num ) ) {
token.value = num;
return token;
@@ -422,7 +422,7 @@ package com.adobe.serialization.json {
private function nextChar():String {
return ch = jsonString.charAt( loc++ );
}
-
+
/**
* Advances the character location past any
* sort of white space and comments
@@ -440,7 +440,7 @@ package com.adobe.serialization.json {
skipComments();
} while ( originalLoc != loc );
}
-
+
/**
* Skips comments in the input string, either
* single-line or multi-line. Advances the character
@@ -452,23 +452,23 @@ package com.adobe.serialization.json {
nextChar();
switch ( ch ) {
case '/': // single-line comment, read through end of line
-
+
// Loop over the characters until we find
// a newline or until there's no more characters left
do {
nextChar();
} while ( ch != '\n' && ch != '' )
-
+
// move past the \n
nextChar();
-
+
break;
-
+
case '*': // multi-line comment, read until closing */
// move past the opening *
nextChar();
-
+
// try to find a trailing */
while ( true ) {
if ( ch == '*' ) {
@@ -483,8 +483,8 @@ package com.adobe.serialization.json {
// move along, looking if the next character is a *
nextChar();
}
-
- // when we're here we've read past the end of
+
+ // when we're here we've read past the end of
// the string without finding a closing */, so error
if ( ch == '' ) {
parseError( "Multi-line comment not closed" );
@@ -492,32 +492,32 @@ package com.adobe.serialization.json {
}
break;
-
+
// Can't match a comment after a /, so it's a parsing error
default:
parseError( "Unexpected " + ch + " encountered (expecting '/' or '*' )" );
}
}
-
+
}
-
-
+
+
/**
* Skip any whitespace in the input string and advances
* the character to the first character after any possible
* whitespace.
*/
private function skipWhite():void {
-
- // As long as there are spaces in the input
+
+ // As long as there are spaces in the input
// stream, advance the current location pointer
// past them
while ( isWhiteSpace( ch ) ) {
nextChar();
}
-
+
}
-
+
/**
* Determines if a character is whitespace or not.
*
@@ -527,7 +527,7 @@ package com.adobe.serialization.json {
private function isWhiteSpace( ch:String ):Boolean {
return ( ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r' );
}
-
+
/**
* Determines if a character is a digit [0-9].
*
@@ -536,7 +536,7 @@ package com.adobe.serialization.json {
private function isDigit( ch:String ):Boolean {
return ( ch >= '0' && ch <= '9' );
}
-
+
/**
* Determines if a character is a digit [0-9].
*
@@ -546,12 +546,12 @@ package com.adobe.serialization.json {
// get the uppercase value of ch so we only have
// to compare the value between 'A' and 'F'
var uc:String = ch.toUpperCase();
-
+
// a hex digit is a digit of A-F, inclusive ( using
// our uppercase constraint )
return ( isDigit( ch ) || ( uc >= 'A' && uc <= 'F' ) );
}
-
+
/**
* Raises a parsing error with a specified message, tacking
* on the error location and the original string.
@@ -562,5 +562,5 @@ package com.adobe.serialization.json {
throw new JSONParseError( message, loc, jsonString );
}
}
-
+
}
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/utils/ArrayUtil.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/utils/ArrayUtil.as
similarity index 93%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/utils/ArrayUtil.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/utils/ArrayUtil.as
index c53560291234..76ec0ef80191 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/utils/ArrayUtil.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/utils/ArrayUtil.as
@@ -1,76 +1,76 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
- Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
+
+ Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
- distribute this source code and such derivative works in source or
- object code form without any attribution requirements.
-
+ distribute this source code and such derivative works in source or
+ object code form without any attribution requirements.
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
- against any loss, damage, claims or lawsuits, including attorney's
- fees that arise or result from your use or distribution of the source
+ against any loss, damage, claims or lawsuits, including attorney's
+ fees that arise or result from your use or distribution of the source
code.
-
- THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
+
+ THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package com.adobe.utils
{
-
+
/**
* Class that contains static utility methods for manipulating and working
* with Arrays.
- *
+ *
* Note that all APIs assume that they are working with well formed arrays.
- * i.e. they will only manipulate indexed values.
- *
+ * i.e. they will only manipulate indexed values.
+ *
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
* @tiptext
- */
+ */
public class ArrayUtil
{
-
+
/**
- * Determines whether the specified array contains the specified value.
- *
+ * Determines whether the specified array contains the specified value.
+ *
* @param arr The array that will be checked for the specified value.
*
* @param value The object which will be searched for within the array
- *
+ *
* @return True if the array contains the value, False if it does not.
*
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
* @tiptext
- */
+ */
public static function arrayContainsValue(arr:Array, value:Object):Boolean
{
return (arr.indexOf(value) != -1);
- }
-
+ }
+
/**
* Remove all instances of the specified value from the array,
- *
+ *
* @param arr The array from which the value will be removed
*
* @param value The object that will be removed from the array.
@@ -78,18 +78,18 @@ package com.adobe.utils
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
* @tiptext
- */
+ */
public static function removeValueFromArray(arr:Array, value:Object):void
{
var len:uint = arr.length;
-
+
for(var i:Number = len; i > -1; i--)
{
if(arr[i] === value)
{
arr.splice(i, 1);
}
- }
+ }
}
/**
@@ -98,7 +98,7 @@ package com.adobe.utils
*
* Basically, this can be used to remove duplication object instances
* from an array
- *
+ *
* @param arr The array which contains the values that will be used to
* create the new array that contains no duplicate values.
*
@@ -108,36 +108,36 @@ package com.adobe.utils
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
* @tiptext
- */
+ */
public static function createUniqueCopy(a:Array):Array
{
var newArray:Array = new Array();
-
+
var len:Number = a.length;
var item:Object;
-
+
for (var i:uint = 0; i < len; ++i)
{
item = a[i];
-
+
if(ArrayUtil.arrayContainsValue(newArray, item))
{
continue;
}
-
+
newArray.push(item);
}
-
+
return newArray;
}
-
+
/**
* Creates a copy of the specified array.
*
* Note that the array returned is a new array but the items within the
- * array are not copies of the items in the original array (but rather
+ * array are not copies of the items in the original array (but rather
* references to the same items)
- *
+ *
* @param arr The array that will be copies
*
* @return A new array which contains the same items as the array passed
@@ -146,16 +146,16 @@ package com.adobe.utils
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
* @tiptext
- */
+ */
public static function copyArray(arr:Array):Array
- {
+ {
return arr.slice();
}
-
+
/**
* Compares two arrays and returns a boolean indicating whether the arrays
* contain the same values at the same indexes.
- *
+ *
* @param arr1 The first array that will be compared to the second.
*
* @param arr2 The second array that will be compared to the first.
@@ -166,16 +166,16 @@ package com.adobe.utils
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
* @tiptext
- */
+ */
public static function arraysAreEqual(arr1:Array, arr2:Array):Boolean
{
if(arr1.length != arr2.length)
{
return false;
}
-
+
var len:Number = arr1.length;
-
+
for(var i:Number = 0; i < len; i++)
{
if(arr1[i] !== arr2[i])
@@ -183,7 +183,7 @@ package com.adobe.utils
return false;
}
}
-
+
return true;
}
}
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/utils/DateUtil.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/utils/DateUtil.as
similarity index 94%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/utils/DateUtil.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/utils/DateUtil.as
index 5d5d792d6906..3e90003d8f8b 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/utils/DateUtil.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/utils/DateUtil.as
@@ -1,34 +1,34 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
- Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
+
+ Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
- distribute this source code and such derivative works in source or
- object code form without any attribution requirements.
-
+ distribute this source code and such derivative works in source or
+ object code form without any attribution requirements.
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
- against any loss, damage, claims or lawsuits, including attorney's
- fees that arise or result from your use or distribution of the source
+ against any loss, damage, claims or lawsuits, including attorney's
+ fees that arise or result from your use or distribution of the source
code.
-
- THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
+
+ THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
@@ -40,21 +40,21 @@ package com.adobe.utils
/**
* Class that contains static utility methods for manipulating and working
* with Dates.
- *
+ *
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
* @tiptext
- */
+ */
public class DateUtil
{
-
+
/**
* Returns the English Short Month name (3 letters) for the Month that
- * the Date represents.
- *
+ * the Date represents.
+ *
* @param d The Date instance whose month will be used to retrieve the
* short month name.
- *
+ *
* @return An English 3 Letter Month abbreviation.
*
* @langversion ActionScript 3.0
@@ -62,7 +62,7 @@ package com.adobe.utils
* @tiptext
*
* @see SHORT_MONTH
- */
+ */
public static function getShortMonthName(d:Date):String
{
return DateBase.monthNamesShort[d.getMonth()];
@@ -70,13 +70,13 @@ package com.adobe.utils
/**
* Returns the index of the month that the short month name string
- * represents.
- *
+ * represents.
+ *
* @param m The 3 letter abbreviation representing a short month name.
*
* @param Optional parameter indicating whether the search should be case
* sensitive
- *
+ *
* @return A int that represents that month represented by the specifed
* short name.
*
@@ -85,19 +85,19 @@ package com.adobe.utils
* @tiptext
*
* @see SHORT_MONTH
- */
+ */
public static function getShortMonthIndex(m:String):int
{
return DateBase.monthNamesShort.indexOf(m);
}
-
+
/**
* Returns the English full Month name for the Month that
- * the Date represents.
- *
+ * the Date represents.
+ *
* @param d The Date instance whose month will be used to retrieve the
* full month name.
- *
+ *
* @return An English full month name.
*
* @langversion ActionScript 3.0
@@ -105,18 +105,18 @@ package com.adobe.utils
* @tiptext
*
* @see FULL_MONTH
- */
+ */
public static function getFullMonthName(d:Date):String
{
- return DateBase.monthNamesLong[d.getMonth()];
+ return DateBase.monthNamesLong[d.getMonth()];
}
/**
* Returns the index of the month that the full month name string
- * represents.
- *
+ * represents.
+ *
* @param m A full month name.
- *
+ *
* @return A int that represents that month represented by the specifed
* full month name.
*
@@ -125,7 +125,7 @@ package com.adobe.utils
* @tiptext
*
* @see FULL_MONTH
- */
+ */
public static function getFullMonthIndex(m:String):int
{
return DateBase.monthNamesLong.indexOf(m);
@@ -133,11 +133,11 @@ package com.adobe.utils
/**
* Returns the English Short Day name (3 letters) for the day that
- * the Date represents.
- *
+ * the Date represents.
+ *
* @param d The Date instance whose day will be used to retrieve the
* short day name.
- *
+ *
* @return An English 3 Letter day abbreviation.
*
* @langversion ActionScript 3.0
@@ -145,18 +145,18 @@ package com.adobe.utils
* @tiptext
*
* @see SHORT_DAY
- */
+ */
public static function getShortDayName(d:Date):String
{
- return DateBase.dayNamesShort[d.getDay()];
+ return DateBase.dayNamesShort[d.getDay()];
}
-
+
/**
* Returns the index of the day that the short day name string
- * represents.
- *
+ * represents.
+ *
* @param m A short day name.
- *
+ *
* @return A int that represents that short day represented by the specifed
* full month name.
*
@@ -165,7 +165,7 @@ package com.adobe.utils
* @tiptext
*
* @see SHORT_DAY
- */
+ */
public static function getShortDayIndex(d:String):int
{
return DateBase.dayNamesShort.indexOf(d);
@@ -173,11 +173,11 @@ package com.adobe.utils
/**
* Returns the English full day name for the day that
- * the Date represents.
- *
+ * the Date represents.
+ *
* @param d The Date instance whose day will be used to retrieve the
* full day name.
- *
+ *
* @return An English full day name.
*
* @langversion ActionScript 3.0
@@ -185,18 +185,18 @@ package com.adobe.utils
* @tiptext
*
* @see FULL_DAY
- */
+ */
public static function getFullDayName(d:Date):String
{
- return DateBase.dayNamesLong[d.getDay()];
- }
+ return DateBase.dayNamesLong[d.getDay()];
+ }
/**
* Returns the index of the day that the full day name string
- * represents.
- *
+ * represents.
+ *
* @param m A full day name.
- *
+ *
* @return A int that represents that full day represented by the specifed
* full month name.
*
@@ -205,30 +205,30 @@ package com.adobe.utils
* @tiptext
*
* @see FULL_DAY
- */
+ */
public static function getFullDayIndex(d:String):int
{
return DateBase.dayNamesLong.indexOf(d);
}
/**
- * Returns a two digit representation of the year represented by the
+ * Returns a two digit representation of the year represented by the
* specified date.
- *
+ *
* @param d The Date instance whose year will be used to generate a two
* digit string representation of the year.
- *
+ *
* @return A string that contains a 2 digit representation of the year.
* Single digits will be padded with 0.
*
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
* @tiptext
- */
+ */
public static function getShortYear(d:Date):String
{
var dStr:String = String(d.getFullYear());
-
+
if(dStr.length < 3)
{
return dStr;
@@ -243,21 +243,21 @@ package com.adobe.utils
* Returns -1 if d1 is greater than d2.
* Returns 1 if d2 is greater than d1.
* Returns 0 if both dates are equal.
- *
+ *
* @param d1 The date that will be compared to the second date.
* @param d2 The date that will be compared to the first date.
- *
+ *
* @return An int indicating how the two dates compare.
*
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
* @tiptext
- */
+ */
public static function compareDates(d1:Date, d2:Date):int
{
var d1ms:Number = d1.getTime();
var d2ms:Number = d2.getTime();
-
+
if(d1ms > d2ms)
{
return -1;
@@ -279,19 +279,19 @@ package com.adobe.utils
*
* If the hour is greater than 12 (12 - 23 PM) then the hour minus 12
* will be returned.
- *
+ *
* @param d1 The Date from which to generate the short hour
- *
+ *
* @return An int between 0 and 13 ( 1 - 12 ) representing the short hour.
*
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
* @tiptext
- */
+ */
public static function getShortHour(d:Date):int
{
var h:int = d.hours;
-
+
if(h == 0 || h == 12)
{
return 12;
@@ -305,7 +305,7 @@ package com.adobe.utils
return h;
}
}
-
+
/**
* Returns a string indicating whether the date represents a time in the
* ante meridiem (AM) or post meridiem (PM).
@@ -313,16 +313,16 @@ package com.adobe.utils
* If the hour is less than 12 then "AM" will be returned.
*
* If the hour is greater than 12 then "PM" will be returned.
- *
+ *
* @param d1 The Date from which to generate the 12 hour clock indicator.
- *
- * @return A String ("AM" or "PM") indicating which half of the day the
+ *
+ * @return A String ("AM" or "PM") indicating which half of the day the
* hour represents.
*
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
* @tiptext
- */
+ */
public static function getAMPM(d:Date):String
{
return (d.hours > 11)? "PM" : "AM";
@@ -344,7 +344,7 @@ package com.adobe.utils
* @tiptext
*
* @see http://asg.web.cmu.edu/rfc/rfc822.html
- */
+ */
public static function parseRFC822(str:String):Date
{
var finalDate:Date;
@@ -352,12 +352,12 @@ package com.adobe.utils
{
var dateParts:Array = str.split(" ");
var day:String = null;
-
+
if (dateParts[0].search(/\d/) == -1)
{
day = dateParts.shift().replace(/\W/, "");
}
-
+
var date:Number = Number(dateParts.shift());
var month:Number = Number(DateUtil.getShortMonthIndex(dateParts.shift()));
var year:Number = Number(dateParts.shift());
@@ -365,9 +365,9 @@ package com.adobe.utils
var hour:Number = int(timeParts.shift());
var minute:Number = int(timeParts.shift());
var second:Number = (timeParts.length > 0) ? int(timeParts.shift()): 0;
-
+
var milliseconds:Number = Date.UTC(year, month, date, hour, minute, second, 0);
-
+
var timezone:String = dateParts.shift();
var offset:Number = 0;
@@ -460,7 +460,7 @@ package com.adobe.utils
}
return finalDate;
}
-
+
/**
* Returns a date string formatted according to RFC822.
*
@@ -473,7 +473,7 @@ package com.adobe.utils
* @tiptext
*
* @see http://asg.web.cmu.edu/rfc/rfc822.html
- */
+ */
public static function toRFC822(d:Date):String
{
var date:Number = d.getUTCDate();
@@ -483,7 +483,7 @@ package com.adobe.utils
var sb:String = new String();
sb += DateBase.dayNamesShort[d.getUTCDay()];
sb += ", ";
-
+
if (date < 10)
{
sb += "0";
@@ -496,26 +496,26 @@ package com.adobe.utils
sb += d.getUTCFullYear();
sb += " ";
if (hours < 10)
- {
+ {
sb += "0";
}
sb += hours;
sb += ":";
if (minutes < 10)
- {
+ {
sb += "0";
}
sb += minutes;
sb += ":";
if (seconds < 10)
- {
+ {
sb += "0";
}
sb += seconds;
sb += " GMT";
return sb;
}
-
+
/**
* Parses dates that conform to the W3C Date-time Format into Date objects.
*
@@ -530,7 +530,7 @@ package com.adobe.utils
* @tiptext
*
* @see http://www.w3.org/TR/NOTE-datetime
- */
+ */
public static function parseW3CDTF(str:String):Date
{
var finalDate:Date;
@@ -542,12 +542,12 @@ package com.adobe.utils
var year:Number = Number(dateArr.shift());
var month:Number = Number(dateArr.shift());
var date:Number = Number(dateArr.shift());
-
+
var multiplier:Number;
var offsetHours:Number;
var offsetMinutes:Number;
var offsetStr:String;
-
+
if (timeStr.indexOf("Z") != -1)
{
multiplier = 1;
@@ -580,7 +580,7 @@ package com.adobe.utils
var utc:Number = Date.UTC(year, month-1, date, hour, minutes, seconds, milliseconds);
var offset:Number = (((offsetHours * 3600000) + (offsetMinutes * 60000)) * multiplier);
finalDate = new Date(utc - offset);
-
+
if (finalDate.toString() == "Invalid Date")
{
throw new Error("This date does not conform to W3CDTF.");
@@ -594,7 +594,7 @@ package com.adobe.utils
}
return finalDate;
}
-
+
/**
* Returns a date string formatted according to W3CDTF.
*
@@ -609,7 +609,7 @@ package com.adobe.utils
* @tiptext
*
* @see http://www.w3.org/TR/NOTE-datetime
- */
+ */
public static function toW3CDTF(d:Date,includeMilliseconds:Boolean=false):String
{
var date:Number = d.getUTCDate();
@@ -619,10 +619,10 @@ package com.adobe.utils
var seconds:Number = d.getUTCSeconds();
var milliseconds:Number = d.getUTCMilliseconds();
var sb:String = new String();
-
+
sb += d.getUTCFullYear();
sb += "-";
-
+
//thanks to "dom" who sent in a fix for the line below
if (month + 1 < 10)
{
@@ -661,7 +661,7 @@ package com.adobe.utils
sb += "-00:00";
return sb;
}
-
+
/**
* Converts a date into just after midnight.
*/
@@ -674,7 +674,7 @@ package com.adobe.utils
d.milliseconds = 0;
return d;
}
-
+
/**
* Converts a date into just befor midnight.
*/
@@ -684,7 +684,7 @@ package com.adobe.utils
d.hours = 23;
d.minutes = 59;
d.seconds = 59;
- d.milliseconds = 999;
+ d.milliseconds = 999;
return d;
}
@@ -694,7 +694,7 @@ package com.adobe.utils
public static function getUTCDate(d:Date):Date
{
var nd:Date = new Date();
- var offset:Number = d.getTimezoneOffset() * 60 * 1000;
+ var offset:Number = d.getTimezoneOffset() * 60 * 1000;
nd.setTime(d.getTime() + offset);
return nd;
}
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/utils/DictionaryUtil.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/utils/DictionaryUtil.as
similarity index 92%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/utils/DictionaryUtil.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/utils/DictionaryUtil.as
index 4c71c0696122..e74b12f77b4a 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/utils/DictionaryUtil.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/utils/DictionaryUtil.as
@@ -1,34 +1,34 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
- Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
+
+ Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
- distribute this source code and such derivative works in source or
- object code form without any attribution requirements.
-
+ distribute this source code and such derivative works in source or
+ object code form without any attribution requirements.
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
- against any loss, damage, claims or lawsuits, including attorney's
- fees that arise or result from your use or distribution of the source
+ against any loss, damage, claims or lawsuits, including attorney's
+ fees that arise or result from your use or distribution of the source
code.
-
- THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
+
+ THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
@@ -36,55 +36,55 @@
package com.adobe.utils
{
import flash.utils.Dictionary;
-
+
public class DictionaryUtil
{
-
+
/**
- * Returns an Array of all keys within the specified dictionary.
- *
+ * Returns an Array of all keys within the specified dictionary.
+ *
* @param d The Dictionary instance whose keys will be returned.
- *
+ *
* @return Array of keys contained within the Dictionary
*
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
* @tiptext
- */
+ */
public static function getKeys(d:Dictionary):Array
{
var a:Array = new Array();
-
+
for (var key:Object in d)
{
a.push(key);
}
-
+
return a;
}
-
+
/**
- * Returns an Array of all values within the specified dictionary.
- *
+ * Returns an Array of all values within the specified dictionary.
+ *
* @param d The Dictionary instance whose values will be returned.
- *
+ *
* @return Array of values contained within the Dictionary
*
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
* @tiptext
- */
+ */
public static function getValues(d:Dictionary):Array
{
var a:Array = new Array();
-
+
for each (var value:Object in d)
{
a.push(value);
}
-
+
return a;
}
-
+
}
}
\ No newline at end of file
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/utils/IntUtil.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/utils/IntUtil.as
similarity index 91%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/utils/IntUtil.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/utils/IntUtil.as
index 591edc0af35e..541746e9a865 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/utils/IntUtil.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/utils/IntUtil.as
@@ -1,14 +1,14 @@
package com.adobe.utils {
-
+
import flash.utils.Endian;
-
+
/**
- * Contains reusable methods for operations pertaining
+ * Contains reusable methods for operations pertaining
* to int values.
*/
public class IntUtil {
-
+
/**
* Rotates x left n bits
*
@@ -19,7 +19,7 @@ package com.adobe.utils {
public static function rol ( x:int, n:int ):int {
return ( x << n ) | ( x >>> ( 32 - n ) );
}
-
+
/**
* Rotates x right n bits
*
@@ -31,17 +31,17 @@ package com.adobe.utils {
var nn:int = 32 - n;
return ( x << nn ) | ( x >>> ( 32 - nn ) );
}
-
+
/** String for quick lookup of a hex character based on index */
private static var hexChars:String = "0123456789abcdef";
-
+
/**
* Outputs the hex value of a int, allowing the developer to specify
* the endinaness in the process. Hex output is lowercase.
*
* @param n The int value to output as hex
* @param bigEndian Flag to output the int as big or little endian
- * @return A string of length 8 corresponding to the
+ * @return A string of length 8 corresponding to the
* hex representation of n ( minus the leading "0x" )
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
@@ -49,10 +49,10 @@ package com.adobe.utils {
*/
public static function toHex( n:int, bigEndian:Boolean = false ):String {
var s:String = "";
-
+
if ( bigEndian ) {
for ( var i:int = 0; i < 4; i++ ) {
- s += hexChars.charAt( ( n >> ( ( 3 - i ) * 8 + 4 ) ) & 0xF )
+ s += hexChars.charAt( ( n >> ( ( 3 - i ) * 8 + 4 ) ) & 0xF )
+ hexChars.charAt( ( n >> ( ( 3 - i ) * 8 ) ) & 0xF );
}
} else {
@@ -61,9 +61,9 @@ package com.adobe.utils {
+ hexChars.charAt( ( n >> ( x * 8 ) ) & 0xF );
}
}
-
+
return s;
}
}
-
+
}
\ No newline at end of file
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/utils/NumberFormatter.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/utils/NumberFormatter.as
similarity index 91%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/utils/NumberFormatter.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/utils/NumberFormatter.as
index 53b2501778c6..500cec10a510 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/utils/NumberFormatter.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/utils/NumberFormatter.as
@@ -1,34 +1,34 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
- Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
+
+ Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
- distribute this source code and such derivative works in source or
- object code form without any attribution requirements.
-
+ distribute this source code and such derivative works in source or
+ object code form without any attribution requirements.
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
- against any loss, damage, claims or lawsuits, including attorney's
- fees that arise or result from your use or distribution of the source
+ against any loss, damage, claims or lawsuits, including attorney's
+ fees that arise or result from your use or distribution of the source
code.
-
- THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
+
+ THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
@@ -38,40 +38,40 @@ package com.adobe.utils
/**
* Class that contains static utility methods for formatting Numbers
- *
+ *
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
* @tiptext
*
* @see #mx.formatters.NumberFormatter
- */
+ */
public class NumberFormatter
{
-
+
/**
* Formats a number to include a leading zero if it is a single digit
- * between -1 and 10.
- *
+ * between -1 and 10.
+ *
* @param n The number that will be formatted
*
- * @return A string with single digits between -1 and 10 padded with a
+ * @return A string with single digits between -1 and 10 padded with a
* leading zero.
*
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
* @tiptext
- */
+ */
public static function addLeadingZero(n:Number):String
{
var out:String = String(n);
-
+
if(n < 10 && n > -1)
{
out = "0" + out;
}
-
+
return out;
- }
-
+ }
+
}
}
\ No newline at end of file
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/utils/StringUtil.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/utils/StringUtil.as
similarity index 92%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/utils/StringUtil.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/utils/StringUtil.as
index 810fd349cf0e..f9abcdfd2860 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/utils/StringUtil.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/utils/StringUtil.as
@@ -1,68 +1,68 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
- Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
+
+ Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
- distribute this source code and such derivative works in source or
- object code form without any attribution requirements.
-
+ distribute this source code and such derivative works in source or
+ object code form without any attribution requirements.
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
- against any loss, damage, claims or lawsuits, including attorney's
- fees that arise or result from your use or distribution of the source
+ against any loss, damage, claims or lawsuits, including attorney's
+ fees that arise or result from your use or distribution of the source
code.
-
- THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
+
+ THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package com.adobe.utils
{
-
+
/**
* Class that contains static utility methods for manipulating Strings.
- *
+ *
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
* @tiptext
- */
+ */
public class StringUtil
{
-
+
/**
* Does a case insensitive compare or two strings and returns true if
* they are equal.
- *
+ *
* @param s1 The first string to compare.
*
* @param s2 The second string to compare.
*
- * @returns A boolean value indicating whether the strings' values are
- * equal in a case sensitive compare.
+ * @returns A boolean value indicating whether the strings' values are
+ * equal in a case sensitive compare.
*
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
* @tiptext
- */
- public static function stringsAreEqual(s1:String, s2:String,
+ */
+ public static function stringsAreEqual(s1:String, s2:String,
caseSensitive:Boolean):Boolean
{
if(caseSensitive)
@@ -74,20 +74,20 @@ package com.adobe.utils
return (s1.toUpperCase() == s2.toUpperCase());
}
}
-
+
/**
* Removes whitespace from the front and the end of the specified
* string.
- *
+ *
* @param input The String whose beginning and ending whitespace will
* will be removed.
*
- * @returns A String with whitespace removed from the begining and end
+ * @returns A String with whitespace removed from the begining and end
*
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
* @tiptext
- */
+ */
public static function trim(input:String):String
{
return StringUtil.ltrim(StringUtil.rtrim(input));
@@ -95,15 +95,15 @@ package com.adobe.utils
/**
* Removes whitespace from the front of the specified string.
- *
+ *
* @param input The String whose beginning whitespace will will be removed.
*
- * @returns A String with whitespace removed from the begining
+ * @returns A String with whitespace removed from the begining
*
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
* @tiptext
- */
+ */
public static function ltrim(input:String):String
{
var size:Number = input.length;
@@ -119,15 +119,15 @@ package com.adobe.utils
/**
* Removes whitespace from the end of the specified string.
- *
+ *
* @param input The String whose ending whitespace will will be removed.
*
- * @returns A String with whitespace removed from the end
+ * @returns A String with whitespace removed from the end
*
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
* @tiptext
- */
+ */
public static function rtrim(input:String):String
{
var size:Number = input.length;
@@ -144,7 +144,7 @@ package com.adobe.utils
/**
* Determines whether the specified string begins with the spcified prefix.
- *
+ *
* @param input The string that the prefix will be checked against.
*
* @param prefix The prefix that will be tested against the string.
@@ -154,15 +154,15 @@ package com.adobe.utils
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
* @tiptext
- */
+ */
public static function beginsWith(input:String, prefix:String):Boolean
- {
+ {
return (prefix == input.substring(0, prefix.length));
- }
+ }
/**
* Determines whether the specified string ends with the spcified suffix.
- *
+ *
* @param input The string that the suffic will be checked against.
*
* @param prefix The suffic that will be tested against the string.
@@ -172,15 +172,15 @@ package com.adobe.utils
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
* @tiptext
- */
+ */
public static function endsWith(input:String, suffix:String):Boolean
{
return (suffix == input.substring(input.length - suffix.length));
- }
+ }
/**
* Removes all instances of the remove string in the input string.
- *
+ *
* @param input The string that will be checked for instances of remove
* string
*
@@ -191,7 +191,7 @@ package com.adobe.utils
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
* @tiptext
- */
+ */
public static function remove(input:String, remove:String):String
{
return StringUtil.replace(input, remove, "");
@@ -200,17 +200,17 @@ package com.adobe.utils
/**
* Replaces all instances of the replace string in the input string
* with the replaceWith string.
- *
- * @param input The string that instances of replace string will be
+ *
+ * @param input The string that instances of replace string will be
* replaces with removeWith string.
*
- * @param replace The string that will be replaced by instances of
+ * @param replace The string that will be replaced by instances of
* the replaceWith string.
*
* @param replaceWith The string that will replace instances of replace
* string.
*
- * @returns A new String with the replace string replaced with the
+ * @returns A new String with the replace string replaced with the
* replaceWith string.
*
* @langversion ActionScript 3.0
@@ -229,7 +229,7 @@ package com.adobe.utils
for (var i:Number = 0; i < sLen; i++)
{
if(input.charAt(i) == replace.charAt(0))
- {
+ {
found = true;
for(var j:Number = 0; j < rLen; j++)
{
@@ -253,21 +253,21 @@ package com.adobe.utils
//string?
return sb;
}
-
+
/**
* Specifies whether the specified string is either non-null, or contains
* characters (i.e. length is greater that 0)
- *
+ *
* @param s The string which is being checked for a value
*
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
* @tiptext
- */
+ */
public static function stringHasValue(s:String):Boolean
{
//todo: this needs a unit test
- return (s != null && s.length > 0);
+ return (s != null && s.length > 0);
}
}
}
\ No newline at end of file
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/utils/XMLUtil.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/utils/XMLUtil.as
similarity index 90%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/utils/XMLUtil.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/utils/XMLUtil.as
index 8524a0b0939b..cc624a98bc62 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/utils/XMLUtil.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/utils/XMLUtil.as
@@ -1,34 +1,34 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
- Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
+
+ Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
- distribute this source code and such derivative works in source or
- object code form without any attribution requirements.
-
+ distribute this source code and such derivative works in source or
+ object code form without any attribution requirements.
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
- against any loss, damage, claims or lawsuits, including attorney's
- fees that arise or result from your use or distribution of the source
+ against any loss, damage, claims or lawsuits, including attorney's
+ fees that arise or result from your use or distribution of the source
code.
-
- THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
+
+ THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
@@ -40,69 +40,69 @@ package com.adobe.utils
{
/**
* Constant representing a text node type returned from XML.nodeKind.
- *
+ *
* @see XML.nodeKind()
- *
+ *
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
*/
public static const TEXT:String = "text";
-
+
/**
* Constant representing a comment node type returned from XML.nodeKind.
- *
+ *
* @see XML.nodeKind()
- *
+ *
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
- */
+ */
public static const COMMENT:String = "comment";
-
+
/**
* Constant representing a processing instruction type returned from XML.nodeKind.
- *
+ *
* @see XML.nodeKind()
- *
+ *
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
- */
+ */
public static const PROCESSING_INSTRUCTION:String = "processing-instruction";
-
+
/**
* Constant representing an attribute type returned from XML.nodeKind.
- *
+ *
* @see XML.nodeKind()
- *
+ *
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
- */
+ */
public static const ATTRIBUTE:String = "attribute";
-
+
/**
* Constant representing a element type returned from XML.nodeKind.
- *
+ *
* @see XML.nodeKind()
- *
+ *
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
- */
+ */
public static const ELEMENT:String = "element";
-
+
/**
* Checks whether the specified string is valid and well formed XML.
- *
+ *
* @param data The string that is being checked to see if it is valid XML.
- *
+ *
* @return A Boolean value indicating whether the specified string is
* valid XML.
- *
+ *
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
*/
public static function isValidXML(data:String):Boolean
{
var xml:XML;
-
+
try
{
xml = new XML(data);
@@ -111,61 +111,61 @@ package com.adobe.utils
{
return false;
}
-
+
if(xml.nodeKind() != XMLUtil.ELEMENT)
{
return false;
}
-
+
return true;
}
-
+
/**
* Returns the next sibling of the specified node relative to the node's parent.
- *
+ *
* @param x The node whose next sibling will be returned.
- *
- * @return The next sibling of the node. null if the node does not have
+ *
+ * @return The next sibling of the node. null if the node does not have
* a sibling after it, or if the node has no parent.
- *
+ *
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
- */
+ */
public static function getNextSibling(x:XML):XML
- {
+ {
return XMLUtil.getSiblingByIndex(x, 1);
}
-
+
/**
* Returns the sibling before the specified node relative to the node's parent.
- *
+ *
* @param x The node whose sibling before it will be returned.
- *
- * @return The sibling before the node. null if the node does not have
+ *
+ * @return The sibling before the node. null if the node does not have
* a sibling before it, or if the node has no parent.
- *
+ *
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
- */
+ */
public static function getPreviousSibling(x:XML):XML
- {
+ {
return XMLUtil.getSiblingByIndex(x, -1);
- }
-
- protected static function getSiblingByIndex(x:XML, count:int):XML
+ }
+
+ protected static function getSiblingByIndex(x:XML, count:int):XML
{
var out:XML;
-
+
try
{
- out = x.parent().children()[x.childIndex() + count];
- }
+ out = x.parent().children()[x.childIndex() + count];
+ }
catch(e:Error)
{
return null;
}
-
- return out;
+
+ return out;
}
}
}
\ No newline at end of file
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/webapis/ServiceBase.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/webapis/ServiceBase.as
similarity index 91%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/webapis/ServiceBase.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/webapis/ServiceBase.as
index 27ffbb02e87a..9f08a316cfa3 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/webapis/ServiceBase.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/webapis/ServiceBase.as
@@ -1,40 +1,40 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
- Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
+
+ Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
- distribute this source code and such derivative works in source or
- object code form without any attribution requirements.
-
+ distribute this source code and such derivative works in source or
+ object code form without any attribution requirements.
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
- against any loss, damage, claims or lawsuits, including attorney's
- fees that arise or result from your use or distribution of the source
+ against any loss, damage, claims or lawsuits, including attorney's
+ fees that arise or result from your use or distribution of the source
code.
-
- THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
+
+ THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-package com.adobe.webapis
+package com.adobe.webapis
{
import flash.events.EventDispatcher;
@@ -46,6 +46,6 @@ package com.adobe.webapis
public function ServiceBase()
{
}
-
+
}
}
\ No newline at end of file
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/webapis/URLLoaderBase.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/webapis/URLLoaderBase.as
similarity index 87%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/webapis/URLLoaderBase.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/webapis/URLLoaderBase.as
index 41e7b331de9c..8fefd3b9c322 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/webapis/URLLoaderBase.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/webapis/URLLoaderBase.as
@@ -1,34 +1,34 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
- Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
+
+ Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
- distribute this source code and such derivative works in source or
- object code form without any attribution requirements.
-
+ distribute this source code and such derivative works in source or
+ object code form without any attribution requirements.
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
- against any loss, damage, claims or lawsuits, including attorney's
- fees that arise or result from your use or distribution of the source
+ against any loss, damage, claims or lawsuits, including attorney's
+ fees that arise or result from your use or distribution of the source
code.
-
- THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
+
+ THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
@@ -38,74 +38,74 @@ package com.adobe.webapis
import flash.events.IOErrorEvent;
import flash.events.SecurityErrorEvent;
import flash.events.ProgressEvent;
-
+
import com.adobe.net.DynamicURLLoader;
-
+
/**
- * Dispatched when data is
+ * Dispatched when data is
* received as the download operation progresses.
- *
+ *
* @eventType flash.events.ProgressEvent.PROGRESS
- *
+ *
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
*/
- [Event(name="progress", type="flash.events.ProgressEvent")]
-
+ [Event(name="progress", type="flash.events.ProgressEvent")]
+
/**
- * Dispatched if a call to the server results in a fatal
+ * Dispatched if a call to the server results in a fatal
* error that terminates the download.
- *
+ *
* @eventType flash.events.IOErrorEvent.IO_ERROR
- *
+ *
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
*/
- [Event(name="ioError", type="flash.events.IOErrorEvent")]
-
+ [Event(name="ioError", type="flash.events.IOErrorEvent")]
+
/**
* A securityError event occurs if a call attempts to
* load data from a server outside the security sandbox.
- *
+ *
* @eventType flash.events.SecurityErrorEvent.SECURITY_ERROR
- *
+ *
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
*/
- [Event(name="securityError", type="flash.events.SecurityErrorEvent")]
-
+ [Event(name="securityError", type="flash.events.SecurityErrorEvent")]
+
/**
* Base class for services that utilize URLLoader
* to communicate with remote APIs / Services.
- *
+ *
* @langversion ActionScript 3.0
* @playerversion Flash 9.0
*/
public class URLLoaderBase extends ServiceBase
- {
+ {
protected function getURLLoader():DynamicURLLoader
{
var loader:DynamicURLLoader = new DynamicURLLoader();
loader.addEventListener("progress", onProgress);
loader.addEventListener("ioError", onIOError);
loader.addEventListener("securityError", onSecurityError);
-
- return loader;
- }
-
+
+ return loader;
+ }
+
private function onIOError(event:IOErrorEvent):void
{
dispatchEvent(event);
- }
-
+ }
+
private function onSecurityError(event:SecurityErrorEvent):void
{
dispatchEvent(event);
- }
-
+ }
+
private function onProgress(event:ProgressEvent):void
{
dispatchEvent(event);
- }
+ }
}
}
\ No newline at end of file
diff --git a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/webapis/events/ServiceEvent.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/webapis/events/ServiceEvent.as
similarity index 94%
rename from typo3/contrib/flowplayer/lib/corelib/src/com/adobe/webapis/events/ServiceEvent.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/webapis/events/ServiceEvent.as
index 2f341a2842f3..2735ff6a5994 100644
--- a/typo3/contrib/flowplayer/lib/corelib/src/com/adobe/webapis/events/ServiceEvent.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/corelib/src/com/adobe/webapis/events/ServiceEvent.as
@@ -1,34 +1,34 @@
/*
Adobe Systems Incorporated(r) Source Code License Agreement
Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-
+
Please read this Source Code License Agreement carefully before using
the source code.
-
- Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
+
+ Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable copyright license, to reproduce,
prepare derivative works of, publicly display, publicly perform, and
- distribute this source code and such derivative works in source or
- object code form without any attribution requirements.
-
+ distribute this source code and such derivative works in source or
+ object code form without any attribution requirements.
+
The name "Adobe Systems Incorporated" must not be used to endorse or promote products
derived from the source code without prior written permission.
-
+
You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
- against any loss, damage, claims or lawsuits, including attorney's
- fees that arise or result from your use or distribution of the source
+ against any loss, damage, claims or lawsuits, including attorney's
+ fees that arise or result from your use or distribution of the source
code.
-
- THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
+
+ THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
@@ -53,7 +53,7 @@ package com.adobe.webapis.events
*
* @param type The type of event that the instance represents.
*/
- public function ServiceEvent(type:String, bubbles:Boolean = false,
+ public function ServiceEvent(type:String, bubbles:Boolean = false,
cancelable:Boolean=false)
{
super(type, bubbles, cancelable);
@@ -72,7 +72,7 @@ package com.adobe.webapis.events
{
_data = d;
}
-
+
}
}
\ No newline at end of file
diff --git a/typo3/contrib/flowplayer/lib/flexunit/flexunit.swc b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/flexunit/flexunit.swc
similarity index 100%
rename from typo3/contrib/flowplayer/lib/flexunit/flexunit.swc
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/flexunit/flexunit.swc
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/com/mosesSupposes/go/tutorials/SizeTweenMG.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/com/mosesSupposes/go/tutorials/SizeTweenMG.as
similarity index 92%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/com/mosesSupposes/go/tutorials/SizeTweenMG.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/com/mosesSupposes/go/tutorials/SizeTweenMG.as
index fb027a22b691..58ed92732dbe 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/com/mosesSupposes/go/tutorials/SizeTweenMG.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/com/mosesSupposes/go/tutorials/SizeTweenMG.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2007 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -19,28 +19,28 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-package com.mosesSupposes.go.tutorials
+package com.mosesSupposes.go.tutorials
{
import flash.display.DisplayObject;
-
+
import org.goasap.interfaces.IManageable;
- import org.goasap.items.LinearGo;
+ import org.goasap.items.LinearGo;
/**
- * This example handles both width & height tweens and is compatible
+ * This example handles both width & height tweens and is compatible
* with OverlapMonitor. It also supports user-set start properties.
* For a more basic example see WidthTween.
- *
+ *
* <p>Setup: <code>GoEngine.addManager( new OverlapMonitor() );</code></p>
- *
+ *
* @see WidthTween
*
* @author Moses Gunesch
*/
public class SizeTweenMG extends LinearGo implements IManageable {
-
+
// -== Public Properties ==-
-
+
// See notes in WidthTween
// Another strategy for multiple props is to define constants then
// store props in an array. We'll keep it simple for this example.
@@ -50,16 +50,16 @@ package com.mosesSupposes.go.tutorials
public function set width(value : Number):void {
if (_state==STOPPED)
_width = value;
- }
-
+ }
+
public function get height() : Number {
return _height;
}
public function set height(value : Number):void {
if (_state==STOPPED)
_height = value;
- }
-
+ }
+
// Start settings are not a standard convention, just an option you can choose to provide if you want.
public function get startWidth() : Number {
return _startWidth;
@@ -67,16 +67,16 @@ package com.mosesSupposes.go.tutorials
public function set startWidth(value : Number):void {
if (_state==STOPPED)
_startWidth = value;
- }
-
+ }
+
public function get startHeight() : Number {
return _startHeight;
}
public function set startHeight(value : Number):void {
if (_state==STOPPED)
_startHeight = value;
- }
-
+ }
+
public function get target() : DisplayObject {
return _target;
}
@@ -84,9 +84,9 @@ package com.mosesSupposes.go.tutorials
if (_state==STOPPED)
_target = obj;
}
-
+
// -== Protected Properties ==-
-
+
protected var _target : DisplayObject;
protected var _width : Number;
protected var _height : Number;
@@ -96,29 +96,29 @@ package com.mosesSupposes.go.tutorials
protected var _tweenStartHeight : Number; // used during the tween so that the user-set property isn't altered.
protected var _changeWidth : Number;
protected var _changeHeight : Number;
-
+
// -== Public Methods ==-
-
+
// See notes in WidthTween
public function SizeTweenMG( target : DisplayObject=null,
widthTo : Number=NaN,
heightTo : Number=NaN,
delay : Number=NaN,
duration : Number=NaN,
- easing : Function=null )
+ easing : Function=null )
{
super(delay, duration, easing);
_target = target;
_width = widthTo;
_height = heightTo;
}
-
+
// See notes in WidthTween
- override public function start():Boolean
+ override public function start():Boolean
{
if (!_target || (isNaN(_width) && isNaN(_height)))
return false;
-
+
_changeWidth = NaN;
_changeHeight = NaN;
if (!isNaN(_width)) {
@@ -127,44 +127,44 @@ package com.mosesSupposes.go.tutorials
_tweenStartWidth = _target.width;
else
_target.width = _tweenStartWidth = _startWidth;
-
- // The useRelative property is a standard Go convention that each subclass must implement manually.
+
+ // The useRelative property is a standard Go convention that each subclass must implement manually.
_changeWidth = (useRelative ? _width : _width - _tweenStartWidth);
}
-
+
if (!isNaN(_height)) {
if (isNaN(_startHeight))
_tweenStartHeight = _target.height;
else
_target.height = _tweenStartHeight = _startHeight;
-
+
_changeHeight = (useRelative ? _height : _height - _tweenStartHeight);
}
return (super.start());
}
-
+
// See notes in WidthTween
override protected function onUpdate(type:String) : void {
- // The useRounding property is a standard Go convention that can be implemented by calling correctValue() .
+ // The useRounding property is a standard Go convention that can be implemented by calling correctValue() .
if (!isNaN(_changeWidth))
_target.width = super.correctValue(_tweenStartWidth + _changeWidth * _position);
-
+
if (!isNaN(_changeHeight))
_target.height = super.correctValue(_tweenStartHeight + _changeHeight * _position);
-
+
}
-
+
// -== IManageable Implementation ==-
-
- // The following methods make the tween class compatible with OverlapMonitor
+
+ // The following methods make the tween class compatible with OverlapMonitor
// or other managers. Please open the docs for the IManageable interface as you
// review these 4 methods, so you get a clear picture of how the system works.
-
+
// All animation targets currently being handled.
public function getActiveTargets() : Array {
return [ _target ];
}
-
+
// All property-strings currently being handled.
public function getActiveProperties() : Array {
var a:Array = new Array();
@@ -174,9 +174,9 @@ package com.mosesSupposes.go.tutorials
a.push("height");
return a;
}
-
- // This method is the only complex one of the four. The general idea is to determine if there's any
- // direct -- or indirect! -- overlap between the strings passed in & actively-tweening properties.
+
+ // This method is the only complex one of the four. The general idea is to determine if there's any
+ // direct -- or indirect! -- overlap between the strings passed in & actively-tweening properties.
// There are some tricky things about it though -- Hit the docs, soldier! :)
public function isHandling(properties : Array) : Boolean {
if (!isNaN(_changeWidth)) {
@@ -189,13 +189,13 @@ package com.mosesSupposes.go.tutorials
}
return false;
}
-
+
// When there's a conflict the manager calls this method so you can stop the tween.
public function releaseHandling(...params) : void {
- //trace(this + " releaseHandling()");
+ //trace(this + " releaseHandling()");
super.stop();
}
-
+
// Try interrupting the tween with another tween on the same target to see if it works!
// (Remember to run the setup command to activate OverlapMonitor, see header doc in this class.)
}
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/com/mosesSupposes/go/tutorials/WidthTween.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/com/mosesSupposes/go/tutorials/WidthTween.as
similarity index 90%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/com/mosesSupposes/go/tutorials/WidthTween.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/com/mosesSupposes/go/tutorials/WidthTween.as
index 167c836e7bc8..48c6c46a0564 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/com/mosesSupposes/go/tutorials/WidthTween.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/com/mosesSupposes/go/tutorials/WidthTween.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2007 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -19,24 +19,24 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-package com.mosesSupposes.go.tutorials
+package com.mosesSupposes.go.tutorials
{
import flash.display.DisplayObject;
-
+
import org.goasap.items.LinearGo;
/**
* A basic example of how you could build a tween on LinearGo.
- *
+ *
* @see SizeTweenMg SizeTweenMg: a similar example that works with OverlapMonitor
- *
+ *
* @author Moses Gunesch
*/
public class WidthTween extends LinearGo {
-
+
// -== Public Properties ==-
-
-
+
+
// In this example, the tween class has a width property, but the point of Go is that
// the design is left up to you. If you prefer to parse an object or XML, or accept an
// array of properties and targets, all of that is left up to you.
@@ -46,9 +46,9 @@ package com.mosesSupposes.go.tutorials
public function set width(value : Number):void {
if (_state==STOPPED)
_width = value;
- }
-
-
+ }
+
+
// See note above width getter, same applies here. Note that I've picked a specific datatype
// for my tween target, but again it's wide open, including the variable name. The only thing
// that tends to be universal is that you need at least one target and at least one property.
@@ -59,60 +59,60 @@ package com.mosesSupposes.go.tutorials
if (_state==STOPPED)
_target = obj;
}
-
-
+
+
// -== Protected Properties ==-
protected var _target : DisplayObject;
protected var _width : Number;
protected var _startWidth : Number;
protected var _changeWidth : Number;
-
-
+
+
// -== Public Methods ==-
-
+
// You can design your own constructor for your tween classes of course!
public function WidthTween( target : DisplayObject=null,
widthTo : Number=NaN,
delay : Number=NaN,
duration : Number=NaN,
- easing : Function=null )
+ easing : Function=null )
{
super(delay, duration, easing);
_target = target;
_width = widthTo;
}
-
-
+
+
// CONVENTION ALERT!
-
- // * Be aware that there are two standard conventions in Go that need to be
+
+ // * Be aware that there are two standard conventions in Go that need to be
// implemented manually by each LinearGo subclass, numbered below.
-
-
- override public function start():Boolean
+
+
+ override public function start():Boolean
{
if (!_target || !_width || isNaN(_width))
return false;
-
+
_startWidth = _target.width; // Store start & change values for use in onUpdate.
-
+
// Convention #1: useRelative (*see note above)
- _changeWidth = (useRelative
- ? _width // relative positioning: like if the user set -10, we should change "by" that much.
+ _changeWidth = (useRelative
+ ? _width // relative positioning: like if the user set -10, we should change "by" that much.
: _width - _startWidth); // absolute positioning: the tween spans the difference from existing width.
-
+
return (super.start());
}
-
-
+
+
// Convention #2:useRounding (*see note above)
- // Always call correctValue() on tween values before setting them to targets.
- // This fixes NaNs to 0 and applies Math.round based on the useRounding setting.
- override protected function onUpdate(type:String) : void
+ // Always call correctValue() on tween values before setting them to targets.
+ // This fixes NaNs to 0 and applies Math.round based on the useRounding setting.
+ override protected function onUpdate(type:String) : void
{
// Basic tween implementation using the formula Value=Start+(Change*Position).
// Position is a 0-1 multiplier run by LinearGo.
-
+
_target.width = super.correctValue( _startWidth + _changeWidth * _position );
}
}
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/GoEngine.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/GoEngine.as
similarity index 92%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/GoEngine.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/GoEngine.as
index 9a1e1b47eed3..81e9c37e4c32 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/GoEngine.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/GoEngine.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2007 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -27,90 +27,90 @@ package org.goasap {
import flash.utils.Timer;
import flash.utils.getQualifiedClassName;
import flash.utils.getTimer;
-
+
import org.goasap.errors.DuplicateManagerError;
import org.goasap.interfaces.IManageable;
import org.goasap.interfaces.IManager;
import org.goasap.interfaces.IUpdatable;
- import org.goasap.interfaces.ILiveManager;
+ import org.goasap.interfaces.ILiveManager;
/**
* Provides <code>update</code> calls to <code>IUpdatable</code> instances on their specified <code>pulseInterval</code>.
- *
+ *
* <p><b>Using these Docs</b></p>
- *
- * <p><i>Protected methods and properties have been excluded in almost all
+ *
+ * <p><i>Protected methods and properties have been excluded in almost all
* cases, but are documented in the classes. Exceptions include key protected
- * methods or properties that are integral for writing subclasses or understanding
- * the basic mechanics of the system. Many Go classes can be used as is without
+ * methods or properties that are integral for writing subclasses or understanding
+ * the basic mechanics of the system. Many Go classes can be used as is without
* subclassing, so the documentation offers an uncluttered view of their public
* usage.</i></p>
- *
+ *
* <p><b>Introduction to Go</b></p>
- *
- * <p>The Go ActionScript Animation Platform ("GOASAP") is a lightweight, portable
- * set of generic base classes for buliding AS3 animation tools. It provides structure
- * and core functionality, but does not define the specifics of animation-handling
+ *
+ * <p>The Go ActionScript Animation Platform ("GOASAP") is a lightweight, portable
+ * set of generic base classes for buliding AS3 animation tools. It provides structure
+ * and core functionality, but does not define the specifics of animation-handling
* classes like tweens.</p>
- *
- * <p><i>Important: Store your custom Go classes in a package bearing your
- * own classpath, not in the core package! This will help avoid confusion
+ *
+ * <p><i>Important: Store your custom Go classes in a package bearing your
+ * own classpath, not in the core package! This will help avoid confusion
* with other authors' work.</i></p>
- *
+ *
* <p>You may modify any class in the goasap package to suit your project's needs.</p>
- *
- * <p>Go is a community initiative led by Moses Gunesch at
- * <a href="http://www.mosessupposes.com/" target="_top">MosesSupposes.com</a>. Please visit the
+ *
+ * <p>Go is a community initiative led by Moses Gunesch at
+ * <a href="http://www.mosessupposes.com/" target="_top">MosesSupposes.com</a>. Please visit the
* <a href="http://www.goasap.org/" target="_top">Go website</a> for more information.</p>
- *
+ *
* <p><b>GoEngine</b></p>
- *
- * <p>GoEngine sits at the center of the Go system, and along with the IUpdatable
- * interface is the only required element for using Go. GoEngine references two other
+ *
+ * <p>GoEngine sits at the center of the Go system, and along with the IUpdatable
+ * interface is the only required element for using Go. GoEngine references two other
* interfaces for adding system-wide managers, IManager and IManageable.
- * All other classes in the go package are merely one suggestion of how a
- * system could be structured within Go, and may be considered optional
- * elements. To create an API using the provided classes, you simply need
+ * All other classes in the go package are merely one suggestion of how a
+ * system could be structured within Go, and may be considered optional
+ * elements. To create an API using the provided classes, you simply need
* to extend the item classes LinearGo and PhysicsGo to create animation items.</p>
- *
- * <p>GoEngine serves two purposes: first, it keeps a large system efficient
- * by stacking and running updates on blocks of items. Note that any IUpdatable
- * instance may specify its own pulseInterval; items with matching pulses
- * are grouped into queues for efficiency. Its second purpose is centralization.
- * By using a single hub for pulse-driven items of all types, management classes
- * can be attached to GoEngine to run processes across items. This is done voluntarily
- * by the end-user with <code>addManager()</code>, which keeps management entirely
+ *
+ * <p>GoEngine serves two purposes: first, it keeps a large system efficient
+ * by stacking and running updates on blocks of items. Note that any IUpdatable
+ * instance may specify its own pulseInterval; items with matching pulses
+ * are grouped into queues for efficiency. Its second purpose is centralization.
+ * By using a single hub for pulse-driven items of all types, management classes
+ * can be attached to GoEngine to run processes across items. This is done voluntarily
+ * by the end-user with <code>addManager()</code>, which keeps management entirely
* compile-optional and extensible. See the documentation for <code>IManager</code>
* to learn more about Go's management architeture.</p>
- *
- * <p>You normally don't need to modify this class to use Go. While Go items typically
+ *
+ * <p>You normally don't need to modify this class to use Go. While Go items typically
* only use <code>addItem</code> and <code>removeItem</code>, your project's code might
- * use GoEngine to register managers, or to pause, resume or stop all Go animation in
+ * use GoEngine to register managers, or to pause, resume or stop all Go animation in
* a SWF at once.</p>
- *
+ *
* <p></i>{In the game of Go, the wooden playing board, or Goban, features a grid
* on which black & white go-ishi stones are laid at its intersections.}</i></p>
- *
+ *
* @see org.goasap.items.LinearGo LinearGo
* @see org.goasap.interfaces.IManager IManager
* @author Moses Gunesch
*/
- public class GoEngine
+ public class GoEngine
{
// -== Constants ==-
-
+
public static const INFO:String = "GoASAP 0.4.9 (c) Moses Gunesch, MIT Licensed.";
-
+
// -== Settable Class Defaults ==-
-
+
/**
- * A pulseInterval that runs on the player's natural framerate,
+ * A pulseInterval that runs on the player's natural framerate,
* which is often most efficient.
*/
public static const ENTER_FRAME : int = -1;
// -== Protected Properties ==-
-
+
// Note: Various formats for item data have been experimented with including breaking the item lists out into
// a GoEngineList class, which was nicer-looking but did not perform well. Since GoEngine doesn't normally
// require active work, this less-pretty but efficient flat-data format was opted for. A minor weakness of this
@@ -125,15 +125,15 @@ package org.goasap {
private static var itemCounts : Dictionary = new Dictionary(false); // key: pulseInterval, value: item count for that pulse
private static var pulseSprite : Sprite; // used for ENTER_FRAME pulse
private static var paused : Boolean = false;
-
+
// These additional lists enables caching of items that are added during the update cycle for the same pulse.
// This prevents groups & sequences from going out of sync by ensuring that each cycle completes before new items are added.
private static var lockedPulses : Dictionary = new Dictionary(false); // key: pulseInterval, value: true
private static var delayedPulses : Dictionary = new Dictionary(false); // key: pulseInterval, value: true
private static var addQueue : Dictionary = new Dictionary(false); // key: IUpdatable item, value: true
-
+
// -== Public Class Methods ==-
-
+
/**
* @param className A string naming the manager class, such as "OverlapMonitor".
* @return The manager instance, if registered.
@@ -144,22 +144,22 @@ package org.goasap {
{
return managerTable[ className ];
}
-
+
/**
* Enables the extending of this class' functionality with a tight
- * coupling to an IManager.
- *
- * <p>Tight coupling is crucial in such a time-sensitive context;
- * standard events are too asynchronous. All items that implement
- * IManageable are reported to registered managers as they add and
+ * coupling to an IManager.
+ *
+ * <p>Tight coupling is crucial in such a time-sensitive context;
+ * standard events are too asynchronous. All items that implement
+ * IManageable are reported to registered managers as they add and
* remove themselves from GoEngine.</p>
- *
- * <p>Managers normally act as singletons within the Go system (which
- * you are welcome to modify). This method throws a DuplicateManagerError
- * if an instance of the same manager class is already registered. Use a
- * try/catch block when calling this method if your program might duplicate
+ *
+ * <p>Managers normally act as singletons within the Go system (which
+ * you are welcome to modify). This method throws a DuplicateManagerError
+ * if an instance of the same manager class is already registered. Use a
+ * try/catch block when calling this method if your program might duplicate
* managers, or use getManager() to check for prior registration.</p>
- *
+ *
* @param instance An instance of a manager you wish to add.
* @see #getManager()
* @see #removeManager()
@@ -176,10 +176,10 @@ package org.goasap {
managers.push(instance);
if (instance is ILiveManager) liveManagers++;
}
-
+
/**
* Unregisters any manager set in <code>addManager</code>.
- *
+ *
* @param className A string naming the manager class, such as "OverlapMonitor".
* @see #getManager()
* @see #addManager()
@@ -191,10 +191,10 @@ package org.goasap {
liveManagers--;
delete managerTable[ className ]; // leave last
}
-
+
/**
* Test whether an item is currently stored and being updated by the engine.
- *
+ *
* @param item Any object implementing IUpdatable
* @return Whether the IUpdatable is in the engine
*/
@@ -202,19 +202,19 @@ package org.goasap {
{
return (items[ item ]!=null);
}
-
+
/**
* Adds an IUpdatable instance to an update-queue corresponding to
* the item's pulseInterval property.
- *
- * @param item Any object implementing IUpdatable that wishes
+ *
+ * @param item Any object implementing IUpdatable that wishes
* to receive update calls on a pulse.
- *
+ *
* @return Returns false only if this item was already in the
* engine under the same pulse. (If an existing item is added
* but the pulseInterval has changed it will be removed,
* re-added, and true will be returned.)
- *
+ *
* @see #removeItem()
*/
public static function addItem( item:IUpdatable ):Boolean
@@ -246,16 +246,16 @@ package org.goasap {
}
return true;
}
-
+
/**
* Removes an item from the queue and removes its pulse timer if
* the queue is depleted.
- *
- * @param item Any IUpdatable previously added that wishes
+ *
+ * @param item Any IUpdatable previously added that wishes
* to stop receiving update calls.
- *
+ *
* @return Returns false if the item was not in the engine.
- *
+ *
* @see #addItem()
*/
public static function removeItem( item:IUpdatable ):Boolean
@@ -271,17 +271,17 @@ package org.goasap {
delete addQueue[ item ]; // * see note following update
// Report IManageable item removal to registered managers.
if (item is IManageable) {
- for each (var manager:IManager in managers)
+ for each (var manager:IManager in managers)
manager.release( item as IManageable );
}
return true;
}
-
+
/**
- * Removes all items and resets the engine,
+ * Removes all items and resets the engine,
* or removes just items running on a specific pulse.
- *
- * @param pulseInterval Optionally filter by a specific pulse
+ *
+ * @param pulseInterval Optionally filter by a specific pulse
* such as ENTER_FRAME or a number of milliseconds.
* @return The number of items successfully removed.
* @see #removeItem()
@@ -297,14 +297,14 @@ package org.goasap {
}
return n;
}
-
+
/**
- * Retrieves number of active items in the engine
+ * Retrieves number of active items in the engine
* or active items running on a specific pulse.
- *
+ *
* @param pulseInterval Optionally filter by a specific pulseInterval
* such as ENTER_FRAME or a number of milliseconds.
- *
+ *
* @return Number of active items in the Engine.
*/
public static function getCount(pulseInterval:Number = NaN) : uint
@@ -316,7 +316,7 @@ package org.goasap {
n += count;
return n;
}
-
+
/**
* @return The paused state of engine.
* @see #setPaused()
@@ -324,17 +324,17 @@ package org.goasap {
public static function getPaused() : Boolean {
return paused;
}
-
+
/**
* Pauses or resumes all animation globally by suspending processing,
- * and calls pause() or resume() on each item with those methods.
- *
+ * and calls pause() or resume() on each item with those methods.
+ *
* <p>The return value only reflects how many items had pause() or resume()
- * called on them, but the GoEngine.getPaused() state will change if any
+ * called on them, but the GoEngine.getPaused() state will change if any
* pulses are suspended or resumed.</p>
- *
+ *
* @param pause Pass false to resume if currently paused.
- * @param pulseInterval Optionally filter by a specific pulse
+ * @param pulseInterval Optionally filter by a specific pulse
* such as ENTER_FRAME or a number of milliseconds.
* @return The number of items on which a pause() or resume()
* method was called (0 doesn't necessarily reflect
@@ -366,15 +366,15 @@ package org.goasap {
paused = pause;
return n;
}
-
+
// -== Private Class Methods ==-
-
+
/**
* Executes the update queue corresponding to the dispatcher's interval.
- *
+ *
* @param event TimerEvent or Sprite ENTER_FRAME Event
*/
- private static function update(event:Event) : void
+ private static function update(event:Event) : void
{
var currentTime:Number = getTimer();
var pulse:int = (event is TimerEvent ? ( event.target as Timer ).delay : ENTER_FRAME);
@@ -390,7 +390,7 @@ package org.goasap {
}
lockedPulses[ pulse ] = false;
if (delayedPulses[ pulse ]) {
- for (item in addQueue)
+ for (item in addQueue)
delete addQueue[ item ];
delete delayedPulses[ pulse ];
}
@@ -401,15 +401,15 @@ package org.goasap {
if (manager is ILiveManager)
(manager as ILiveManager).onUpdate(pulse, updated, currentTime); // * see note
}
-// * note: In one rare case that has not been reported yet but is theoretically possible, the 'updated' list
-// passed could contain already-released items. This could only happen if the item is removed & released
+// * note: In one rare case that has not been reported yet but is theoretically possible, the 'updated' list
+// passed could contain already-released items. This could only happen if the item is removed & released
// just after the main update cycle but before the the doLiveUpdate() routine runs. If you encounter this issue
// please report it to the GoASAP mailing list, it's too involved to bother with before it's a problem.
/**
* Creates new timers when a previously unused interval is specified,
* and tracks the number of items associated with that interval.
- *
+ *
* @param pulse The pulseInterval requested
* @return Whether a pulse was added
*/
@@ -431,11 +431,11 @@ package org.goasap {
}
return false;
}
-
+
/**
- * Tracks whether a removed item was the last one using a timer
+ * Tracks whether a removed item was the last one using a timer
* and if so, removes that timer.
- *
+ *
* @param pulse The pulseInterval corresponding to an item being removed.
* @return Whether a pulse was removed
*/
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/PlayableBase.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/PlayableBase.as
similarity index 94%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/PlayableBase.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/PlayableBase.as
index 7d48192f6717..094f9a202711 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/PlayableBase.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/PlayableBase.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2007 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,56 +23,56 @@ package org.goasap {
import flash.events.EventDispatcher;
import flash.utils.Dictionary;
import flash.utils.getQualifiedClassName;
-
+
import org.goasap.errors.InstanceNotAllowedError;
- import org.goasap.interfaces.IPlayableBase;
+ import org.goasap.interfaces.IPlayableBase;
/**
* Top-level abstract base class for playable classes that provides a standard
* set of play-state constants and an instance playableID value.
- *
+ *
* <p>Playable classes in the Go system should normally extend this base class
* and implement the IPlayable interface. This is not mandatory since utilities
* normally reference playable items via the IPlayable datatype; However they also
* refer directly to the constants defined here, so those should be adhered to even
- * if this class is not directly extended.</p>
- *
- * <p>Important memory management issue: Playable items that are not added to
+ * if this class is not directly extended.</p>
+ *
+ * <p>Important memory management issue: Playable items that are not added to
* GoEngine can get garbage collected during play. It is a convention of the Go
- * system that such items store a reference to themselves during play that is
+ * system that such items store a reference to themselves during play that is
* removed in stop(). See <a href="#_playRetainer">_playRetainer</a> for more.</p>
- *
+ *
* @author Moses Gunesch
*/
public class PlayableBase extends EventDispatcher implements IPlayableBase {
-
+
// -== Standard Go Play-state Constants ==-
-
+
/**
* Instance play is currently stopped.
*/
public static const STOPPED : String = "STOPPED";
-
+
/**
* Instance play is currently paused.
*/
public static const PAUSED : String = "PAUSED";
-
+
/**
* Instance is currently playing a delay, but has not started playing.
* Delays are a non-universal feature that must be custom-implemented,
- * so some subclasses of PlayableBase don't use this constant.
+ * so some subclasses of PlayableBase don't use this constant.
*/
public static const PLAYING_DELAY : String = "PLAYING_DELAY";
-
+
/**
* Instance play is currently playing.
*/
public static const PLAYING : String = "PLAYING";
-
+
// -== Public Properties ==-
-
+
/**
* An arbitrary id value for the convenient identification of any
* instance, automatically set to an instance count by this class.
@@ -96,7 +96,7 @@ package org.goasap {
}
// -== Protected Properties ==-
-
+
/**
* @private
*/
@@ -112,25 +112,25 @@ package org.goasap {
/**
* Memory-management: Read this if you're subclassing PlayableBase but not adding your
* instance to GoEngine.
- *
- * <p>Subclasses that do not add themselves to GoEngine during play should stash a
- * this-reference here in start() and delete it in stop. This prevents instance from
+ *
+ * <p>Subclasses that do not add themselves to GoEngine during play should stash a
+ * this-reference here in start() and delete it in stop. This prevents instance from
* getting GC'd during play. For an example see SequenceBase's start and stop methods.</p>
- *
- * <p>This step is not necessary if GoEngine.addItem is used, which keeps a live reference
+ *
+ * <p>This step is not necessary if GoEngine.addItem is used, which keeps a live reference
* during play.</p>
- *
+ *
* <p>This protected static var is just a convenience. You can mimic the technique of
* stashing a this-reference using any static property, to temporarily protect the object
* being referenced from garbage collection.</p>
- *
+ *
* @see org.goasap.utils.SequenceBase SequenceBase
*/
protected static var _playRetainer : Dictionary = new Dictionary(false);
-
-
+
+
// -== Public Methods ==-
-
+
/**
* Throws an InstanceNotAllowedError if directly instantiated, also sets a
* default playableID to an instance count number.
@@ -145,7 +145,7 @@ package org.goasap {
/**
* Appends the regular toString value with the instance's playableID.
- *
+ *
* @return String representation of this instance.
*/
override public function toString():String {
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/errors/DuplicateManagerError.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/errors/DuplicateManagerError.as
similarity index 98%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/errors/DuplicateManagerError.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/errors/DuplicateManagerError.as
index dba3ade28c7e..07e970b0afd3 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/errors/DuplicateManagerError.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/errors/DuplicateManagerError.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2007 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,14 +23,14 @@ package org.goasap.errors {
/**
* Throw this error if a manager is already registered.
- *
+ *
* @author Moses Gunesch
*/
public class DuplicateManagerError extends Error {
-
+
/**
* Error message "An instance of "+ className +" was already added to GoEngine."
- *
+ *
* @param className The name of the duplicate manager's class.
*/
public function DuplicateManagerError(className:String) {
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/errors/EasingFormatError.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/errors/EasingFormatError.as
similarity index 98%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/errors/EasingFormatError.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/errors/EasingFormatError.as
index d8fb322c471f..535a993a49ba 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/errors/EasingFormatError.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/errors/EasingFormatError.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2007 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,11 +23,11 @@ package org.goasap.errors {
/**
* Throw this error if an easing function called with the params 1,1,1,1 does not return a Number.
- *
+ *
* @author Moses Gunesch
*/
public class EasingFormatError extends Error {
-
+
/**
* Error message "Easing function not valid."
*/
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/errors/InstanceNotAllowedError.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/errors/InstanceNotAllowedError.as
similarity index 98%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/errors/InstanceNotAllowedError.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/errors/InstanceNotAllowedError.as
index ef7b70321e83..3707e50ec753 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/errors/InstanceNotAllowedError.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/errors/InstanceNotAllowedError.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2007 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -24,14 +24,14 @@ package org.goasap.errors {
/**
* Throw this error if a base class is directly instantiated but
* is not usable on its own.
- *
+ *
* @author Moses Gunesch
*/
public class InstanceNotAllowedError extends Error {
-
+
/**
* Error message "Direct use of "+ className +" is not allowed, use subclasses only."
- *
+ *
* @param className The name of the class throwing the error
*/
public function InstanceNotAllowedError(className:String) {
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/events/GoEvent.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/events/GoEvent.as
similarity index 95%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/events/GoEvent.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/events/GoEvent.as
index 4e9dc90fb641..c4db67269c36 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/events/GoEvent.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/events/GoEvent.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2007 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -21,65 +21,65 @@
*/
package org.goasap.events {
import flash.events.Event;
-
+
/**
* Standard event set for all playable Go classes.
- *
+ *
* @author Moses Gunesch
*/
public class GoEvent extends Event
{
/**
* Indicates a playable instance is starting.
- *
- * @eventType playableStart
+ *
+ * @eventType playableStart
*/
public static const START : String = 'playableStart';
-
-
+
+
/**
* Indicates a playable instance is updating.
- *
+ *
* @eventType playableUpdate
*/
public static const UPDATE : String = 'playableUpdate';
-
-
+
+
/**
* Indicates a playable instance was paused.
- *
+ *
* @eventType playableUpdate
*/
public static const PAUSE : String = 'playablePause';
-
-
+
+
/**
* Indicates a playable instance was restarted from a paused state.
- *
+ *
* @eventType playableUpdate
*/
public static const RESUME : String = 'playableResume';
-
-
+
+
/**
* Indicates a playable instance has completed a cycle or loop and is starting the next one.
- *
+ *
* @eventType playableUpdate
*/
public static const CYCLE : String = 'playableCycle';
-
-
+
+
/**
* Indicates a playable instance was manually stopped.
- *
+ *
* @eventType playableStop
*/
public static const STOP : String = 'playableStop';
-
-
+
+
/**
* Indicates a playable instance that can end on its own has successfully finished.
- *
+ *
* @eventType playableComplete
* @see #STOP
*/
@@ -91,8 +91,8 @@ package org.goasap.events {
* general flexibility, but subclass GoEvent to define specific conventions when possible.
*/
public var extra : *;
-
-
+
+
/**
* @param type The event type; indicates the action that triggered the event.
* @param bubbles Specifies whether the event can bubble up the display list hierarchy.
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/events/SequenceEvent.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/events/SequenceEvent.as
similarity index 97%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/events/SequenceEvent.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/events/SequenceEvent.as
index 0156a803c3f5..dd6068f180b6 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/events/SequenceEvent.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/events/SequenceEvent.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2007 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -21,21 +21,21 @@
*/
package org.goasap.events {
import flash.events.Event;
-
+
/**
* Event for all Go sequence classes.
- *
+ *
* @author Moses Gunesch
*/
public class SequenceEvent extends Event {
-
+
/**
* Indicates a sequence is advancing to its next step.
- *
+ *
* @eventType sequenceAdvance
*/
public static const ADVANCE : String = "sequenceAdvance";
-
+
public function SequenceEvent(type : String, bubbles : Boolean = false, cancelable : Boolean = false) {
super(type, bubbles, cancelable);
}
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/ILiveManager.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/ILiveManager.as
similarity index 87%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/ILiveManager.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/ILiveManager.as
index fc68d9229006..1fe81928dae2 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/ILiveManager.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/ILiveManager.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2008 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -21,61 +21,61 @@
*/
package org.goasap.interfaces {
import org.goasap.interfaces.IManager;
-
+
/**
- * Instances receive a callback from GoEngine after each update cycle,
- * allowing managers to more easily perform ongoing processes during animation.
- *
- * <p><font color="#CC0000">[This is a more advanced manager interface, so if
- * you are just getting started with Go's management system it is suggested that
- * you focus on <code>IManager</code> & <code>IManageable</code>, and save this
+ * Instances receive a callback from GoEngine after each update cycle,
+ * allowing managers to more easily perform ongoing processes during animation.
+ *
+ * <p><font color="#CC0000">[This is a more advanced manager interface, so if
+ * you are just getting started with Go's management system it is suggested that
+ * you focus on <code>IManager</code> & <code>IManageable</code>, and save this
* section for when you need it.]</font> </p>
- *
+ *
* <p>Hypothetical examples:</p>
* <ul>
- * <li>An updater class that refreshes (rerenders) a 3D scene after all
+ * <li>An updater class that refreshes (rerenders) a 3D scene after all
* animations have processed each pulse.</li>
- * <li>A hitTest manager that allows all items to update their positions
+ * <li>A hitTest manager that allows all items to update their positions
* first, then tests for hits between them.</li>
* </ul>
- * <p>Each <code>ILiveManager</code> receives a special onUpdate() callback
- * after GoEngine completes each pulse cycle for any particular pulseInterval.
- * This callback receives three things: the pulseInterval associated with the
- * cycle, an array containing the items updated, and the synced current-time value
- * that was sent to all the items as update() was called. (Background: GoEngine
- * stores different lists for every different pulseInterval specified by animation
- * items. Usually users will stick to a single pulseInterval but at times it can
- * be beneficial to run some animations slower than others – such as the readouts
- * in a spaceship game's cockpit which don't need to refresh as often and can free
+ * <p>Each <code>ILiveManager</code> receives a special onUpdate() callback
+ * after GoEngine completes each pulse cycle for any particular pulseInterval.
+ * This callback receives three things: the pulseInterval associated with the
+ * cycle, an array containing the items updated, and the synced current-time value
+ * that was sent to all the items as update() was called. (Background: GoEngine
+ * stores different lists for every different pulseInterval specified by animation
+ * items. Usually users will stick to a single pulseInterval but at times it can
+ * be beneficial to run some animations slower than others – such as the readouts
+ * in a spaceship game's cockpit which don't need to refresh as often and can free
* up processing power for the game if they don't.)</p>
- *
- * <p>The list of updated items only includes items actually updated, which at
- * times can differ slightly from the items that have been added to GoEngine and
- * sent to the manager's reserve() method. (Background: when items are added to
- * GoEngine during its update cycle, it defers updating them until the next pulse
- * so as not to disrupt the cycle in progress.) Therefore, even though <code>ILiveManager</code>
- * extends <code>IManager</code> and contains reserve() and release() methods,
- * those methods are often not needed here, since you can filter and make use of
- * the incoming array of updated items on each update. This can also relieve such
- * managers from needing to store and manage complex handler lists (as
+ *
+ * <p>The list of updated items only includes items actually updated, which at
+ * times can differ slightly from the items that have been added to GoEngine and
+ * sent to the manager's reserve() method. (Background: when items are added to
+ * GoEngine during its update cycle, it defers updating them until the next pulse
+ * so as not to disrupt the cycle in progress.) Therefore, even though <code>ILiveManager</code>
+ * extends <code>IManager</code> and contains reserve() and release() methods,
+ * those methods are often not needed here, since you can filter and make use of
+ * the incoming array of updated items on each update. This can also relieve such
+ * managers from needing to store and manage complex handler lists (as
* <code>OverlapMonitor</code> does).</p>
- *
- * <p><code>ILiveManager</code> instances registered using <code>GoEngine.addManager()</code>
- * are stored in an ordered list. You can control the priority of updates in a
+ *
+ * <p><code>ILiveManager</code> instances registered using <code>GoEngine.addManager()</code>
+ * are stored in an ordered list. You can control the priority of updates in a
* program by adding certain managers before others.</p>
- *
+ *
* @see IManager
* @see IManageable
* @see org.goasap.GoEngine#addManager GoEngine.addManager()
- *
+ *
* @author Moses Gunesch
*/
public interface ILiveManager extends IManager
{
-
+
/**
* GoEngine pings this function after each update() cycle for each pulse.
- *
+ *
* @param pulseInterval The pulse interval for this update cycle (-1 is ENTER_FRAME)
* @param handlers The list of handlers actually updated during this cycle
* @param currentTime The clock time that was passed to items during update
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IManageable.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IManageable.as
similarity index 88%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IManageable.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IManageable.as
index 37cd2f32240d..21300b18a7ac 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IManageable.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IManageable.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2007 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -20,97 +20,97 @@
* THE SOFTWARE.
*/
package org.goasap.interfaces {
-
+
/**
* Makes udpatable items usable by IManager instances.
- *
+ *
* <p>The Go system decouples manager classes so they remain compile-
- * optional for the end user, who must explicitly register an instance
+ * optional for the end user, who must explicitly register an instance
* of each desired manager for use with GoEngine. <i>To uphold this system
- * it is extremely important that item classes do not import or make
+ * it is extremely important that item classes do not import or make
* direct reference to specific manager classes. If you need to make a
* reference to a manager from any item class, datatype to manager interfaces
* like IManager, not manager classes like OverlapMonitor.</i></p>
- *
+ *
* @see IManager
- *
+ *
* @author Moses Gunesch
*/
public interface IManageable extends IUpdatable
{
/**
* IManageable requirement.
- *
+ *
* @return All animation targets currently being handled.
*/
function getActiveTargets () : Array;
-
-
+
+
/**
- * IManageable requirement.
- *
- * <p>This list is often passed to the <code>isHandling</code> method of other active
- * IManageable items. <i>DO NOT return all properties the item handles in general,
- * only ones the instance is currently tweening or setting.</i> The list can include
+ * IManageable requirement.
+ *
+ * <p>This list is often passed to the <code>isHandling</code> method of other active
+ * IManageable items. <i>DO NOT return all properties the item handles in general,
+ * only ones the instance is currently tweening or setting.</i> The list can include
* any custom property names the item defines.</p>
- *
+ *
* @return All property-strings currently being handled.
*/
function getActiveProperties () : Array;
-
-
+
+
/**
- * IManageable requirement:
- *
- * Return true if any of the property strings passed in overlap with any
+ * IManageable requirement:
+ *
+ * Return true if any of the property strings passed in overlap with any
* properties being actively handled.
- *
+ *
* <p><b>Direct matching:</b></p>
- *
+ *
* <p>First and foremost, test for a direct match with al properties the item
- * is currently handling on all targets. For example, if the item is actively
+ * is currently handling on all targets. For example, if the item is actively
* setting a 'width' property on any of its animation targets:
* <br><br>
* <code>if (properties.indexOf("width")>-1) return true;</code></p>
- *
+ *
* <p><b>Indirect matching:</b></p>
- *
- * <p>You must be sure to check for indirect, as well as direct matches.
- * This is very important and can at times require some creative thought
+ *
+ * <p>You must be sure to check for indirect, as well as direct matches.
+ * This is very important and can at times require some creative thought
* on your part. Try to keep isHandling code effiecient to reduce processing
* and filesize across batches of items.</p>
- *
+ *
* <ol>
- * <li><i>Overlap,</i> like 'width' and 'scaleX'. These would certainly conflict if
- * two different Go items were allowed to handle them at once on the same target.
+ * <li><i>Overlap,</i> like 'width' and 'scaleX'. These would certainly conflict if
+ * two different Go items were allowed to handle them at once on the same target.
* Overlaps might not always be this obvious, so think creatively.<br><br></li>
- *
- * <li><i>Multi-property groups.</i> If the item is setting multiple properties at
- * once for a single result, such as a bezier-curve tween that operates on both x
- * and y, and may also define a custom property like 'bezier', be sure to return
+ *
+ * <li><i>Multi-property groups.</i> If the item is setting multiple properties at
+ * once for a single result, such as a bezier-curve tween that operates on both x
+ * and y, and may also define a custom property like 'bezier', be sure to return
* true if any of those properties are passed in.<br><br></li>
- *
- * <li><i>Multi-property groups with overlap,</i> in which both of the above occurs.
- * Consider a class with custom 'scale' and 'size' properties that tween <i>scaleX/scaleY</i>
- * and <i>width/height</i>. Overlap occurs between entire groups of properties:
- * <i>scaleX/width/scale/size</i> and <i>scaleY/height/scale/size</i>. You must check
- * whether each property passed in conflicts with this item's active properties using
+ *
+ * <li><i>Multi-property groups with overlap,</i> in which both of the above occurs.
+ * Consider a class with custom 'scale' and 'size' properties that tween <i>scaleX/scaleY</i>
+ * and <i>width/height</i>. Overlap occurs between entire groups of properties:
+ * <i>scaleX/width/scale/size</i> and <i>scaleY/height/scale/size</i>. You must check
+ * whether each property passed in conflicts with this item's active properties using
* those groupings to check for any indirect match.</li>
* </ol>
- *
+ *
* @param properties A list of properties to test for active overlap.
* @return Whether any active overlap occurred with any property passed in.
*/
function isHandling (properties : Array) : Boolean;
-
-
+
+
/**
* IManageable requirement: Normally this method should stop the instance.
- *
+ *
* @param params Gives more complex managers leeway to send additional information
* like specific targets or properties to release, etc.
*/
function releaseHandling (...params) : void;
-
+
}
}
\ No newline at end of file
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IManager.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IManager.as
similarity index 75%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IManager.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IManager.as
index 279b3d048177..70c6f44b9b3e 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IManager.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IManager.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2007 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -20,112 +20,112 @@
* THE SOFTWARE.
*/
package org.goasap.interfaces {
-
+
/**
* Makes an object compatible with <code>GoEngine.addManager()</code>
* <font color="#CC0000">[This section updated recently!]</font></p>
* <p><b>What are managers?</b></p>
- *
- * <p>Tweens and other animation items are not aware of other items while they
- * run; by contrast, manager classes can monitor and interact with many active
- * items at once. <code>OverlapMonitor</code>, a manager shipped with GoASAP,
- * prevents situations like two different tween instances trying to animate the
- * x property of a single sprite at the same time. This type of conflict needs
- * a system-level manager that can look at multiple items as they operate. Managers
- * can be used to automate any general process within an animation system.
+ *
+ * <p>Tweens and other animation items are not aware of other items while they
+ * run; by contrast, manager classes can monitor and interact with many active
+ * items at once. <code>OverlapMonitor</code>, a manager shipped with GoASAP,
+ * prevents situations like two different tween instances trying to animate the
+ * x property of a single sprite at the same time. This type of conflict needs
+ * a system-level manager that can look at multiple items as they operate. Managers
+ * can be used to automate any general process within an animation system.
* This sounds dry, but it can be a creative opportunity as well:Â imagine a manager
- * that automatically motion-blurs targets based on their velocity, for example.
- * Working at the system level gives you power that you don't have at the GoItem level,
- * and opens up a new range of possibilites. For example, a custom game engine would
+ * that automatically motion-blurs targets based on their velocity, for example.
+ * Working at the system level gives you power that you don't have at the GoItem level,
+ * and opens up a new range of possibilites. For example, a custom game engine would
* be built primarily at the management level.</p>
- *
- * <p>There is a distinct difference in the Go system between <i>managers</i> and
- * <i>utilities</i>, although both typically work with batches of Go items. Utilities
- * are tools designed to be directly used at a project level, such as a sequence or
- * animation syntax parser (even <code>GoItems</code> like tween classes are essentially
- * utilities). In contrast, managers are self-sufficient entities that, once registered
- * to <code>GoEngine</code>, operate in the background without requiring any direct
+ *
+ * <p>There is a distinct difference in the Go system between <i>managers</i> and
+ * <i>utilities</i>, although both typically work with batches of Go items. Utilities
+ * are tools designed to be directly used at a project level, such as a sequence or
+ * animation syntax parser (even <code>GoItems</code> like tween classes are essentially
+ * utilities). In contrast, managers are self-sufficient entities that, once registered
+ * to <code>GoEngine</code>, operate in the background without requiring any direct
* interaction at runtime.</p>
- *
+ *
* <p><b>About Go's Decoupled Management system</b></p>
- *
- * <p>The downside of managers in general is that they can add overhead as they perform
- * their additional processes, slowing your system down. Prefab tween engines usually "bake"
- * management features into their core code, locking you into any processing cost incurred as
- * well as whichever set of features the author decided were important. GoASAP's management
- * layer is designed specifically to solve these problems, and is GoASAP's most unique
- * architectural feature. It leverages the centralized pulse engine as a registration hub
- * for any number of managers, then leaves it up to the end user which managers to register
+ *
+ * <p>The downside of managers in general is that they can add overhead as they perform
+ * their additional processes, slowing your system down. Prefab tween engines usually "bake"
+ * management features into their core code, locking you into any processing cost incurred as
+ * well as whichever set of features the author decided were important. GoASAP's management
+ * layer is designed specifically to solve these problems, and is GoASAP's most unique
+ * architectural feature. It leverages the centralized pulse engine as a registration hub
+ * for any number of managers, then leaves it up to the end user which managers to register
* per project.</p>
- *
- * <p>This layer stays <i>optional</i> at all levels: it is optional to make tweens or other
- * animation items manageable in the first place (by implementing <code>IManageable</code>),
- * but it is very easy to write your own custom managers (that implement <code>IManager</code>).
- * Then even after implementation, it still remains optional for the end-user whether to add
- * any particular manager to GoEngine at runtime. By choosing not to add any managers if they
- * aren't needed in a project, Go can stay ultimately streamlined and limit its footprint to
- * just code that is used. It's also very easy to create custom managers to meet the needs
- * of a challenging project. You can activate these custom tools at runtime this time, then
- * ignore them until needed again. This allows you to tie your custom program code very tightly
+ *
+ * <p>This layer stays <i>optional</i> at all levels: it is optional to make tweens or other
+ * animation items manageable in the first place (by implementing <code>IManageable</code>),
+ * but it is very easy to write your own custom managers (that implement <code>IManager</code>).
+ * Then even after implementation, it still remains optional for the end-user whether to add
+ * any particular manager to GoEngine at runtime. By choosing not to add any managers if they
+ * aren't needed in a project, Go can stay ultimately streamlined and limit its footprint to
+ * just code that is used. It's also very easy to create custom managers to meet the needs
+ * of a challenging project. You can activate these custom tools at runtime this time, then
+ * ignore them until needed again. This allows you to tie your custom program code very tightly
* into your animation engine, but keeps those customizations neatly 'decoupled.'</p>
- *
+ *
* <p><b>Go Manager types</b></p>
- *
- * <p>Go currently provides two manager interfaces to choose from, <code>IManager</code> and
- * <code>ILiveManager</code>. An <code>IManager</code> is notified every time any <code>IManageable</code>
- * item is added or removed from GoEngine. This is the interface used by <code>OverlapMonitor</code>
- * for example, which only needs to detect conflicts as new items are added. The second interface,
- * <code>ILiveManager</code>, is for situations where you want a manager to actively handle items
+ *
+ * <p>Go currently provides two manager interfaces to choose from, <code>IManager</code> and
+ * <code>ILiveManager</code>. An <code>IManager</code> is notified every time any <code>IManageable</code>
+ * item is added or removed from GoEngine. This is the interface used by <code>OverlapMonitor</code>
+ * for example, which only needs to detect conflicts as new items are added. The second interface,
+ * <code>ILiveManager</code>, is for situations where you want a manager to actively handle items
* as they update.</p>
- *
+ *
* <p><b>Implementing <code>IManager</code></b></p>
- *
- * <p>This interface has two methods that are called by <code>GoEngine</code>, <code>reserve()</code>
- * and <code>release()</code>. The first method is called when any item that implements <code>IManageable</code>
- * is added to the engine, and the second is called when such an item is removed. This means that
- * instances of a tween class that implements <code>IManageable</code>, for example, can be
- * trapped by the manager while their play cycle is active. Managers can do whatever they want
- * with the items, but the <code>IManageable</code> interface ensures that they can always get
- * the <i>active animation targets and properties</i> from the item, determine <i>property overlap</i>
- * between items, and ask items to <i>stop playing</i> when necessary. There are no rules for what you
- * write in the <code>reserve()</code> or <code>release()</code> methods, except that you should not
- * call <code>release()</code> directly from <code>reserve()</code>, but instead ask an item to stop via
- * a <code>IManageable.releaseHandling()</code> call. <code>GoEngine</code> will call <code>release()</code>
+ *
+ * <p>This interface has two methods that are called by <code>GoEngine</code>, <code>reserve()</code>
+ * and <code>release()</code>. The first method is called when any item that implements <code>IManageable</code>
+ * is added to the engine, and the second is called when such an item is removed. This means that
+ * instances of a tween class that implements <code>IManageable</code>, for example, can be
+ * trapped by the manager while their play cycle is active. Managers can do whatever they want
+ * with the items, but the <code>IManageable</code> interface ensures that they can always get
+ * the <i>active animation targets and properties</i> from the item, determine <i>property overlap</i>
+ * between items, and ask items to <i>stop playing</i> when necessary. There are no rules for what you
+ * write in the <code>reserve()</code> or <code>release()</code> methods, except that you should not
+ * call <code>release()</code> directly from <code>reserve()</code>, but instead ask an item to stop via
+ * a <code>IManageable.releaseHandling()</code> call. <code>GoEngine</code> will call <code>release()</code>
* on the manager once the item has truly been stopped.</p>
- *
- * <p>You can also extend <code>IManageable</code> to add special functionality that a manager might use
- * on an item, or even just to create a new marker datatype without adding any custom methods. This enables
- * your custom managers to sniff for a particular interface type in order to determine which items to store,
- * monitor, or alter. The general rule is that items like tweens are considered working code, so you might
- * end up changing the management implementations on different sets of tweens based on your project needs.
- * Regardless of implementation on the manageable side, managers will remain decoupled in that they need
- * to be registered into <code>GoEngine</code> to be compiled and used in a project. As a general rule
- * you should try to have managers and managed items only reference each other via interfaces so that no
+ *
+ * <p>You can also extend <code>IManageable</code> to add special functionality that a manager might use
+ * on an item, or even just to create a new marker datatype without adding any custom methods. This enables
+ * your custom managers to sniff for a particular interface type in order to determine which items to store,
+ * monitor, or alter. The general rule is that items like tweens are considered working code, so you might
+ * end up changing the management implementations on different sets of tweens based on your project needs.
+ * Regardless of implementation on the manageable side, managers will remain decoupled in that they need
+ * to be registered into <code>GoEngine</code> to be compiled and used in a project. As a general rule
+ * you should try to have managers and managed items only reference each other via interfaces so that no
* classes are forced to be compiled until they are used directly in a project.</p>
- *
+ *
* @see IManageable
* @see org.goasap.managers.OverlapMonitor OverlapMonitor
* @see org.goasap.GoEngine#addManager GoEngine.addManager
- *
+ *
* @author Moses Gunesch
*/
- public interface IManager
+ public interface IManager
{
-
+
/**
* GoEngine reporting that an IManageable is being added to its pulse list.
- *
+ *
* @param handler IManageable to query
*/
function reserve(handler:IManageable):void;
-
-
+
+
/**
* GoEngine reporting that an IManageable is being removed from its pulse list.
- *
- * <p>This method should NOT directly stop the item, stopping an item results in
- * a release() call from GoEngine. This method should simply remove the item from
- * any internal lists and unsubscribe all listeners on the item.</p>
+ *
+ * <p>This method should NOT directly stop the item, stopping an item results in
+ * a release() call from GoEngine. This method should simply remove the item from
+ * any internal lists and unsubscribe all listeners on the item.</p>
*/
function release(handler:IManageable):void;
}
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IPlayable.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IPlayable.as
similarity index 95%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IPlayable.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IPlayable.as
index d8b37f73cb68..7de3185dccfa 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IPlayable.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IPlayable.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2007 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,15 +23,15 @@ package org.goasap.interfaces {
/**
* Extends IPlayableBase to define a standard set of play controls.
- *
+ *
* <p>The most typical way to create a playable class is to extend PlayableBase,
- * (which provides state constants and an id property), then manually implement
+ * (which provides state constants and an id property), then manually implement
* this interface to provide play controls.</p>
- *
+ *
* @see org.goasap.PlayableBase PlayableBase
* @author Moses Gunesch
*/
- public interface IPlayable extends IPlayableBase
+ public interface IPlayable extends IPlayableBase
{
/**
* Start playing.
@@ -42,17 +42,17 @@ package org.goasap.interfaces {
* Stop playing.
*/
function stop () : Boolean;
-
+
/**
* Pause play.
*/
function pause () : Boolean;
-
+
/**
* Resume paused play.
*/
function resume () : Boolean;
-
+
/**
* @param position Index indicating point in animation to skipTo.
* (Remember that you can rename paramters when
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IPlayableBase.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IPlayableBase.as
similarity index 95%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IPlayableBase.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IPlayableBase.as
index 78b067551ae0..2e898d80ba5b 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IPlayableBase.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IPlayableBase.as
@@ -1,11 +1,11 @@
package org.goasap.interfaces {
import flash.events.IEventDispatcher;
-
+
/**
* Defines the portion of the IPlayable interface used by the PlayableBase
* class, which provides a standard set of play-state constants used in Go.
- *
+ *
* @author Moses Gunesch
*/
public interface IPlayableBase extends IEventDispatcher {
@@ -18,8 +18,8 @@ package org.goasap.interfaces {
/**
* An arbitrary id value for the convenient identification of any
- * playable instance.
- *
+ * playable instance.
+ *
* PlayableBase sets this property to an instance-count by default,
* which can be overwritten in program code with any value.
*/
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IUpdatable.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IUpdatable.as
similarity index 89%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IUpdatable.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IUpdatable.as
index df7cbfbdee98..32482d0f0c49 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IUpdatable.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/interfaces/IUpdatable.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2007 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -20,32 +20,32 @@
* THE SOFTWARE.
*/
package org.goasap.interfaces {
-
+
/**
* Makes any object compatible with GoEngine.
- *
+ *
* @author Moses Gunesch
*/
- public interface IUpdatable
+ public interface IUpdatable
{
-
+
/**
* Perform updates on a pulse.
- *
+ *
* @param currentTime A clock time that should be used instead of getTimer
- * in performing update calculations. (The value is usually
+ * in performing update calculations. (The value is usually
* not more than a couple milliseconds different than getTimer
* but using it tightly syncs all items in the timer group
* and can make a perceptible difference.)
*/
function update (currentTime : Number) : void;
-
-
+
+
/**
- * Defines the pulse on which update is called.
- *
- * @return A number of milliseconds for Timer-based updates or GoEngine.ENTER_FRAME (-1)
- * for updates synced to the Flash Player's framerate.
+ * Defines the pulse on which update is called.
+ *
+ * @return A number of milliseconds for Timer-based updates or GoEngine.ENTER_FRAME (-1)
+ * for updates synced to the Flash Player's framerate.
*/
function get pulseInterval() : int;
}
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/items/GoItem.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/items/GoItem.as
similarity index 89%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/items/GoItem.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/items/GoItem.as
index 7332ef3edb08..e0cdbc4e8261 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/items/GoItem.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/items/GoItem.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2007 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -22,81 +22,81 @@
package org.goasap.items {
import org.goasap.GoEngine;
import org.goasap.PlayableBase;
- import org.goasap.interfaces.IUpdatable;
+ import org.goasap.interfaces.IUpdatable;
/**
* Abstract base animation class for other base classes like LinearGo and PhysicsGo.
- *
- * <p>This class extends PlayableBase to add features common to any animation item,
+ *
+ * <p>This class extends PlayableBase to add features common to any animation item,
* either linear or physics (LinearGo and PhysicsGo both extend this class).
* Animation items add themselves to GoEngine to run on a pulse, so the IUpdatable
* interface is implemented here, although update() needs to be subclassed.</p>
- *
+ *
* <p>Animation items should individually implement the standard <code>useRounding</code>
* and <code>useRelative</code> options. Three user-accessible class default settings
* are provided for those and <code>pulseInterval</code>, while play-state constants
* live in the superclass PlayableBase.</p>
- *
+ *
* @author Moses Gunesch
*/
public class GoItem extends PlayableBase implements IUpdatable
{
// -== Settable Class Defaults ==-
-
+
/**
* Class default for the instance property <code>pulseInterval</code>.
- *
+ *
* <p>GoEngine.ENTER_FRAME seems to run the smoothest in real-world contexts.
- * The open-source TweenBencher utility shows that timer-based framerates like
- * 33 milliseconds can perform best for thousands of simultaneous animations,
+ * The open-source TweenBencher utility shows that timer-based framerates like
+ * 33 milliseconds can perform best for thousands of simultaneous animations,
* but in practical contexts timer-based animations tend to stutter.</p>
- *
+ *
* @default GoEngine.ENTER_FRAME
* @see #pulseInterval
*/
public static var defaultPulseInterval : Number = GoEngine.ENTER_FRAME;
-
+
/**
* Class default for the instance property <code>useRounding</code>.
* @default false
* @see #useRounding
*/
public static var defaultUseRounding : Boolean = false;
-
+
/**
* Class default for the instance property <code>useRelative</code>.
* @default false
* @see #useRelative
*/
public static var defaultUseRelative : Boolean = false;
-
+
/**
- * Alters the play speed for instances of any subclass that factors
+ * Alters the play speed for instances of any subclass that factors
* this value into its calculations, such as LinearGo.
- *
+ *
* <p>A setting of 2 should result in half-speed animations, while a setting
- * of .5 should double animation speed. Note that changing this property at
+ * of .5 should double animation speed. Note that changing this property at
* runtime does not usually affect already-playing items.</p>
- *
- * <p>This property is a Go convention, and all subclasses of GoItem (on the
- * LinearGo base class level, but not on the item level extending LinearGo)
+ *
+ * <p>This property is a Go convention, and all subclasses of GoItem (on the
+ * LinearGo base class level, but not on the item level extending LinearGo)
* need to implement it individually.</p>
* @default 1
*/
public static var timeMultiplier : Number = 1;
-
+
// -== Public Properties ==-
-
+
/**
* Required by IUpdatable: Defines the pulse on which <code>update</code> is called.
- *
- * <p>
- * Can be a number of milliseconds for Timer-based updates or
- * <code>GoEngine.ENTER_FRAME</code> (-1) for updates synced to the
- * Flash Player's framerate. If not set manually, the class
+ *
+ * <p>
+ * Can be a number of milliseconds for Timer-based updates or
+ * <code>GoEngine.ENTER_FRAME</code> (-1) for updates synced to the
+ * Flash Player's framerate. If not set manually, the class
* default <code>defaultPulseInterval</code> is adopted.
* </p>
- *
+ *
* @see #defaultPulseInterval
* @see org.goasap.GoEngine#ENTER_FRAME GoEngine.ENTER_FRAME
*/
@@ -108,97 +108,97 @@ package org.goasap.items {
_pulse = interval;
}
}
-
+
/**
- * CONVENTION ALERT: <i>This property is considered a Go convention, and subclasses must
- * implement it individually by calling the correctValue() method on all calculated values
- * before applying them to targets.</i>
- *
+ * CONVENTION ALERT: <i>This property is considered a Go convention, and subclasses must
+ * implement it individually by calling the correctValue() method on all calculated values
+ * before applying them to targets.</i>
+ *
* <p>The correctValue method fixes NaN's as 0 and applies Math.round if useRounding is active.</p>
- *
+ *
* @see correctValue()
* @see LinearGo#onUpdate()
*/
public var useRounding : Boolean = defaultUseRounding;
-
+
/**
- * CONVENTION ALERT: <i>This property is considered a Go convention, and subclasses must implement
+ * CONVENTION ALERT: <i>This property is considered a Go convention, and subclasses must implement
* it individually.</i> Indicates that values should be treated as relative instead of absolute.
- *
- * <p>When true, user-set values should be calculated as
- * relative to their existing value ("from" vs. "to"), when possible.
+ *
+ * <p>When true, user-set values should be calculated as
+ * relative to their existing value ("from" vs. "to"), when possible.
* See an example in the documentation for <code>LinearGo.start</code>.
* </p>
* <p>
* Items that handle more than one property at once, such as a bezier
- * curve, might want to implement a useRelative option for each property
+ * curve, might want to implement a useRelative option for each property
* instead of using this overall item property, which is included here
* to define a convention for standard single-property items.
* </p>
- *
+ *
* @see #defaultUseRelative
*/
public var useRelative : Boolean = defaultUseRelative;
-
-
+
+
// -== Protected Properties ==-
-
+
/**
* @private
*/
protected var _pulse : int = defaultPulseInterval;
-
+
// -== Public Methods ==-
-
+
/**
* Constructor.
*/
public function GoItem() {
super();
}
-
+
/**
- * IMPORTANT: <i>Subclasses need to implement this functionality
+ * IMPORTANT: <i>Subclasses need to implement this functionality
* individually</i>. When updating animation targets, always call
* <code>correctValue</code> on results first. This corrects any
- * NaN's to 0 and applies Math.round if <code>useRounding</code>
+ * NaN's to 0 and applies Math.round if <code>useRounding</code>
* is active.
- *
+ *
* <p>For example, a LinearGo <code>onUpdate</code> method might contain:</p>
* <pre>
* target[ prop ] = correctValue(start + (change * _position));
- * </pre>
- *
+ * </pre>
+ *
* @see #useRounding
* @see #defaultUseRounding
*/
- public function correctValue(value:Number):Number
+ public function correctValue(value:Number):Number
{
- if (isNaN(value))
+ if (isNaN(value))
return 0;
-
+
if (useRounding) // thanks John Grden
- return value = ((value%1==0)
+ return value = ((value%1==0)
? value
: ((value%1>=.5)
? int(value)+1
: int(value)));
-
+
return value;
}
-
+
/**
* Required by IUpdatable: Perform updates on a pulse.
- *
- * <p>The <i>currentTime</i> parameter enables tight visual syncing of groups of items.
+ *
+ * <p>The <i>currentTime</i> parameter enables tight visual syncing of groups of items.
* To ensure the tightest possible synchronization, do not set any internal start-time
* vars in the item until the first update() call is received, then set to the currentTime
* provided by GoEngine. This ensures that groups of items added in a for-loop all have the
* exact same start times, which may otherwise differ by a few milliseconds.</p>
- *
+ *
* @param currentTime A clock time that should be used instead of getTimer
* to store any start-time vars on the first update call
- * and for performing update calculations. The value is usually
+ * and for performing update calculations. The value is usually
* no more than a few milliseconds different than getTimer,
* but using it tightly syncs item groups visually.
*/
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/items/LinearGo.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/items/LinearGo.as
similarity index 89%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/items/LinearGo.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/items/LinearGo.as
index ceaa8598d1ca..1ad551f5ccfd 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/items/LinearGo.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/items/LinearGo.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2007 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -21,16 +21,16 @@
*/
package org.goasap.items {
import flash.utils.getTimer;
-
+
import org.goasap.GoEngine;
import org.goasap.errors.EasingFormatError;
import org.goasap.events.GoEvent;
import org.goasap.interfaces.IPlayable;
- import org.goasap.managers.LinearGoRepeater;
+ import org.goasap.managers.LinearGoRepeater;
/**
- * Dispatched during an animation's first update after the delay
- * has completed, if one was set. Any number of callbacks may also be
+ * Dispatched during an animation's first update after the delay
+ * has completed, if one was set. Any number of callbacks may also be
* associated with this event using <code>addCallback</code>.
* @eventType org.goasap.events.START
*/
@@ -59,7 +59,7 @@ package org.goasap.items {
/**
* Dispatched at the end of each cycle if the tween has more than one.
- * Any number of callbacks may also be associated with this event using
+ * Any number of callbacks may also be associated with this event using
* <code>addCallback</code>.
* @eventType org.goasap.events.CYCLE
*/
@@ -74,96 +74,96 @@ package org.goasap.items {
/**
* Dispatched on an animation's final update, just after the last update event.
- * Any number of callbacks may also be associated with this event using
+ * Any number of callbacks may also be associated with this event using
* <code>addCallback</code>.
* @eventType org.goasap.events.COMPLETE
*/
[Event(name="COMPLETE", type="org.goasap.events.GoEvent")]
/**
- * LinearGo extends the base class GoItem to define a playable A-to-B animation.
- *
+ * LinearGo extends the base class GoItem to define a playable A-to-B animation.
+ *
* <p><b>LinearGo: A very simple tween</b></p>
- *
- * <p>A LinearGo instance is a playable object that animates a single number. It dispatches events
- * and callbacks associated with the animation's start, update and completion. Instances can be used
- * directly, or easily subclassed to build custom tweening APIs. LinearGo extends GoItem, which
- * provides basic settings shared by physics and tween items. These include play-state contants and
- * a <code>state</code> property, <code>pulseInterval</code>, and the two common animation options
+ *
+ * <p>A LinearGo instance is a playable object that animates a single number. It dispatches events
+ * and callbacks associated with the animation's start, update and completion. Instances can be used
+ * directly, or easily subclassed to build custom tweening APIs. LinearGo extends GoItem, which
+ * provides basic settings shared by physics and tween items. These include play-state contants and
+ * a <code>state</code> property, <code>pulseInterval</code>, and the two common animation options
* <code>useRounding</code> and <code>useRelative</code>.</p>
- *
- * <p>The tween can be customized using the instance properties <code>duration</code>, <code>easing</code>
- * and <code>delay</code>. The number crunched by a LinearGo is readable in its <code>position</code>
- * property. This number always starts at 0 and completes at 1, regardless of the tween's duration
- * or easing (those parameters are factored in to produce accurate fractional in-between values).
- * As the tween runs, you can use <code>position</code> as a multiplier to animate virtually anything:
+ *
+ * <p>The tween can be customized using the instance properties <code>duration</code>, <code>easing</code>
+ * and <code>delay</code>. The number crunched by a LinearGo is readable in its <code>position</code>
+ * property. This number always starts at 0 and completes at 1, regardless of the tween's duration
+ * or easing (those parameters are factored in to produce accurate fractional in-between values).
+ * As the tween runs, you can use <code>position</code> as a multiplier to animate virtually anything:
* motion, alpha, a sound level, the values in a ColorTransform, BitmapFilter, a 3D scene, and so on.
* Note that at times position may be less than 0 or greater than 1 depending on the easing function.</p>
- *
- * <p>The START event occurs just before the first update (after the delay). UPDATE is fired once on
- * <i>every</i> update pulse, and COMPLETE just after the final update. The STOP event is fired by LinearGo
+ *
+ * <p>The START event occurs just before the first update (after the delay). UPDATE is fired once on
+ * <i>every</i> update pulse, and COMPLETE just after the final update. The STOP event is fired by LinearGo
* only if a tween is stopped before it completes. Additional events are fired on PAUSE, RESUME and at
- * the end of each CYCLE if the tween plays more than one cycle. Besides standard events, you can store
- * callback functions (method-closures) using <code>addCallback</code>. Any number of callbacks can be
- * associated with each GoEvent type. This alternative to the standard event model was included in
- * LinearGo since it's a common feature of many modern tweening APIs, and very slightly more efficient
+ * the end of each CYCLE if the tween plays more than one cycle. Besides standard events, you can store
+ * callback functions (method-closures) using <code>addCallback</code>. Any number of callbacks can be
+ * associated with each GoEvent type. This alternative to the standard event model was included in
+ * LinearGo since it's a common feature of many modern tweening APIs, and very slightly more efficient
* than standard events.</p>
- *
+ *
* <p>LinearGo can play multiple back-and-forth tween cycles or repeat forward-play any number of times.
* This functionality is handled by the LinearGo's <code>repeater</code> instance, which has settings for
- * alternate easing on reverse-cycles, infinite cycling, plus <code>currentCycle</code> and <code>done</code>
+ * alternate easing on reverse-cycles, infinite cycling, plus <code>currentCycle</code> and <code>done</code>
* state properties.</p>
- *
+ *
* <p><b>Subclassing to create custom tweens</b></p>
- *
- * <p><i>Important: Store your custom tween classes in a package bearing your own classpath, not in the core
+ *
+ * <p><i>Important: Store your custom tween classes in a package bearing your own classpath, not in the core
* package! This will help avoid confusion with other authors' work.</i></p>
- *
- * <p>It's possible to build virtually any tweening API over LinearGo because all of the specifics are left
+ *
+ * <p>It's possible to build virtually any tweening API over LinearGo because all of the specifics are left
* up to you: target objects, tweenable properties, tween values — and importantly, the datatypes of all of these.</p>
- *
- * <p>A basic subclass can be created in three steps: Gathering target & property information, subclassing the
- * <code>start</code> method to set up the tween, and finally subclassing the <code>onUpdate</code> method
- * to affect the tween. The first step, gathering tween target and property information, can be done by writing
- * getter/setter properties, customizing the constructor, or both. Consider various options such as allowing for
- * single vs. multiple target objects, open vs. specific tween properties, and so on. The next step, subclassing
- * <code>start</code>, involves figuring the tween's amount of change and implementing a standard Go convention,
- * <code>useRelative</code>. This option should enable the user to declare tween values as relative to existing
- * values instead of as fixed absolutes. In the final step, you subclass <code>onUpdate</code> to apply the tween,
+ *
+ * <p>A basic subclass can be created in three steps: Gathering target & property information, subclassing the
+ * <code>start</code> method to set up the tween, and finally subclassing the <code>onUpdate</code> method
+ * to affect the tween. The first step, gathering tween target and property information, can be done by writing
+ * getter/setter properties, customizing the constructor, or both. Consider various options such as allowing for
+ * single vs. multiple target objects, open vs. specific tween properties, and so on. The next step, subclassing
+ * <code>start</code>, involves figuring the tween's amount of change and implementing a standard Go convention,
+ * <code>useRelative</code>. This option should enable the user to declare tween values as relative to existing
+ * values instead of as fixed absolutes. In the final step, you subclass <code>onUpdate</code> to apply the tween,
* using the <code>_position</code> calculated by this base class:</p>
- *
+ *
* <pre>target[ propName ] = super.correctValue(start + change * _position);</pre>
- *
- * <p>The helper method <code>correctValue</code> is provided in the superclass GoItem, to clean up NaN values
- * and apply rounding when <code>useRounding</code> is activated. That's it — events and callbacks are
+ *
+ * <p>The helper method <code>correctValue</code> is provided in the superclass GoItem, to clean up NaN values
+ * and apply rounding when <code>useRounding</code> is activated. That's it — events and callbacks are
* dispatched by LinearGo, so subclasses can remain simple.</p>
- *
- * <p>An optional fourth step will make your custom tween compatible with Go managers. To do this, implement
- * the IManageable interface. (OverlapMonitor prevents different tween instances from handling the same
+ *
+ * <p>An optional fourth step will make your custom tween compatible with Go managers. To do this, implement
+ * the IManageable interface. (OverlapMonitor prevents different tween instances from handling the same
* property at once; you can build other managers as well.)</p>
- *
+ *
* {In the game of Go a black or white stone is called a go-ishi.}
- *
+ *
* @author Moses Gunesch
*/
public class LinearGo extends GoItem implements IPlayable
{
// -== Settable Class Defaults ==-
-
+
/**
* Class default for the instance property delay.
* @default 0
* @see #delay
*/
public static var defaultDelay : Number = 0;
-
+
/**
* Class default for the instance property duration.
* @default 1
* @see #duration
*/
public static var defaultDuration : Number = 1;
-
+
/**
* Class default for the instance property easing.
* Note that this property is left null until the first LinearGo
@@ -172,7 +172,7 @@ package org.goasap.items {
* @see #easing
*/
public static var defaultEasing:Function;
-
+
/**
* Normal default easing, this is Quintic.easeOut.
* (The two default easings in this class are included because there's
@@ -181,9 +181,9 @@ package org.goasap.items {
public static function easeOut(t:Number, b:Number, c:Number, d:Number) : Number {
return c * ((t = t / d - 1) * t * t * t * t + 1) + b;
};
-
+
// -== Class Methods ==-
-
+
/**
* An alternative default easing with no acceleration.
* (The two default easings in this class are included because there's
@@ -192,31 +192,31 @@ package org.goasap.items {
public static function easeNone(t:Number, b:Number, c:Number, d:Number) : Number {
return c * t / d + b;
};
-
+
/**
* A quick one-time setup command that lets you turn on useFrames mode
* as a default for all new tweens and adjust some related settings.
* (Note that useFrames mode is normally only used for specialty situations.)
- *
+ *
* @param defaultToFramesMode Sets an internal default so all new LinearGo instances
- * will be set to use framecounts for their delay and duration.
- * Also sets GoItem.defaultPulseInterval to enterframe which is
+ * will be set to use framecounts for their delay and duration.
+ * Also sets GoItem.defaultPulseInterval to enterframe which is
* most normal for frame-based updates.
* @param useZeroBasedFrameIndex Normally currentFrame reads 1 on first update, like the Flash
- * timeline starts at Frame 1. Set this option to use a zero-based
+ * timeline starts at Frame 1. Set this option to use a zero-based
* index on all tweens instead.
* @see #useFrames
* @see #currentFrame
*/
public static function setupUseFramesMode( defaultToFramesMode: Boolean = true,
- useZeroBasedFrameIndex: Boolean=false):void {
+ useZeroBasedFrameIndex: Boolean=false):void {
GoItem.defaultPulseInterval = GoEngine.ENTER_FRAME;
_useFramesMode = defaultToFramesMode;
if (useZeroBasedFrameIndex) { _framesBase = 0; }
}
// -== Pulic Properties ==-
-
+
/**
* Number of seconds after start() call that the LinearGo begins processing.
* <p>If not set manually, the class default defaultDelay is adopted.</p>
@@ -230,7 +230,7 @@ package org.goasap.items {
_delay = seconds;
}
}
-
+
/**
* Number of seconds the LinearGo takes to process.
* <p>If not set manually, the class default defaultDuration is adopted.</p>
@@ -244,16 +244,16 @@ package org.goasap.items {
_duration = seconds;
}
}
-
+
/**
* Any standard easing-equation function such as the ones found in
* the Flash package fl.motion.easing or the flex package mx.effects.easing.
- *
+ *
* <p>If not set manually, the class default defaultEasing is adopted. An error
- * is thrown if the function does not follow the typical format. For easings
+ * is thrown if the function does not follow the typical format. For easings
* that accept more than four parameters use <code>extraEasingParams</code>.
* </p>
- *
+ *
* @see #defaultEasing
* @see #extraEasingParams
*/
@@ -271,7 +271,7 @@ package org.goasap.items {
throw new EasingFormatError();
}
}
-
+
/**
* Additional parameters to pass to easing functions that accept more than four.
* @see #easing
@@ -284,48 +284,48 @@ package org.goasap.items {
_extraEaseParams = params;
}
}
-
+
/**
- * A LinearGoRepeater instance that defines options for repeated
+ * A LinearGoRepeater instance that defines options for repeated
* or back-and-forth cycling animation.
- *
+ *
* <p>You may pass a LinearGoRepeater instance to the constructor's
- * repeater parameter to set all options at instantiation. The
+ * repeater parameter to set all options at instantiation. The
* repeater's cycles property can be set to an integer, or
* to Repeater.INFINITE or 0 to repeat indefinitely, and checked using
- * <code>linearGo.repeater.currentCycle</code>. LinearGoRepeater's
+ * <code>linearGo.repeater.currentCycle</code>. LinearGoRepeater's
* <code>reverseOnCycle</code> flag is true by default, which
* causes animation to cycle back and forth. In that mode you can
* also specify a separate easing function (plus extraEasingParams)
* to use for the reverse animation cycle. For example, an easeOut
- * easing with an easeIn easingOnCycle will produce a more
- * natural-looking result. If <code>reverseOnCycle</code> is disabled,
+ * easing with an easeIn easingOnCycle will produce a more
+ * natural-looking result. If <code>reverseOnCycle</code> is disabled,
* the animation will repeat its play forward each time.</p>
- *
- * <p>(The repeater property replaces the cycles, easeOnCycle and
+ *
+ * <p>(The repeater property replaces the cycles, easeOnCycle and
* currentCycle parameters in earlier releases of LinearGo).</p>
- *
+ *
* @see org.goasap.managers.LinearGoRepeater LinearGoRepeater
*/
public function get repeater(): LinearGoRepeater {
return _repeater;
}
-
+
/**
* When useFrames mode is activated, duration and delay are treated
* as update-counts instead of time values.
- *
+ *
* <p>(This mode is normally only used for specialty situations.)</p>
- *
- * <p>Using this feature with a pulseInterval of GoEngine.ENTER_FRAME
- * will result in a frame-based update that mimics the behavior of the
- * flash timeline. As with the timeline, frame-based tween durations can
+ *
+ * <p>Using this feature with a pulseInterval of GoEngine.ENTER_FRAME
+ * will result in a frame-based update that mimics the behavior of the
+ * flash timeline. As with the timeline, frame-based tween durations can
* vary based on the host computer's processor load and other factors.</p>
- *
+ *
* <p>The <code>setupUseFramesMode()</code> class method is a much easier
* way to use frames in your project, instead of setting this property
* on every tween individually.</p>
- *
+ *
* @see #setupUseFramesMode()
*/
public function set useFrames(value:Boolean):void {
@@ -335,37 +335,37 @@ package org.goasap.items {
public function get useFrames():Boolean {
return _useFrames;
}
-
+
/**
* A number between 0 and 1 representing the current tween value.
- *
- * <p>Use this number as a multiplier to apply values to targets
- * across time.<p>
- *
+ *
+ * <p>Use this number as a multiplier to apply values to targets
+ * across time.<p>
+ *
* <p>Here's an example of what an overridden update method might contain:</p>
* <pre>
* super.update(currentTime);
* target[ propName ] = super.correctValue(startValue + change*_position);
- * </pre>
+ * </pre>
* @see #timePosition
*/
public function get position():Number {
return _position;
}
-
+
/**
- * For time-based tweens, returns a time value which is negative during delay
+ * For time-based tweens, returns a time value which is negative during delay
* then spans the tween duration in positive values, ignoring repeat cycles.
- *
+ *
* <p>In useFrames mode, this getter differs from <code>currentFrame</code>
* significantly. Instead of constantly increasing through all cycles as if
* tweens were back-to-back in a timeline layer, this method acts more like
- * a single tween placed at frame 1, with a timeline playhead that scans back
- * and forth or loops during cycles. So for a 10-frame tween with a 5-frame
- * delay and 2 repeater cycles with reverseOnCycle set to true, this method
- * will return values starting at -5, start the animation at 1, play to 10
+ * a single tween placed at frame 1, with a timeline playhead that scans back
+ * and forth or loops during cycles. So for a 10-frame tween with a 5-frame
+ * delay and 2 repeater cycles with reverseOnCycle set to true, this method
+ * will return values starting at -5, start the animation at 1, play to 10
* then step backward to 1 again.</p>
- *
+ *
* @see #position
* @see #currentFrame
* @see #duration
@@ -391,20 +391,20 @@ package org.goasap.items {
/**
* Returns the number of updates that have occured since start.
- *
- * <p>This update-count property does not necessarily correspond
+ *
+ * <p>This update-count property does not necessarily correspond
* to the actual player framerate, just the instance's pulseInterval.</p>
- *
- * <p>This property is set up to mirror the flash timeline. Imagine a timeline
- * layer with a delay being a set of blank frames followed by the tween,
- * followed by subsequent cycles as additional tweens: this is the way
- * the <code>currentFrame</code> property works. Its first value is 1 by
+ *
+ * <p>This property is set up to mirror the flash timeline. Imagine a timeline
+ * layer with a delay being a set of blank frames followed by the tween,
+ * followed by subsequent cycles as additional tweens: this is the way
+ * the <code>currentFrame</code> property works. Its first value is 1 by
* default, which can be changed to 0 in <code>setupUseFramesMode()</code>.
- * This differs significantly from <code>timePosition</code>, which places
+ * This differs significantly from <code>timePosition</code>, which places
* the start of a single instance of the tween at frame 1 and steps its
- * values from negative during delay then cycling through the single tween.</p>
- *
- *
+ * values from negative during delay then cycling through the single tween.</p>
+ *
+ *
* @see #useFrames
* @see #setupUseFramesMode()
* @see #timePosition
@@ -412,68 +412,68 @@ package org.goasap.items {
public function get currentFrame():uint {
return _currentFrame;
}
-
+
// -== Protected Properties ==-
-
+
/** @private */
protected static var _useFramesMode : Boolean = false;
-
+
/** @private */
protected static var _framesBase : Number = 1;
-
+
/** @private */
protected var _delay : Number;
-
+
/** @private */
protected var _duration : Number;
-
+
/** @private */
protected var _tweenDuration : Number;
-
+
/** @private */
protected var _easing : Function;
-
+
/** @private */
protected var _easeParams : Array;
-
+
/** @private */
protected var _extraEaseParams : Array;
-
+
/** @private */
protected var _repeater : LinearGoRepeater;
-
+
/** @private */
protected var _currentEasing : Function;
-
+
/** @private */
protected var _useFrames : Boolean;
-
+
/** @private */
protected var _started : Boolean = false;
-
+
/** @private */
protected var _currentFrame : int;
-
+
/** @private */
protected var _position : Number;
-
+
/** @private */
protected var _change : Number;
-
+
/** @private */
protected var _startTime : Number;
-
+
/** @private */
protected var _endTime : Number;
-
+
/** @private */
protected var _pauseTime : Number;
-
+
/** @private */
protected var _callbacks : Object = new Object(); // In tests, creating this object up front is more efficient.
-
+
// -== Public Methods ==-
-
+
/**
* The inputs here are not a convention, subclasses should design
* their own constructors appropriate to usage. They are provided
@@ -514,43 +514,43 @@ package org.goasap.items {
_useFrames = (useFrames || _useFramesMode);
if (!isNaN(pulseInterval)) _pulse = pulseInterval;
if (repeater!=null) _repeater = repeater; // repeater setup makes super() call important for all subclasses.
- else _repeater = new LinearGoRepeater();
+ else _repeater = new LinearGoRepeater();
_repeater.setParent(this);
}
-
+
/**
* Starts play for this LinearGo instance using GoEngine.
- *
+ *
* <p>CONVENTION ALERT: If <code>useRelative</code> is true, calculate tween values
* relative to the target object's existing value as in the example below.</p>
- *
+ *
* <p>Most typically you should also store the tween's start and change values
* for later use in <code>onUpdate</code>.</p>
- *
+ *
* <pre>
* protected var _target : DisplayObject;
* protected var _width : Number;
* protected var _changeWidth : Number;
- *
- * public function start():Boolean
+ *
+ * public function start():Boolean
* {
* if (!_target || !_width || isNaN(_width))
* return false;
- *
+ *
* _startWidth = _target.width;
- *
+ *
* if (useRelative) {
* _changeWidth = _width;
* } else {
* _changeWidth = (_width - _startWidth);
* }
- *
+ *
* return (super.start());
* }
* </pre>
- *
+ *
* @return Successful addition of the item to GoEngine
- *
+ *
* @see GoItem#useRelative
* @see #onUpdate()
*/
@@ -563,12 +563,12 @@ package org.goasap.items {
// note: start event is dispatched on the first update cycle for tighter cross-item syncing.
return true;
}
-
+
/**
* Ends play for this LinearGo instance and dispatches a GoEvent.STOP
- * event if the tween is incomplete. This method does not typically
+ * event if the tween is incomplete. This method does not typically
* require subclassing.
- *
+ *
* @return Successful removal of the item from GoEngine
*/
public function stop() : Boolean {
@@ -585,7 +585,7 @@ package org.goasap.items {
/**
* Pauses play (including delay) for this LinearGo instance.
* This method does not typically require subclassing.
- *
+ *
* @return Success
* @see #resume()
* @see org.goasap.GoEngine#setPaused GoEngine.setPaused()
@@ -598,11 +598,11 @@ package org.goasap.items {
dispatch(GoEvent.PAUSE);
return true;
}
-
+
/**
* Resumes previously paused play, including delay.
* This method does not typically require subclassing.
- *
+ *
* @return Success
* @see #pause()
* @see org.goasap.GoEngine#setPaused GoEngine.setPaused()
@@ -611,30 +611,30 @@ package org.goasap.items {
if (_state != PAUSED)
return false;
var currentTime:Number = (_useFrames ? _currentFrame : getTimer());
- setup(currentTime - (_pauseTime - _startTime));
+ setup(currentTime - (_pauseTime - _startTime));
_pauseTime = NaN;
_state = (_startTime > currentTime ? PLAYING_DELAY : PLAYING);
dispatch(GoEvent.RESUME);
return true;
}
-
+
/**
- * Skips to a point in the tween's duration and plays, from any state.
+ * Skips to a point in the tween's duration and plays, from any state.
* This method does not typically require subclassing.
- *
- * <p>If GoItem.timeMultiplier is set to a custom value, you should still pass a
+ *
+ * <p>If GoItem.timeMultiplier is set to a custom value, you should still pass a
* seconds value based on the tween's real duration setting.</p>
- *
+ *
* @param time Seconds or frames to jump to across all cycles, where 0 (or 1 in useFramesMode)
* represents tween start, numbers greater than duration represent higher repeat cycles,
* and negative numbers represent a new delay to play before tween start.
* @return Success
* @see #timePosition
*/
- public function skipTo(time : Number) : Boolean
+ public function skipTo(time : Number) : Boolean
{
if (_state==STOPPED) {
- if (start()==false)
+ if (start()==false)
return false;
}
if (isNaN(time)) { time = 0; }
@@ -661,36 +661,36 @@ package org.goasap.items {
update(currentTime); // sets _position
return true;
}
-
+
/**
- * An alternative to subscribing to events is to store callbacks. You can
+ * An alternative to subscribing to events is to store callbacks. You can
* associate any number of callbacks with the primary GoEvent types START,
- * UPDATE, COMPLETE, and STOP (only fired if the tween is stopped before it
+ * UPDATE, COMPLETE, and STOP (only fired if the tween is stopped before it
* completes).
- *
+ *
* <p>
* Note that there is little difference between using callbacks and events.
- * Both are common techniques used in many various modern tweening APIs. Callbacks
- * are slightly faster, but this won't normally be noticeable unless thousands of
+ * Both are common techniques used in many various modern tweening APIs. Callbacks
+ * are slightly faster, but this won't normally be noticeable unless thousands of
* tweens are being run at once.
* </p>
- *
+ *
* @param closure A reference to a callback function
* @param type Any GoEvent type constant, the default is COMPLETE.
* @see #removeCallback
* @see org.goasap.events.GoEvent GoEvent
*/
public function addCallback(closure : Function, type : String=GoEvent.COMPLETE):void {
- if (!_callbacks[ type ])
+ if (!_callbacks[ type ])
_callbacks[ type ] = new Array();
var a:Array = (_callbacks[ type ] as Array);
if (a.indexOf(closure)==-1)
a.push(closure);
}
-
+
/**
* Removes a method closure previously stored using addCallback.
- *
+ *
* @param closure A reference to a function
* @param type A GoEvent constant, default is COMPLETE.
* @see #addCallback
@@ -698,34 +698,34 @@ package org.goasap.items {
*/
public function removeCallback(closure : Function, type : String=GoEvent.COMPLETE):void {
var a:Array = (_callbacks[ type ] as Array);
- if (a)
+ if (a)
while (a.indexOf(closure)>-1)
a.splice(a.indexOf(closure), 1);
}
-
+
/**
* Performs tween calculations on GoEngine pulse.
- *
+ *
* <p>Subclass <code>onUpdate</code> instead of this method.
- *
+ *
* @param currentTime Clock time for the current block of updates.
* @see #onUpdate()
*/
- override public function update(currentTime:Number) : void
+ override public function update(currentTime:Number) : void
{
if (_state==PAUSED)
return;
-
+
_currentFrame ++;
- if (_useFrames)
+ if (_useFrames)
currentTime = _currentFrame;
-
- if (isNaN(_startTime)) // setup() must be called once prior to tween's 1st update.
+
+ if (isNaN(_startTime)) // setup() must be called once prior to tween's 1st update.
setup(currentTime); // This is done here, not in start, for tighter syncing of items.
-
- if (_startTime > currentTime)
+
+ if (_startTime > currentTime)
return; // still PLAYING_DELAY
-
+
// (1.) Set _position and determine primary update type.
var type:String = GoEvent.UPDATE;
if (currentTime < _endTime) { // start, update...
@@ -738,7 +738,7 @@ package org.goasap.items {
_position = _easeParams[1] + _change; // set absolute 1 or 0 position at end of cycle
type = (_repeater.hasNext() ? GoEvent.CYCLE : GoEvent.COMPLETE);
}
-
+
// (2.) Run onUpdate() passing the primary update type, then
// (3.) dispatch up to three events in correct order.
onUpdate(type);
@@ -758,21 +758,21 @@ package org.goasap.items {
_startTime = NaN; // causes setup() to be called again on next update to prep next cycle.
}
}
-
+
// -== Protected Methods ==-
-
+
/**
- * Subclass this method (instead of the update method) for simplicity.
- *
- * <p>Use this method to manipulate targets based on the current _position
+ * Subclass this method (instead of the update method) for simplicity.
+ *
+ * <p>Use this method to manipulate targets based on the current _position
* setting, which is a 0-1 multiplier precalculated to the tween's position
- * based on its easing style and the current time in the tween.</p>
- *
+ * based on its easing style and the current time in the tween.</p>
+ *
* <p>CONVENTION ALERT: To implement the Go convention <code>useRounding</code>,
- * always call GoItem's <code>correctValue()</code> method on each calculated
- * tween value before you apply it to a target. This corrects NaN to 0 and
+ * always call GoItem's <code>correctValue()</code> method on each calculated
+ * tween value before you apply it to a target. This corrects NaN to 0 and
* rounds the value if <code>useRounding</code> is true.</p>
- *
+ *
* Example:
* <pre>
* override protected function onUpdate(type:String):void
@@ -780,24 +780,24 @@ package org.goasap.items {
* target[ propName ] = super.correctValue(startValue + change*_position);
* }
* </pre>
- *
+ *
* @param type A constant from the class GoEvent: START, UPDATE, CYCLE, or COMPLETE.
* @see GoItem#correctValue()
* @see GoItem#useRounding
* @see #update()
*/
- protected function onUpdate(type : String) : void
+ protected function onUpdate(type : String) : void
{
// Subclass this method and start to implement your tween class.
}
-
+
/**
* @private
* Internal setup routine used by start() and other methods.
- *
+ *
* @param time Tween start time based on getTimer
*/
- protected function setup(startTime : Number) : void
+ protected function setup(startTime : Number) : void
{
_startTime = startTime;
var mult:Number = Math.max(0, timeMultiplier) * (_useFrames ? 1 : 1000);
@@ -808,9 +808,9 @@ package org.goasap.items {
_startTime += d;
_endTime += d;
}
- // Set up a tween cycle: _currentEasing, _change, _position, and _easeParams.
+ // Set up a tween cycle: _currentEasing, _change, _position, and _easeParams.
// Be sure _repeater is updated before this call so the next cycle gets set up.
- var useCycleEase:Boolean = _repeater.currentCycleHasEasing;
+ var useCycleEase:Boolean = _repeater.currentCycleHasEasing;
_currentEasing = (useCycleEase ? _repeater.easingOnCycle : _easing);
var extras:Array = (useCycleEase ? _repeater.extraEasingParams : _extraEaseParams);
_change = _repeater.direction;
@@ -818,15 +818,15 @@ package org.goasap.items {
_easeParams = new Array(0, _position, _change, _tweenDuration); // stored to reduce runtime object-creation
if (extras) _easeParams = _easeParams.concat(extras);
}
-
+
/**
* @private
* Internal, dispatches events and executes callbacks of any pre-verified type.
- *
+ *
* @param type Verified in addCallback, not in this method.
* @see #org.goasap.events.GoEvent GoEvent
*/
- protected function dispatch(type:String):void
+ protected function dispatch(type:String):void
{
var a:Array = (_callbacks[ type ] as Array);
if (a)
@@ -835,7 +835,7 @@ package org.goasap.items {
if (hasEventListener(type))
dispatchEvent(new GoEvent( type ));
}
-
+
/**
* @private
*/
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/items/PhysicsGo.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/items/PhysicsGo.as
similarity index 98%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/items/PhysicsGo.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/items/PhysicsGo.as
index 89ea2384e4b7..31f8b2679177 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/items/PhysicsGo.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/items/PhysicsGo.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2007 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,11 +23,11 @@ package org.goasap.items {
/**
* Yet to be written - Physics guru wanted!
- *
+ *
* @author Moses Gunesch
*/
public class PhysicsGo extends GoItem {
-
+
public function PhysicsGo() {
super();
}
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/managers/LinearGoRepeater.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/managers/LinearGoRepeater.as
similarity index 98%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/managers/LinearGoRepeater.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/managers/LinearGoRepeater.as
index 1b4f03428bde..b8b89c57a027 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/managers/LinearGoRepeater.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/managers/LinearGoRepeater.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2008 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -26,7 +26,7 @@ package org.goasap.managers {
* @see org.goasap.items.LinearGo LinearGo
*/
public class LinearGoRepeater extends Repeater {
-
+
/**
* Whether tween direction should reverse every other cycle.
*/
@@ -37,7 +37,7 @@ package org.goasap.managers {
if (unlocked())
_reverseOnCycle = value;
}
-
+
/**
* Current play direction depending on reverseOnCycle and currentCycle.
* @return 1 for forward, -1 for reverse.
@@ -48,7 +48,7 @@ package org.goasap.managers {
}
return 1;
}
-
+
/**
* Storage for optional secondary easing to use on reverse cycles.
*/
@@ -59,7 +59,7 @@ package org.goasap.managers {
if (unlocked())
_easingOnCycle = value;
}
-
+
/**
* Additional parameters to use with easingOnCycle if the function accepts more than four.
*/
@@ -70,24 +70,24 @@ package org.goasap.managers {
if (unlocked())
_extraEasingParams = value;
}
-
+
/**
- * @private
+ * @private
* For use by LinearGo, simple way to see if easingOnCycle should be used in the current cycle.
*/
public function get currentCycleHasEasing() : Boolean {
return (_reverseOnCycle && _currentCycle%2==1 && _easingOnCycle!=null);
}
-
+
/** @private */
protected var _reverseOnCycle: Boolean = false;
-
+
/** @private */
protected var _easingOnCycle: Function;
-
+
/** @private */
protected var _extraEasingParams: Array;
-
+
/**
* @param cycles Number of times to play the LinearGo tween.
* @param reverseOnCycle Whether tween direction should reverse every other cycle.
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/managers/OverlapMonitor.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/managers/OverlapMonitor.as
similarity index 96%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/managers/OverlapMonitor.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/managers/OverlapMonitor.as
index a3e7a15e4ea8..d1bf4832a519 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/managers/OverlapMonitor.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/managers/OverlapMonitor.as
@@ -1,17 +1,17 @@
/**
* Copyright (c) 2007 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -22,43 +22,43 @@
*/
package org.goasap.managers {
import flash.utils.Dictionary;
-
+
import org.goasap.interfaces.IManageable;
- import org.goasap.interfaces.IManager;
+ import org.goasap.interfaces.IManager;
/**
- * Calls <code>releaseHandling()</code> on currently-active items when
- * property-handling overlap is detected (like two tweens trying to set
- * the same sprite's x property), as new items are added to GoEngine.
- *
+ * Calls <code>releaseHandling()</code> on currently-active items when
+ * property-handling overlap is detected (like two tweens trying to set
+ * the same sprite's x property), as new items are added to GoEngine.
+ *
* <p>To activate this manager call the following line one time:</p>
* <pre>GoEngine.addManager( new OverlapMonitor() );</pre>
- *
+ *
* {In the game of Go, a superko is a rule that prevents a potentially
* infinite competition - ko - over the same space.}
- *
+ *
* @see org.goasap.interfaces.IManager IManager
* @see org.goasap.interfaces.IManageable IManageable
* @see org.goasap.GoEngine GoEngine
- *
+ *
* @author Moses Gunesch
*/
public class OverlapMonitor implements IManager
{
/**
- * A set of Dictionaries by target object. Targets are indexed
+ * A set of Dictionaries by target object. Targets are indexed
* because they are the primary point of overlap to check first.
*/
protected var handlers : Dictionary = new Dictionary(false);
-
+
/**
* Tracks subdictionary lengths.
*/
protected var counts : Dictionary = new Dictionary(false);
-
+
/**
* Sets an IManageable as reserving its target/property combinations.
- *
+ *
* @param handler IManageable to reserve
*/
public function reserve(handler:IManageable):void
@@ -66,11 +66,11 @@ package org.goasap.managers {
// =======================================================================================
// Step-by-step: Items are 'reserved' or stored in a Dictionary.
// When a new item says it's handling the same target as a stored item, the stored item
- // is asked whether the new item's properties conflict. If so, the old item is 'released'
+ // is asked whether the new item's properties conflict. If so, the old item is 'released'
// from its duties. (Tip: 'handlers' here are GoItems like tweens, not functions.)
// =======================================================================================
-
-
+
+
var targs:Array = handler.getActiveTargets();
var props:Array = handler.getActiveProperties();
if (!targs || !props || targs.length==0 || props.length==0)
@@ -86,14 +86,14 @@ package org.goasap.managers {
counts[ targ ] = 1;
continue;
}
-
+
var targ_handlers: Dictionary = (handlers[ targ ] as Dictionary); // as in, 'active tweens handling a same Sprite'
if (targ_handlers[ handler ]) continue; // safety (handler already reserved)
-
+
// keep before isHandling() tests
targ_handlers[ handler ] = true;
counts[ targ ] ++;
-
+
for (var other:Object in targ_handlers) {
if (other!=handler)
if ((other as IManageable).isHandling(props)) { // Ask each existing handler to report overlap.
@@ -103,11 +103,11 @@ package org.goasap.managers {
}
}
}
-
+
/**
* Releases an IManageable from being monitored. Does not call releaseHandling() on instances,
* since this method is called after an instance has already removed itself from the engine.
- *
+ *
* @param handler The IManageable to remove from internal lists.
*/
public function release(handler:IManageable):void
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/managers/Repeater.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/managers/Repeater.as
similarity index 97%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/managers/Repeater.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/managers/Repeater.as
index cb48f7427ea2..9c283a8f8859 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/managers/Repeater.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/managers/Repeater.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2008 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -20,24 +20,24 @@
* THE SOFTWARE.
*/
package org.goasap.managers {
- import org.goasap.PlayableBase;
+ import org.goasap.PlayableBase;
/**
* An iterator that can be used by playable items to track repeat play.
- *
- * This utility is used by SequenceBase to provide a looping option for
+ *
+ * This utility is used by SequenceBase to provide a looping option for
* Sequence and SequenceCA. When creating your own Go utilities you can
* make use of Repeater, which provides a next() iterator and a skipTo helper.
*/
public class Repeater {
-
+
/**
* Makes code more human-readable, like <code>new Repeater(Repeater.INFINITE);</code>
*/
public static const INFINITE: uint = 0;
-
+
/**
- * Number of times the Repeater will iterate, which can be set to
+ * Number of times the Repeater will iterate, which can be set to
* zero or Repeater.INFINITE for indefinite repeating.
*/
public function get cycles() : uint {
@@ -49,34 +49,34 @@ package org.goasap.managers {
}
/**
- * Current cycle starting at 0, which will continue to increase
- * up to <code>cycles</code> or indefinitely if cycles is set to
+ * Current cycle starting at 0, which will continue to increase
+ * up to <code>cycles</code> or indefinitely if cycles is set to
* Repeater.INFINITE (zero).
*/
public function get currentCycle():uint {
return _currentCycle;
}
-
+
/**
* True if cycles is not infinite and currentCycle has reached cycles.
*/
public function get done():Boolean {
return (_currentCycle==_cycles && _cycles!=INFINITE);
}
-
+
/** @private */
protected var _item : PlayableBase;
-
+
/** @private */
protected var _cycles: uint;
-
+
/** @private */
protected var _currentCycle : uint = 0;
-
+
public function Repeater(cycles: uint=1) {
_cycles = cycles;
}
-
+
/**
* @private
* For one-time internal use by parent playable item.
@@ -92,7 +92,7 @@ package org.goasap.managers {
public function setParent(item:PlayableBase):void {
if (!_item) _item = item;
}
-
+
/**
* @private
* For internal use by playable items.
@@ -105,16 +105,16 @@ package org.goasap.managers {
_currentCycle++;
return true;
}
-
+
if (_cycles-_currentCycle>0)
_currentCycle++;
-
+
if (_cycles==_currentCycle)
return false;
return true;
}
-
+
/**
* @private
* For internal use by playable items.
@@ -123,13 +123,13 @@ package org.goasap.managers {
public function hasNext(): Boolean {
return (_cycles==INFINITE || _cycles-_currentCycle>1);
}
-
+
/**
* @private
* For internal use by playable items.
* Skips to a new currentCycle and aids playable items by calculating
* and returning the new play index.
- *
+ *
* @param fullUnit The tween duration or sequence length
* @param amount The skipTo amount requested which will be normalized
* to zero if negative, and if cycles are not set to infinite,
@@ -145,17 +145,17 @@ package org.goasap.managers {
_currentCycle = Math.floor(amount / fullUnit);
return amount%fullUnit;
}
-
+
/**
* @private
* For internal use by playable items.
- *
+ *
* Resets current cycle to zero.
*/
public function reset(): void {
_currentCycle = 0;
}
-
+
/** @private */
protected function unlocked() : Boolean {
return (!_item || (_item && _item.state==PlayableBase.STOPPED));
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/PlayableGroup.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/PlayableGroup.as
similarity index 95%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/PlayableGroup.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/PlayableGroup.as
index 8cbf3bc6c9a6..d5a5fb54af07 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/PlayableGroup.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/PlayableGroup.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2007 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -21,11 +21,11 @@
*/
package org.goasap.utils {
import flash.utils.Dictionary;
-
+
import org.goasap.PlayableBase;
import org.goasap.events.GoEvent;
import org.goasap.interfaces.IPlayable;
- import org.goasap.managers.Repeater;
+ import org.goasap.managers.Repeater;
/**
* Dispatched when the group starts.
@@ -67,26 +67,26 @@ package org.goasap.utils {
/**
* Batch-play a set of items and receive an event when all of them have finished.
- *
+ *
* <p>PlayableGroup accepts any IPlayable for its children, which can include
- * tweens, other groups, sequences and so forth. The group listens for both
- * GoEvent.STOP and GoEvent.COMPLETE events from its children, either of which
+ * tweens, other groups, sequences and so forth. The group listens for both
+ * GoEvent.STOP and GoEvent.COMPLETE events from its children, either of which
* are counted toward group completion.</p>
- *
- * <p>The <code>repeater</code> property of PlayableGroup allows you to loop play
- * any number of times, or indefinitely by setting its cycles to Repeater.INFINITE.
+ *
+ * <p>The <code>repeater</code> property of PlayableGroup allows you to loop play
+ * any number of times, or indefinitely by setting its cycles to Repeater.INFINITE.
* GoEvent.CYCLE is dispatched on each loop and GoEvent.COMPLETE when finished.
* Other events dispatched include the GoEvent types START, STOP, PAUSE, and RESUME.</p>
- *
+ *
* @author Moses Gunesch
*/
public class PlayableGroup extends PlayableBase implements IPlayable {
-
+
// -== Public Properties ==-
-
+
/**
- * Get or set the children array. Only IPlayable items are stored. Note that
- * unlike the methods <code>addChild</code> and <code>removeChild</code>,
+ * Get or set the children array. Only IPlayable items are stored. Note that
+ * unlike the methods <code>addChild</code> and <code>removeChild</code>,
* setting this property will stop any group play currently in progress.
*/
public function get children():Array {
@@ -102,14 +102,14 @@ package org.goasap.utils {
if (item is IPlayable)
addChild(item as IPlayable);
}
-
+
/**
* The groups's Repeater instance, which may be used to make
* it loop and play more than one time.
- *
+ *
* <p>The Repeater's cycles property can be set to an integer, or
- * to Repeater.INFINITE or 0 to repeat indefinitely.</p>
- *
+ * to Repeater.INFINITE or 0 to repeat indefinitely.</p>
+ *
* <pre>
* var group:PlayableGroup = new PlayableGroup(tween1, tween2, tween3);
* group.repeater.cycles = 2;
@@ -120,9 +120,9 @@ package org.goasap.utils {
public function get repeater(): Repeater {
return _repeater;
}
-
+
/**
- * Determines the number of children currently being monitored
+ * Determines the number of children currently being monitored
* for completion by the group.
*/
public function get listenerCount() : uint {
@@ -130,22 +130,22 @@ package org.goasap.utils {
}
// -== Protected Properties ==-
-
+
/** @private */
protected var _children: Dictionary = new Dictionary();
-
+
/** @private */
protected var _listeners: uint = 0;
-
+
/** @private */
protected var _repeater: Repeater;
-
+
// -== Public Methods ==-
-
+
/**
* Constructor.
- *
- * @param items Any number of IPlayable items as separate arguments,
+ *
+ * @param items Any number of IPlayable items as separate arguments,
* or a single array of them.
*/
public function PlayableGroup(...items) {
@@ -155,12 +155,12 @@ package org.goasap.utils {
_repeater = new Repeater();
_repeater.setParent(this);
}
-
+
/**
* Searches for a child with the specified playableID.
- *
+ *
* @param playableID The item playableID to search for.
- * @param deepSearch If child is not found in the group, this option runs a
+ * @param deepSearch If child is not found in the group, this option runs a
* recursive search on any children that are PlayableGroup.
* @return The SequenceStep with the matching playableID.
*/
@@ -178,27 +178,27 @@ package org.goasap.utils {
}
return null;
}
-
+
/**
* Adds a single IPlayable to the children array (duplicates are rejected) and
* syncs up the group and child play-states based on various conditions.
- *
+ *
* <p>If both the group and the item being added are STOPPED, the item is simply
* added to the children list.</p>
- *
- * <p>If both items are PAUSED or PLAYING (including PLAYING_DELAY for children),
- * the child is actively added to the group during play and will be monitored for
+ *
+ * <p>If both items are PAUSED or PLAYING (including PLAYING_DELAY for children),
+ * the child is actively added to the group during play and will be monitored for
* completion along with others.</p>
- *
+ *
* <p>In other cases where the child's state mismatches the group's state, there
* are several behaviors available. Normally if the second parameter <code>adoptChildState</code>
* is left false, the child's mismatched state will be updated to match the group's
- * state. This can result in it being stopped, paused, or started/resumed and monitored
- * for completion along with other children. Passing true for <code>adoptChildState</code>
- * results in updating the group's state to match the child's. This option could be used, for
+ * state. This can result in it being stopped, paused, or started/resumed and monitored
+ * for completion along with other children. Passing true for <code>adoptChildState</code>
+ * results in updating the group's state to match the child's. This option could be used, for
* example, if you wanted to build a group of already-playing items without disrupting their
* play cycle with a start() call to the group.</p>
- *
+ *
* @param item Any instance that implements IPlayable and uses PlayableBase's play-state constants.
* @param adoptChildState Makes this group change its play-state to match the state of the new child.
* @return Success.
@@ -223,7 +223,7 @@ package org.goasap.utils {
secondary.start();
secondary.pause();
break;
- case PLAYING:
+ case PLAYING:
case PLAYING_DELAY:
if (secondary.state==PAUSED)
secondary.resume();
@@ -231,7 +231,7 @@ package org.goasap.utils {
if (adoptChildState) {
_state = PLAYING; // Group adopts child playing state
dispatchEvent(new GoEvent( GoEvent.START));
- }
+ }
else {
secondary.start();
}
@@ -246,14 +246,14 @@ package org.goasap.utils {
listenTo(item);
return true;
}
-
+
/**
* Removes a single IPlayable from the children array.
- *
+ *
* <p>Note that if play is in progress when a child is added it does not
* interrupt play and the child is monitored for completion along with
* others.</p>
- *
+ *
* @param item Any instance that implements IPlayable and uses PlayableBase's play-state constants.
* @return Success.
*/
@@ -266,11 +266,11 @@ package org.goasap.utils {
delete _children[ item ];
return true;
}
-
+
/**
- * Test whether any child has a particular play state, based on
+ * Test whether any child has a particular play state, based on
* the int constants in the PlayableBase class.
- *
+ *
* <pre>
* // Example: resume a paused group
* if ( myGroup.anyChildHasState(PlayableBase.PAUSED) ) {
@@ -284,15 +284,15 @@ package org.goasap.utils {
return true;
return false;
}
-
+
// -== IPlayable implementation ==-
-
+
/**
- * Calls start on all children.
- *
- * <p>If the group is active when this method is called, a <code>stop</code> call
+ * Calls start on all children.
+ *
+ * <p>If the group is active when this method is called, a <code>stop</code> call
* is automated which will result in a GoEVent.STOP event being dispatched.</p>
- *
+ *
* @return Returns true if any child in the group starts successfully.
*/
public function start() : Boolean {
@@ -312,9 +312,9 @@ package org.goasap.utils {
}
/**
- * If the group is active, this method stops all child items and
+ * If the group is active, this method stops all child items and
* dispatches a GoEvent.STOP event.
- *
+ *
* @return Returns true only if all children in the group stop successfully.
*/
public function stop() : Boolean {
@@ -335,10 +335,10 @@ package org.goasap.utils {
dispatchEvent(new GoEvent( GoEvent.STOP ));
return r;
}
-
+
/**
* Calls <code>pause</code> on all children.
- *
+ *
* @return Returns true only if all playing children in the group paused successfully
* and at least one child was paused.
*/
@@ -359,10 +359,10 @@ package org.goasap.utils {
}
return (n>0 && r);
}
-
+
/**
* Calls <code>resume</code> on all children.
- *
+ *
* @return Returns true only if all paused children in the group resumed successfully
* and at least one child was resumed.
*/
@@ -383,10 +383,10 @@ package org.goasap.utils {
}
return (n>0 && r);
}
-
+
/**
* Calls <code>skipTo</code> on all children.
- *
+ *
* @return Returns true only if all children in the group skipTo the position successfully
* and at least one child was affected.
*/
@@ -402,13 +402,13 @@ package org.goasap.utils {
_state = (r ? PLAYING : STOPPED);
return (n>0 && r);
}
-
+
// -== Protected Methods ==-
-
+
/**
* @private
* Internal handler for item completion.
- * @param event GoEvent dispatched by child item.
+ * @param event GoEvent dispatched by child item.
*/
protected function onItemEnd(event:GoEvent) : void {
unListenTo(event.target as IPlayable);
@@ -416,7 +416,7 @@ package org.goasap.utils {
complete();
}
}
-
+
/**
* @private
* Internal handler for group completion.
@@ -448,7 +448,7 @@ package org.goasap.utils {
_listeners++;
}
}
-
+
/**
* @private
* Internal. Stop listening for item completion.
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/Sequence.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/Sequence.as
similarity index 94%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/Sequence.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/Sequence.as
index 54d86f4de023..762f88f77240 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/Sequence.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/Sequence.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2007 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -20,28 +20,28 @@
* THE SOFTWARE.
*/
package org.goasap.utils {
- import org.goasap.interfaces.IPlayable;
+ import org.goasap.interfaces.IPlayable;
/**
* Simple playable sequence, composed of groups of playable items.
- *
+ *
* <p>A sequence can be built by passing any item that implements IPlayable
* and uses the standard set of PlayableBase play-state constants.
- * Sequences are composed of SequenceStep instances, which can contain any
+ * Sequences are composed of SequenceStep instances, which can contain any
* number of child items such as LinearGo or PlayableGroup instances.
* Sequences dispatch SequenceEvent.ADVANCE each time a step completes and
* the play index advances to the next one, then GoEvent.COMPLETE when done.</p>
- *
+ *
* <p>Other events dispatched include the GoEvent types START, STOP, PAUSE, RESUME,
* and CYCLE if the repeater.cycles property is set to a value other than one.</p>
- *
+ *
* <p>All items in each step must dispatch COMPLETE or STOP before a Sequence
* will advance. This simple behavior can be limiting, especially with steps that
- * are composed of groups of items. The Go utility package includes another
- * sequencer called SequenceCA, which allows you to define different ways a sequence
- * can advance: after a particular item in a step, a particular duration, after
+ * are composed of groups of items. The Go utility package includes another
+ * sequencer called SequenceCA, which allows you to define different ways a sequence
+ * can advance: after a particular item in a step, a particular duration, after
* an event fires, etc.</p>
- *
+ *
* @see SequenceBase
* @see SequenceCA
* @author Moses Gunesch
@@ -49,7 +49,7 @@ package org.goasap.utils {
public class Sequence extends SequenceBase {
// -== Public Properties ==-
-
+
// Also in super:
// length : uint [Read-only.]
// playIndex : int [Read-only.]
@@ -59,7 +59,7 @@ package org.goasap.utils {
// pause() : Boolean
// resume() : Boolean
// skipTo(index:Number) : Boolean
-
+
/**
* Returns the currently-playing SequenceStep.
* @return The currently-playing SequenceStep.
@@ -71,7 +71,7 @@ package org.goasap.utils {
public function get currentStep() : SequenceStep {
return (super._getCurrentStep());
}
-
+
/**
* Returns the final SequenceStep in the current sequence.
* @return The final SequenceStep in the current sequence.
@@ -83,19 +83,19 @@ package org.goasap.utils {
public function get lastStep() : SequenceStep {
return (super._getLastStep());
}
-
+
// -== Public Methods ==-
-
+
/**
* Constructor.
- *
+ *
* @param items Any number of IPlayable instances (e.g. LinearGo, PlayableGroup,
* SequenceStep) as separate arguments, or a single array of them.
*/
public function Sequence(...items) {
super((items[ 0 ] is Array) ? items[ 0 ] : items);
}
-
+
/**
* Retrieves any SequenceStep from the steps array.
* @param index An array index starting at 0.
@@ -107,11 +107,11 @@ package org.goasap.utils {
public function getStepAt(index:int) : SequenceStep {
return (super._getStepAt(index) as SequenceStep);
}
-
+
/**
* Locates a step with the specified playableID. To search within a step for a
* child by playableID, use the step instance's <code>getChildByID</code> method.
- *
+ *
* @param playableID The step instance's playableID to search for.
* @return The SequenceStep with the matching playableID.
* @see #getStepAt()
@@ -119,42 +119,42 @@ package org.goasap.utils {
public function getStepByID(playableID:*) : SequenceStep {
return (super._getStepByID(playableID) as SequenceStep);
}
-
+
/**
- * Adds a single IPlayable instance (e.g. LinearGo, PlayableGroup, SequenceStep)
- * to the end of the steps array, or optionally adds the instance into the last
+ * Adds a single IPlayable instance (e.g. LinearGo, PlayableGroup, SequenceStep)
+ * to the end of the steps array, or optionally adds the instance into the last
* SequenceStep instead of adding it as a new step.
- *
+ *
* <p>To remove a step use the <code>removeStepAt</code> method.</p>
- *
+ *
* @param item The playable item to add to the sequence. Note
* that when new steps are added, any IPlayable
- * instance of a type other than SequenceStep is
+ * instance of a type other than SequenceStep is
* automatically wrapped in a new SequenceStep.
- *
+ *
* @param addToLastStep If true is passed the item is added to the last
* existing SequenceStep in the steps array. This
* option should be used with individual items that
* you want added as children to the SequenceStep.
* If there are no steps yet this option ignored and
* a new step is created.
- *
+ *
* @return New length of the steps array.
*/
public function addStep(item:IPlayable, addToLastStep:Boolean=false): int {
return (super._addStep(item, addToLastStep, SequenceStep));
}
-
+
/**
- * Adds a single IPlayable instance (e.g. LinearGo, PlayableGroup,
- * SequenceStep) at a specific index in the steps array. Calling this method
+ * Adds a single IPlayable instance (e.g. LinearGo, PlayableGroup,
+ * SequenceStep) at a specific index in the steps array. Calling this method
* stops any sequence play currently in progress.
- *
+ *
* @param item The playable item to splice into the sequence.
- *
- * @param index Position in the array starting at 0, or a negative
+ *
+ * @param index Position in the array starting at 0, or a negative
* index like Array.splice.
- *
+ *
* @return New length of the steps array.
*/
public function addStepAt(item:IPlayable, index:int): int {
@@ -162,18 +162,18 @@ package org.goasap.utils {
}
/**
- * Removes and returns the SequenceStep at a specific index from the steps
+ * Removes and returns the SequenceStep at a specific index from the steps
* array. Calling this method stops any sequence play currently in progress.
- *
- * @param index Position in the array starting at 0, or a negative
+ *
+ * @param index Position in the array starting at 0, or a negative
* index like Array.splice.
- *
+ *
* @return The SequenceStep instance removed from the steps array.
*/
public function removeStepAt(index:int): SequenceStep {
return (super._removeStepAt(index) as SequenceStep);
}
-
+
// Also in super:
// length : uint [Read-only.]
// playIndex : int [Read-only.]
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/SequenceBase.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/SequenceBase.as
similarity index 95%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/SequenceBase.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/SequenceBase.as
index edf3623d4259..06cb2b44bf1d 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/SequenceBase.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/SequenceBase.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2007 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -22,13 +22,13 @@
package org.goasap.utils {
import flash.events.Event;
import flash.utils.getQualifiedClassName;
-
+
import org.goasap.PlayableBase;
import org.goasap.errors.InstanceNotAllowedError;
import org.goasap.events.GoEvent;
import org.goasap.events.SequenceEvent;
import org.goasap.interfaces.IPlayable;
- import org.goasap.managers.Repeater;
+ import org.goasap.managers.Repeater;
/**
* Dispatched when the sequence starts.
@@ -77,29 +77,29 @@ package org.goasap.utils {
/**
* This base class should not be used directly, use it to build sequencing classes.
- *
+ *
* <p>When subclassing, follow the instructions in the comments of the protected
* methods to add a standard set of public getters and methods that work with the
* specific datatype of your SequenceStep subclass, if you create one. (This system
* is designed to work around the restrictiveness of overrides in AS3 which don't
* allow you to redefine datatypes.) See Sequence and SequenceCA for examples.</p>
- *
+ *
* @see Sequence
* @see SequenceCA
- *
+ *
* @author Moses Gunesch
*/
public class SequenceBase extends PlayableBase implements IPlayable {
-
+
// -== Public Properties ==-
-
+
/**
* The number of steps in the sequence.
*/
public function get length(): int {
return (_steps ? _steps.length : 0);
}
-
+
/**
* The current play index of the sequence, starting a 0.
*/
@@ -108,13 +108,13 @@ package org.goasap.utils {
}
/**
- * Get or set the list of SequenceStep instances that defines the sequence.
- *
+ * Get or set the list of SequenceStep instances that defines the sequence.
+ *
* <p>
- * When setting this property, each item must implement IPlayable that uses
- * PlayableBase play-state constants and dispatches STOP or COMPLETE when finished.
- * Each item is automatically wrapped in a SequenceStep if it is of any other IPlayable
- * type, such as a GoItem or PlayableGroup. Setting this property stops any sequence
+ * When setting this property, each item must implement IPlayable that uses
+ * PlayableBase play-state constants and dispatches STOP or COMPLETE when finished.
+ * Each item is automatically wrapped in a SequenceStep if it is of any other IPlayable
+ * type, such as a GoItem or PlayableGroup. Setting this property stops any sequence
* play currently in progress.
* </p>
* @see #_getStepAt()
@@ -128,55 +128,55 @@ package org.goasap.utils {
public function set steps(a:Array):void {
if (_state!=STOPPED)
stop();
-
+
while (_steps.length > 0)
_removeStepAt(_steps.length-1);
-
+
for each (var item:Object in a)
if (item is IPlayable)
_addStep(item as IPlayable);
}
-
+
/**
* The sequence's Repeater instance, which may be used to make
* the sequence loop and play more than one time.
- *
+ *
* <p>The Repeater's cycles property can be set to an integer, or
- * to Repeater.INFINITE or 0 to repeat indefinitely.</p>
- *
+ * to Repeater.INFINITE or 0 to repeat indefinitely.</p>
+ *
* <pre>var seq:Sequence = new Sequence(tween1, tween2, tween3);
* seq.repeater.cycles = 2;
* seq.start();
* trace(seq.repeater.currentCycle); // output: 0
- *
+ *
* seq.skipTo(4); // moves to 2nd action in 2nd cycle
* trace(seq.repeater.currentCycle); // output: 1</pre>
- *
- * <p>(The repeater property replaces the repeatCount and currentCount
+ *
+ * <p>(The repeater property replaces the repeatCount and currentCount
* parameters in earlier releases of SequenceBase).</p>
*/
public function get repeater(): Repeater {
return _repeater;
}
-
-
+
+
// -== Protected Properties ==-
-
+
/** @private */
protected var _index: int = 0;
-
+
/** @private */
protected var _steps: Array;
-
+
/** @private */
protected var _repeater: Repeater;
-
-
+
+
// -== Public Methods ==-
-
+
/**
* Constructor.
- *
+ *
* @param items Any number of IPlayable instances (e.g. LinearGo, PlayableGroup,
* SequenceStep) as separate arguments, or a single array of them.
*/
@@ -193,15 +193,15 @@ package org.goasap.utils {
_repeater = new Repeater();
_repeater.setParent(this);
}
-
+
// -== IPlayable implementation ==-
-
+
/**
* Begins a sequence.
- *
- * <p>If the group is active when this method is called, a <code>stop</code> call
+ *
+ * <p>If the group is active when this method is called, a <code>stop</code> call
* is automated which will result in a GoEvent.STOP event being dispatched.</p>
- *
+ *
* @return Returns true unless there are no steps in the sequence.
*/
public function start() : Boolean {
@@ -217,7 +217,7 @@ package org.goasap.utils {
/**
* Stops all activity and dispatches a GoEvent.STOP event.
- *
+ *
* @return Returns true unless sequence was already stopped.
*/
public function stop() : Boolean {
@@ -230,15 +230,15 @@ package org.goasap.utils {
dispatchEvent(new GoEvent( GoEvent.STOP ));
else
dispatchEvent(new GoEvent( GoEvent.COMPLETE ));
- _index = 0;
+ _index = 0;
_repeater.reset();
delete _playRetainer[ this ]; // Developers - Important! Look up _playRetainer.
return true;
}
-
+
/**
* Pauses sequence play.
- *
+ *
* @return Returns true unless sequence was unable to pause any children.
*/
public function pause() : Boolean {
@@ -253,10 +253,10 @@ package org.goasap.utils {
dispatchEvent(new GoEvent( GoEvent.PAUSE ));
return true;
}
-
+
/**
* Resumes previously-paused sequence play.
- *
+ *
* @return Returns true unless sequence was unable to resume any children.
*/
public function resume() : Boolean {
@@ -267,10 +267,10 @@ package org.goasap.utils {
dispatchEvent(new GoEvent( GoEvent.RESUME));
return true;
}
-
+
/**
* Stops the current step and skips to another step by sequence index.
- *
+ *
* @return Always returns true since the index is normalized to the sequence.
*/
public function skipTo(index : Number) : Boolean {
@@ -286,22 +286,22 @@ package org.goasap.utils {
}
return true;
}
-
+
// -== Add hooks for these methods to your subclass like Sequence & SequenceCA ==-
// These methods are broken out to allow subclasses to use exact typing for their SequenceStep class.
-
+
/**
* Developers: Add a getter called <code>currentStep</code> to your subclass as in Sequence.
- *
+ *
* @return Developers: return the correct SequenceStep type for your subclass in your corresponding public method.
*/
protected function _getCurrentStep() : * {
return (_steps.length==0 ? null : _steps[_index]);
}
-
+
/**
* Developers: Add a getter called <code>lastStep</code> to your subclass as in Sequence.
- *
+ *
* @return Developers: return the correct SequenceStep type for your subclass in your corresponding public method.
*/
protected function _getLastStep() : * {
@@ -309,7 +309,7 @@ package org.goasap.utils {
}
/**
* Developers: Add a method called <code>getStepAt</code> to your subclass as in Sequence.
- *
+ *
* @param index An array index starting at 0.
* @return Developers: return the correct SequenceStep type for your subclass in your corresponding public method.
*/
@@ -318,10 +318,10 @@ package org.goasap.utils {
return null;
return (_steps[index] as SequenceStep);
}
-
+
/**
* Developers: Add a method called <code>getStepByID</code> to your subclass as in Sequence.
- *
+ *
* @param playableID The step instance's playableID to search for.
* @return Developers: return the correct SequenceStep type for your subclass in your corresponding public method.
*/
@@ -331,24 +331,24 @@ package org.goasap.utils {
return step;
return null;
}
-
+
/**
* Developers: Add a method called <code>addStep</code> to your subclass as in Sequence.
- *
+ *
* <p>Drop the third parameter in your subclass' addStep method. Use it to be sure
- * the correct type of wrapper is created, as in SequenceCA.</p>
- *
+ * the correct type of wrapper is created, as in SequenceCA.</p>
+ *
* @param item The playable item to add to the sequence.
- *
+ *
* @param addToLastStep If true is passed the item is added to the last
* existing SequenceStep in the steps array. This
* option should be used with individual items that
* you want added as children to the SequenceStep.
* If there are no steps yet this option ignored and
* a new step is created.
- *
+ *
* @param stepTypeAsClass Type for SequenceSteps. (Do not include this parameter in subclass addStep method.)
- *
+ *
* @return New length of the steps array.
*/
protected function _addStep(item:IPlayable, addToLastStep:Boolean=false, stepTypeAsClass:*=null): int {
@@ -363,21 +363,21 @@ package org.goasap.utils {
step.addChild(item);
return _addStepAt(_steps.length, step, stepTypeAsClass); // adds listeners
}
-
+
/**
* Developers: Add a method called <code>addStep</code> to your subclass as in Sequence.
- *
+ *
* <p>Drop the third parameter in your subclass' addStep method. Use it to be sure
- * the correct type of wrapper is created, as in SequenceCA.</p>
- *
-
- * @param index Position in the array starting at 0, or a negative
+ * the correct type of wrapper is created, as in SequenceCA.</p>
+ *
+
+ * @param index Position in the array starting at 0, or a negative
* index like Array.splice.
- *
+ *
* @param item The playable item to splice into the sequence.
- *
+ *
* @param stepTypeAsClass Type for SequenceSteps. (Do not include this parameter in subclass addStep method.)
- *
+ *
* @return New length of the steps array.
*/
protected function _addStepAt(index:int, item:IPlayable, stepTypeAsClass:*=null): int {
@@ -396,10 +396,10 @@ package org.goasap.utils {
/**
* Developers: Add a method called <code>addStep</code> to your subclass as in Sequence.
- *
- * @param index Position in the array starting at 0, or a negative
+ *
+ * @param index Position in the array starting at 0, or a negative
* index like Array.splice.
- *
+ *
* @return Developers: return the correct SequenceStep type for your subclass in your corresponding public method.
*/
protected function _removeStepAt(index:int) : * {
@@ -410,26 +410,26 @@ package org.goasap.utils {
step.removeEventListener(GoEvent.STOP, onStepEvent);
return step;
}
-
+
// -== Protected Methods ==-
-
+
/**
* @private
* Internal handler for step advance.
- *
- * @param event SequenceEvent dispatched by child item.
+ *
+ * @param event SequenceEvent dispatched by child item.
*/
protected function onStepEvent(event : Event) : void {
// A stop() call to the sequence results in step dispatching STOP, which would recurse here.
if (_state==STOPPED || event.target!=_steps[_index])
return;
-
+
// Only occurs if the SequenceItem is manually stopped outside of this manager.
if (event.type==GoEvent.STOP) {
stop();
return;
}
-
+
// Normal step advance
if (event.type==SequenceEvent.ADVANCE) {
if (_steps.length-_index == 1) {
@@ -440,7 +440,7 @@ package org.goasap.utils {
}
}
}
-
+
/**
* @private
* Internal handler for group completion.
@@ -452,7 +452,7 @@ package org.goasap.utils {
}
dispatchEvent(new SequenceEvent( SequenceEvent.ADVANCE ));
}
-
+
/**
* @private
* Internal handler for group completion.
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/SequenceCA.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/SequenceCA.as
similarity index 94%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/SequenceCA.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/SequenceCA.as
index cccfadcce48e..151b23e51198 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/SequenceCA.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/SequenceCA.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2007 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -21,28 +21,28 @@
*/
package org.goasap.utils {
import flash.events.Event;
-
+
import org.goasap.events.GoEvent;
import org.goasap.events.SequenceEvent;
- import org.goasap.interfaces.IPlayable;
-
+ import org.goasap.interfaces.IPlayable;
+
/**
* Sequence with "Custom Advance" options, in which steps can specify when they should advance.
- *
+ *
* <p>This class works like Sequence but uses the special class SequenceStepCA for its steps.
- * SequenceStepCA has a property called <code>advance</code>. When steps advance before animation
+ * SequenceStepCA has a property called <code>advance</code>. When steps advance before animation
* finishes, the trailing steps are tracked so that the SequenceCA doesn't dispatch its COMPLETE
* event until all activity has completed.</p>
- *
+ *
* <p>Any step's advance property can be set to an instance of OnDurationComplete, OnPlayableComplete,
* OnEventComplete or OnConditionTrue. Each of those classes defines its own parameters and rules for
- * when the advance occurs. For example, using OnPlayableComplete a sequence can advance after one
+ * when the advance occurs. For example, using OnPlayableComplete a sequence can advance after one
* particular item in the step finishes, without needing to wait for all the other ones in that group
* to complete.</p>
- *
- * <p>Additionally, you can create your own custom advance types by subclassing the SequenceAdvance
+ *
+ * <p>Additionally, you can create your own custom advance types by subclassing the SequenceAdvance
* base class.</p>
- *
+ *
* @see SequenceStepCA
* @see org.goasap.utils.customadvance.OnConditionTrue OnConditionTrue
* @see org.goasap.utils.customadvance.OnDurationComplete OnDurationComplete
@@ -51,13 +51,13 @@ package org.goasap.utils {
* @see org.goasap.utils.customadvance.SequenceAdvance SequenceAdvance
* @see Sequence
* @see SequenceBase
- *
+ *
* @author Moses Gunesch
*/
public class SequenceCA extends SequenceBase {
-
+
// -== Public Properties ==-
-
+
// Also in super:
// length : uint [Read-only.]
// playIndex : int [Read-only.]
@@ -67,7 +67,7 @@ package org.goasap.utils {
// pause() : Boolean
// resume() : Boolean
// skipTo(index:Number) : Boolean
-
+
/**
* Returns the currently-playing SequenceStepCA.
* @return The currently-playing SequenceStepCA.
@@ -79,7 +79,7 @@ package org.goasap.utils {
public function get currentStep() : SequenceStepCA {
return (super._getCurrentStep());
}
-
+
/**
* Returns the final SequenceStepCA in the current sequence.
* @return The final SequenceStepCA in the current sequence.
@@ -91,26 +91,26 @@ package org.goasap.utils {
public function get lastStep() : SequenceStepCA {
return (super._getLastStep());
}
-
+
// -== Protected Properties ==-
-
+
/**
* @private
*/
protected var _trailingSteps : SequenceStep;
-
+
// -== Public Methods ==-
-
+
/**
* Constructor.
- *
+ *
* @param items Any number of IPlayable instances (e.g. LinearGo, PlayableGroup,
* SequenceStepCA) as separate arguments, or a single array of them.
*/
public function SequenceCA(...items) {
super((items[ 0 ] is Array) ? items[ 0 ] : items);
}
-
+
/**
* Retrieves any SequenceStepCA from the steps array.
* @param index An array index starting at 0.
@@ -120,53 +120,53 @@ package org.goasap.utils {
public function getStepAt(index:int) : SequenceStepCA {
return (super._getStepAt(index) as SequenceStepCA);
}
-
+
/**
* Locates a step with the specified playableID. To search within a step for a
* child by playableID, use the step instance's <code>getChildByID</code> method.
- *
+ *
* @param playableID The step instance's playableID to search for.
* @return The SequenceStepCA with the matching playableID.
*/
public function getStepByID(playableID:*) : SequenceStepCA {
return (super._getStepByID(playableID) as SequenceStepCA);
}
-
+
/**
- * Adds a single IPlayable instance (e.g. LinearGo, PlayableGroup, SequenceStepCA)
- * to the end of the steps array, or optionally adds the instance into the last
+ * Adds a single IPlayable instance (e.g. LinearGo, PlayableGroup, SequenceStepCA)
+ * to the end of the steps array, or optionally adds the instance into the last
* SequenceStepCA instead of adding it as a new step.
- *
+ *
* <p>To remove a step use the <code>removeStepAt</code> method.</p>
- *
+ *
* @param item The playable item to add to the sequence. Note
* that when new steps are added, any IPlayable
- * instance of a type other than SequenceStepCA is
+ * instance of a type other than SequenceStepCA is
* automatically wrapped in a new SequenceStepCA.
- *
+ *
* @param addToLastStep If true is passed the item is added to the last
* existing SequenceStepCA in the steps array. This
* option should be used with individual items that
* you want added as children to the SequenceStepCA.
* If there are no steps yet this option ignored and
* a new step is created.
- *
+ *
* @return New length of the steps array.
*/
public function addStep(item:IPlayable, addToLastStep:Boolean=false): int {
return (super._addStep(item, addToLastStep, SequenceStepCA));
}
-
+
/**
- * Adds a single IPlayable instance (e.g. LinearGo, PlayableGroup, SequenceStepCA)
- * at a specific index in the steps array. Calling this method stops any sequence
+ * Adds a single IPlayable instance (e.g. LinearGo, PlayableGroup, SequenceStepCA)
+ * at a specific index in the steps array. Calling this method stops any sequence
* play currently in progress.
- *
+ *
* @param item The playable item to splice into the sequence.
- *
- * @param index Position in the array starting at 0, or a negative
+ *
+ * @param index Position in the array starting at 0, or a negative
* index like Array.splice.
- *
+ *
* @return New length of the steps array.
*/
public function addStepAt(item:IPlayable, index:int): int {
@@ -174,35 +174,35 @@ package org.goasap.utils {
}
/**
- * Removes and returns the SequenceStepCA at a specific index from the steps
+ * Removes and returns the SequenceStepCA at a specific index from the steps
* array. Calling this method stops any sequence play currently in progress.
- *
- * @param index Position in the array starting at 0, or a negative
+ *
+ * @param index Position in the array starting at 0, or a negative
* index like Array.splice.
- *
+ *
* @return The SequenceStepCA instance removed from the steps array.
*/
public function removeStepAt(index:int): SequenceStepCA {
return (super._removeStepAt(index) as SequenceStepCA);
}
-
+
// -== IPlayable implementation ==-
/**
* Begins a sequence.
- *
- * <p>If the group is active when this method is called, a <code>stop</code> call
+ *
+ * <p>If the group is active when this method is called, a <code>stop</code> call
* is automated which will result in a GoEvent.STOP event being dispatched.</p>
- *
+ *
* @return Returns true unless there are no steps in the sequence.
*/
override public function start() : Boolean {
return super.start();
}
-
+
/**
* Stops all activity and dispatches a GoEvent.STOP event.
- *
+ *
* @return Returns true unless sequence was already stopped.
*/
override public function stop() : Boolean {
@@ -211,10 +211,10 @@ package org.goasap.utils {
initTrailingSteps(false);
return true;
}
-
+
/**
* Pauses sequence play.
- *
+ *
* @return Returns true unless sequence was unable to pause any children.
*/
override public function pause() : Boolean {
@@ -228,10 +228,10 @@ package org.goasap.utils {
}
return success;
}
-
+
/**
* Resumes previously-paused sequence play.
- *
+ *
* @return Returns true unless sequence was unable to resume any children.
*/
override public function resume() : Boolean {
@@ -245,23 +245,23 @@ package org.goasap.utils {
}
return success;
}
-
+
/**
* Stops current activity and skips to another step by sequence index.
- *
+ *
* @return Always returns true since the index is normalized to the sequence.
*/
override public function skipTo(index : Number) : Boolean {
initTrailingSteps(false);
return super.skipTo(index);
}
-
+
// -== Protected Methods ==-
-
+
/**
* @private
* Internal handler for item completion.
- * @param event SequenceEvent dispatched by child item.
+ * @param event SequenceEvent dispatched by child item.
*/
override protected function onStepEvent(event : Event) : void {
// A stop() call to the sequence results in step dispatching STOP, which would recurse here.
@@ -283,8 +283,8 @@ package org.goasap.utils {
}
return;
}
-
- // Finishes special case in trailing item block. Also, returns out if we're waiting
+
+ // Finishes special case in trailing item block. Also, returns out if we're waiting
if (lastStep.hasEventListener(GoEvent.COMPLETE)) {
if (event.type==GoEvent.COMPLETE) {
initTrailingSteps(false); // _trailingSteps is null, this is to remove the COMPLETE listener.
@@ -292,10 +292,10 @@ package org.goasap.utils {
}
return;
}
-
+
super.onStepEvent(event);
}
-
+
/**
* @private
* Internal handler for step advance.
@@ -308,7 +308,7 @@ package org.goasap.utils {
}
super.advance();
}
-
+
/**
* @private
* Internal handler for group completion.
@@ -318,7 +318,7 @@ package org.goasap.utils {
super.complete();
}
}
-
+
/**
* @private
* Internal setup for tracking items that are continuing to run after a custom advance.
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/SequenceStep.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/SequenceStep.as
similarity index 97%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/SequenceStep.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/SequenceStep.as
index c277dd053909..5cb62852f41e 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/SequenceStep.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/SequenceStep.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2007 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,17 +23,17 @@ package org.goasap.utils {
import org.goasap.events.SequenceEvent;
/**
- * A PlayableGroup wrapper for playable items in a sequence step. Dispatches
+ * A PlayableGroup wrapper for playable items in a sequence step. Dispatches
* SequenceEvent.ADVANCE when all items have dispatched either STOP or COMPLETE.
- *
+ *
* @see Sequence
* @see SequenceCA
* @see SequenceStepCA
- *
+ *
* @author Moses Gunesch
*/
public class SequenceStep extends PlayableGroup {
-
+
/**
* Constructor. See PlayableGroup
* @see PlayableGroup
@@ -41,7 +41,7 @@ package org.goasap.utils {
public function SequenceStep(...items) : void {
super((items[ 0 ] is Array) ? items[ 0 ] : items);
}
-
+
/**
* @private
* Internal handler for group completion, overridden to dispatch ADVANCE
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/SequenceStepCA.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/SequenceStepCA.as
similarity index 96%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/SequenceStepCA.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/SequenceStepCA.as
index 138fd02d8d1d..b995ae8f7bde 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/SequenceStepCA.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/SequenceStepCA.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2007 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,27 +23,27 @@ package org.goasap.utils {
import org.goasap.events.SequenceEvent;
import org.goasap.interfaces.IPlayable;
import org.goasap.utils.customadvance.OnPlayableComplete;
- import org.goasap.utils.customadvance.SequenceAdvance;
-
+ import org.goasap.utils.customadvance.SequenceAdvance;
+
/**
- * Step class used with SequenceCA that adds custom sequence-advance options
+ * Step class used with SequenceCA that adds custom sequence-advance options
* so steps can determine when they advance, such as after a duration or after
* one item in the step completes.
- *
- * <p>The property <code>advance</code> can be set to an instance of any subclass
- * of SequenceEvent, so that the ADVANCE event is sent when something specific
+ *
+ * <p>The property <code>advance</code> can be set to an instance of any subclass
+ * of SequenceEvent, so that the ADVANCE event is sent when something specific
* occurs other than group completion. (This feature adds a great deal of flexibility
* to sequences by enabling them to overlap their actions, instead of being forced
* to wait for all child activity in an action to finish before proceeding.)</p>
- *
+ *
* <p>Various advance types can be found in the <i>util.customadvance</i> package, and
* you are welcome to add your own by extending the base class SequenceAdvance.</p>
- *
+ *
* <ul>
* <li>OnPlayableComplete: ADVANCE occurs after a specific child completes.</li>
* <li>OnDurationComplete: ADVANCE occurs when a number of seconds has passed.</li>
- * <li>OnEventComplete: ADVANCE occurs when any event-type is fired from any
- * dispatcher object, for example a LoaderInfo's COMPLETE event. You can optionally
+ * <li>OnEventComplete: ADVANCE occurs when any event-type is fired from any
+ * dispatcher object, for example a LoaderInfo's COMPLETE event. You can optionally
* set a custom handler to filter the event and return true when ready to advance.</li>
* <li>OnConditionTrue: ADVANCE occurs when a callback, executed on a loop, returns
* true.</li>
@@ -53,30 +53,30 @@ package org.goasap.utils {
* the group will maintain the state PLAYING until it completes, regardless
* of whether ADVANCE is dispatched during play. It will also maintain that state
* after it completes until ADVANCE is dispatched, if that occurs after all children
- * are done playing. (Be careful, custom advance types continue running indefinitely
+ * are done playing. (Be careful, custom advance types continue running indefinitely
* if their conditions are never met, so track them closely.)</p>
- *
+ *
* @see SequenceCA
* @see org.goasap.utils.customadvance.OnConditionTrue OnConditionTrue
* @see org.goasap.utils.customadvance.OnDurationComplete OnDurationComplete
* @see org.goasap.utils.customadvance.OnEventComplete OnEventComplete
* @see org.goasap.utils.customadvance.OnPlayableComplete OnPlayableComplete
* @see org.goasap.utils.customadvance.SequenceAdvance SequenceAdvance
- *
+ *
* @author Moses Gunesch
*/
public class SequenceStepCA extends SequenceStep {
-
+
// -== Public Properties ==-
-
+
/**
- * The advance property determines a custom advance behavior for the step
+ * The advance property determines a custom advance behavior for the step
* and must be set prior to <code>start</code>.
- *
- * <p>The advance should be an instance of any subclass of the base class
- * SequenceAdvance (SequenceAdvance cannot be used directly) and must
+ *
+ * <p>The advance should be an instance of any subclass of the base class
+ * SequenceAdvance (SequenceAdvance cannot be used directly) and must
* dispatch SequenceEvent.ADVANCE.</p>
- *
+ *
* @see org.goasap.utils.customadvance.OnConditionTrue OnConditionTrue
* @see org.goasap.utils.customadvance.OnDurationComplete OnDurationComplete
* @see org.goasap.utils.customadvance.OnEventComplete OnEventComplete
@@ -96,14 +96,14 @@ package org.goasap.utils {
_advance.removeEventListener(SequenceEvent.ADVANCE, dispatchAdvance);
_advance = advance;
}
-
+
/**
* Verifies that this SequenceStep has not advanced yet.
*/
public function get willAdvance() : Boolean {
return !_hasAdvanced;
}
-
+
override public function addChild(item:IPlayable, adoptChildState:Boolean=false): Boolean {
if (adoptChildState && (item.state==PLAYING || item.state==PLAYING_DELAY)) {
_state = PLAYING;
@@ -114,9 +114,9 @@ package org.goasap.utils {
}
return super.addChild(item, adoptChildState);
}
-
+
// -== Protected Properties ==-
-
+
/**
* @private
*/
@@ -131,7 +131,7 @@ package org.goasap.utils {
protected var _hasAdvanced : Boolean = false;
// -== Public Methods ==-
-
+
/**
* Constructor. See PlayableGroup
* @see PlayableGroup
@@ -139,7 +139,7 @@ package org.goasap.utils {
public function SequenceStepCA(...items) : void {
super((items[ 0 ] is Array) ? items[ 0 ] : items);
}
-
+
/**
* See PlayableGroup
* @see PlayableGroup#start
@@ -151,13 +151,13 @@ package org.goasap.utils {
_hasAdvanced = false;
if (advance is OnPlayableComplete) // use getter here to force creation of default instance
_isSelf = ((_advance as OnPlayableComplete).item==this);
- if (!_isSelf) { // Otherwise, the _advance instance is a dummy, completion is handled internally in this class.
+ if (!_isSelf) { // Otherwise, the _advance instance is a dummy, completion is handled internally in this class.
_advance.addEventListener(SequenceEvent.ADVANCE, dispatchAdvance);
_advance.start();
}
return true;
}
-
+
/**
* See PlayableGroup
* @see PlayableGroup#stop
@@ -173,7 +173,7 @@ package org.goasap.utils {
_hasAdvanced = false;
return true;
}
-
+
/**
* See PlayableGroup
* @see PlayableGroup#pause
@@ -188,7 +188,7 @@ package org.goasap.utils {
}
return r;
}
-
+
/**
* See PlayableGroup
* @see PlayableGroup#resume
@@ -203,7 +203,7 @@ package org.goasap.utils {
}
return r;
}
-
+
/**
* See PlayableGroup
* @see PlayableGroup#skipTo
@@ -214,7 +214,7 @@ package org.goasap.utils {
advance.skipTo(position);
return true;
}
-
+
/**
* @private
* Internal relay for SequenceEvent.ADVANCE dispatch.
@@ -230,9 +230,9 @@ package org.goasap.utils {
_advance.removeEventListener(SequenceEvent.ADVANCE, dispatchAdvance);
}
}
-
+
// -== Protected Methods ==-
-
+
/**
* @private
* Internal handler for group completion, overridden to allow item to continue
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/OnConditionTrue.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/OnConditionTrue.as
similarity index 98%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/OnConditionTrue.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/OnConditionTrue.as
index 7aebd89cd303..d2f5de2a741f 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/OnConditionTrue.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/OnConditionTrue.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2007 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -26,15 +26,15 @@ package org.goasap.utils.customadvance {
/**
* A custom advance type that triggers when a callback returns true.
- *
+ *
* @author Moses Gunesch
*/
public class OnConditionTrue extends SequenceAdvance implements IUpdatable {
-
+
// -== Public Properties ==-
-
+
/**
- * The pulse on which to call the callback function. Defaults to
+ * The pulse on which to call the callback function. Defaults to
* GoItem.defaultPulseInterval if not specified.
*/
public function get pulseInterval() : int {
@@ -44,7 +44,7 @@ package org.goasap.utils.customadvance {
}
// -== Protected Properties ==-
-
+
/**
* @private
*/
@@ -55,7 +55,7 @@ package org.goasap.utils.customadvance {
protected var _pulse : Number;
// -== Public Methods ==-
-
+
/**
* @param callbackThatReturnsBoolean Any function that returns a Boolean value
* @param pulseInterval The pulse on which to call the callback function, which defaults to
@@ -66,19 +66,19 @@ package org.goasap.utils.customadvance {
_function = callbackThatReturnsBoolean;
_pulse = pulseInterval;
}
-
+
override public function start() : Boolean {
GoEngine.addItem(this);
_state = PLAYING;
return true;
}
-
+
override public function stop() : Boolean {
GoEngine.removeItem(this);
_state = STOPPED;
return true;
}
-
+
override public function pause() : Boolean {
if (_state==STOPPED || _state==PAUSED)
return false;
@@ -86,14 +86,14 @@ package org.goasap.utils.customadvance {
GoEngine.removeItem(this);
return true;
}
-
+
override public function resume() : Boolean {
if (_state != PAUSED)
return false;
GoEngine.addItem(this);
return true;
}
-
+
public function update(currentTime : Number) : void {
if (_function()===true)
super.dispatchAdvance();
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/OnDurationComplete.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/OnDurationComplete.as
similarity index 94%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/OnDurationComplete.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/OnDurationComplete.as
index d40006ba8141..fd97aedf80dc 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/OnDurationComplete.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/OnDurationComplete.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2007 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -21,32 +21,32 @@
*/
package org.goasap.utils.customadvance {
import flash.utils.getTimer;
-
+
import org.goasap.GoEngine;
import org.goasap.interfaces.IUpdatable;
- import org.goasap.items.GoItem;
+ import org.goasap.items.GoItem;
/**
* A custom advance type that triggers after a specific duration has completed.
- *
+ *
* @author Moses Gunesch
*/
public class OnDurationComplete extends SequenceAdvance implements IUpdatable {
-
+
// -== Public Properties ==-
-
+
/**
* The duration after which advance should occur.
*/
public function get duration() : Number {
return _duration;
}
-
+
/**
- * The pulse used to monitor the duration. Defaults to GoItem.defaultPulseInterval
- * if not specified.
- *
- * <p>(Note that this system is more accurate than flash.utilss.Timer, especially for
+ * The pulse used to monitor the duration. Defaults to GoItem.defaultPulseInterval
+ * if not specified.
+ *
+ * <p>(Note that this system is more accurate than flash.utilss.Timer, especially for
* pause/resume.)</p>
*/
public function get pulseInterval() : int {
@@ -54,9 +54,9 @@ package org.goasap.utils.customadvance {
_pulse = GoItem.defaultPulseInterval;
return _pulse;
}
-
+
// -== Protected Properties ==-
-
+
/**
* @private
*/
@@ -77,12 +77,12 @@ package org.goasap.utils.customadvance {
* @private
*/
protected var _startTime : int;
-
+
// -== Public Methods ==-
-
+
/**
* @param seconds The duration after which advance should occur.
- * @param pulseInterval The pulse used to monitor the duration. Defaults to
+ * @param pulseInterval The pulse used to monitor the duration. Defaults to
* GoItem.defaultPulseInterval if not specified.
*/
public function OnDurationComplete(seconds:Number, pulseInterval:Number=NaN) {
@@ -90,7 +90,7 @@ package org.goasap.utils.customadvance {
_duration = (isNaN(seconds) ? 0 : Math.max(seconds, 0));
_pulse = pulseInterval;
}
-
+
override public function start() : Boolean {
_startTime = getTimer();
_tweenDuration = (_duration * 1000 * Math.max(0, GoItem.timeMultiplier));
@@ -99,13 +99,13 @@ package org.goasap.utils.customadvance {
_state = PLAYING;
return true;
}
-
+
override public function stop() : Boolean {
GoEngine.removeItem(this);
_state = STOPPED;
return true;
}
-
+
override public function pause() : Boolean {
if (_state==STOPPED || _state==PAUSED)
return false;
@@ -114,16 +114,16 @@ package org.goasap.utils.customadvance {
GoEngine.removeItem(this);
return true;
}
-
+
override public function resume() : Boolean {
if (_state != PAUSED)
return false;
_state = PLAYING;
- _startTime = (getTimer() - (_pauseTime - _startTime));
+ _startTime = (getTimer() - (_pauseTime - _startTime));
GoEngine.addItem(this);
return true;
}
-
+
override public function skipTo(seconds:Number) : Boolean { // untested, logic is copied from LinearGo.skipTo.
if (_state==STOPPED)
GoEngine.addItem(this);
@@ -131,7 +131,7 @@ package org.goasap.utils.customadvance {
_startTime = (getTimer() - (Math.min(seconds, _duration) * 1000 * Math.max(0, GoItem.timeMultiplier)));
return true;
}
-
+
public function update(currentTime : Number) : void {
if (currentTime >= _startTime + _tweenDuration) {
super.dispatchAdvance();
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/OnEventComplete.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/OnEventComplete.as
similarity index 95%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/OnEventComplete.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/OnEventComplete.as
index c4d2eaa6edf2..cde0ad6ec041 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/OnEventComplete.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/OnEventComplete.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2007 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -24,18 +24,18 @@ package org.goasap.utils.customadvance {
import flash.events.IEventDispatcher;
/**
- * A custom advance type that triggers when any event is dispatched by any IEventDispatcher host.
- *
- * <p>If the event requires filtering or custom handling, you can optionally set up a custom handler
- * that accepts the event object as an input and returns true if all conditions are met for advancing
+ * A custom advance type that triggers when any event is dispatched by any IEventDispatcher host.
+ *
+ * <p>If the event requires filtering or custom handling, you can optionally set up a custom handler
+ * that accepts the event object as an input and returns true if all conditions are met for advancing
* the sequence.</p>
- *
+ *
* @author Moses Gunesch
*/
public class OnEventComplete extends SequenceAdvance {
// -== Protected Properties ==-
-
+
/**
* @private
*/
@@ -50,7 +50,7 @@ package org.goasap.utils.customadvance {
protected var _customHandler : Function;
// -== Public Methods ==-
-
+
/**
* @param dispatcher Any object that dispatches the event.
* @param type The event type to listen for
@@ -63,21 +63,21 @@ package org.goasap.utils.customadvance {
_type = type;
_customHandler = customHanderThatReturnsBoolean;
}
-
+
override public function start() : Boolean {
_host.addEventListener(_type, dispatchAdvance);
_state = PLAYING;
return true;
}
-
+
override public function stop() : Boolean {
_host.removeEventListener(_type, dispatchAdvance);
_state = STOPPED;
return true;
}
-
+
// -== Protected Methods ==-
-
+
/**
* @private
*/
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/OnPlayableComplete.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/OnPlayableComplete.as
similarity index 98%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/OnPlayableComplete.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/OnPlayableComplete.as
index 42b6ab11680e..b2ba69c924f8 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/OnPlayableComplete.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/OnPlayableComplete.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2007 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -26,13 +26,13 @@ package org.goasap.utils.customadvance {
/**
* A custom advance type that triggers when any playable item (presumably one item
* in the step) dispatches STOP or COMPLETE.
- *
+ *
* @author Moses Gunesch
*/
public class OnPlayableComplete extends SequenceAdvance {
// -== Public Properties ==-
-
+
public function set item(item : IPlayable) : void {
if (_state==STOPPED)
_item = item;
@@ -40,23 +40,23 @@ package org.goasap.utils.customadvance {
public function get item() : IPlayable {
return _item;
}
-
+
// -== Public Methods ==-
-
+
/**
* @private
*/
protected var _item : IPlayable;
-
+
/**
- * @param item Any playable item that dispatches STOP or COMPLETE,
+ * @param item Any playable item that dispatches STOP or COMPLETE,
* normally a child item in the step using this custom advance.
*/
public function OnPlayableComplete(item : IPlayable = null) : void {
super();
_item = item;
}
-
+
override public function start() : Boolean {
if (_item==null)
return false;
@@ -65,7 +65,7 @@ package org.goasap.utils.customadvance {
_state = PLAYING;
return true;
}
-
+
override public function stop() : Boolean {
_item.removeEventListener(GoEvent.STOP, super.dispatchAdvance);
_item.removeEventListener(GoEvent.COMPLETE, super.dispatchAdvance);
diff --git a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/SequenceAdvance.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/SequenceAdvance.as
similarity index 96%
rename from typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/SequenceAdvance.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/SequenceAdvance.as
index bdbe1e808d61..61e7e3b31b0a 100644
--- a/typo3/contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/SequenceAdvance.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/goasp/src_go/org/goasap/utils/customadvance/SequenceAdvance.as
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2007 Moses Gunesch
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -21,39 +21,39 @@
*/
package org.goasap.utils.customadvance {
import flash.events.Event;
-
+
import org.goasap.PlayableBase;
import org.goasap.events.SequenceEvent;
- import org.goasap.interfaces.IPlayable;
-
+ import org.goasap.interfaces.IPlayable;
+
/**
- * Subclasses should call the <code>dispatchAdvance</code> method when
+ * Subclasses should call the <code>dispatchAdvance</code> method when
* the sequence should advance to its next step. It is mandatory that
* custom advance types dispatch this event one time, although each class
* may define its own conditions for when this event occurs.
- *
+ *
* @eventType org.goasap.events.SequenceEvent.ADVANCE
*/
[Event(name="ADVANCE", type="org.goasap.events.SequenceEvent")]
/**
* Base class for other custom advance types, does nothing on its own.
- *
+ *
* @see OnConditionTrue
* @see OnDurationComplete
* @see OnEventComplete
* @see OnPlayableComplete
- *
+ *
* @author Moses Gunesch
*/
public class SequenceAdvance extends PlayableBase implements IPlayable {
-
+
public function SequenceAdvance():void {
super();
}
-
+
// -== Protected Methods ==-
-
+
/**
* @private
* Call this method from subclasses to trigger advance, only once per play cycle.
@@ -63,23 +63,23 @@ package org.goasap.utils.customadvance {
stop();
dispatchEvent(new SequenceEvent(SequenceEvent.ADVANCE));
}
-
+
public function start() : Boolean {
return false;
}
-
+
public function stop() : Boolean {
return false;
}
-
+
public function pause() : Boolean {
return false;
}
-
+
public function resume() : Boolean {
return false;
}
-
+
public function skipTo(position : Number) : Boolean {
return false;
}
diff --git a/typo3/contrib/flowplayer/lib/licensekey/licensekey.swc b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/licensekey/licensekey.swc
similarity index 100%
rename from typo3/contrib/flowplayer/lib/licensekey/licensekey.swc
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/licensekey/licensekey.swc
diff --git a/typo3/contrib/flowplayer/lib/thunderbolt/ThunderBoltAS3_Flash.swc b/typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/thunderbolt/ThunderBoltAS3_Flash.swc
similarity index 100%
rename from typo3/contrib/flowplayer/lib/thunderbolt/ThunderBoltAS3_Flash.swc
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/lib/thunderbolt/ThunderBoltAS3_Flash.swc
diff --git a/typo3/contrib/flowplayer/manifest.xml b/typo3/sysext/mediace/Resources/Contrib/flowplayer/manifest.xml
similarity index 100%
rename from typo3/contrib/flowplayer/manifest.xml
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/manifest.xml
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.audio-3.2.10.swf b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.audio-3.2.10.swf
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.audio-3.2.10.swf
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.audio-3.2.10.swf
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.audio/LICENSE.txt b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.audio/LICENSE.txt
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.audio/LICENSE.txt
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.audio/LICENSE.txt
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.audio/README.txt b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.audio/README.txt
similarity index 99%
rename from typo3/contrib/flowplayer/plugins/flowplayer.audio/README.txt
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.audio/README.txt
index 746c5ee8bbd2..47780d825bb0 100644
--- a/typo3/contrib/flowplayer/plugins/flowplayer.audio/README.txt
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.audio/README.txt
@@ -76,7 +76,7 @@ Fixes:
3.0.3
-----
- changed to recalculate the duration until the end of the file has been reached,
- this is needed to correctly estimate the duration of variable bitrate MP3's
+ this is needed to correctly estimate the duration of variable bitrate MP3's
3.0.2
-----
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.audio/build.properties b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.audio/build.properties
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.audio/build.properties
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.audio/build.properties
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.audio/build.xml b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.audio/build.xml
similarity index 99%
rename from typo3/contrib/flowplayer/plugins/flowplayer.audio/build.xml
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.audio/build.xml
index dca367e165cd..1774802ee18a 100644
--- a/typo3/contrib/flowplayer/plugins/flowplayer.audio/build.xml
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.audio/build.xml
@@ -2,18 +2,18 @@
<property file="build.generated.properties"/>
<property file="${user.home}/plugin.properties" />
<property file="build.properties" />
-
+
<property file="${devkit-dir}/plugin-build.properties" />
<import file="${devkit-dir}/plugin-build.xml"/>
<property name="flowplayer_lib" value="${devkit-dir}/flowplayer.swc" />
-
+
<property name="shortname" value="audio" />
<property name="basename" value="flowplayer.${shortname}" />
<property name="releasedir" value="flowplayer.audio" />
<property name="plugin-binary" value="${basename}.swf" />
<property name="plugin-binary-versioned" value="${basename}-${version}.swf" />
<property name="plugin-swc" value="${basename}.swc" />
-
+
<property name="plugin-main-class" value="org/flowplayer/audio/AudioProviderFactory.as" />
<target name="release" description="makes a release" depends="build">
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.audio/src/actionscript/org/flowplayer/audio/AudioProvider.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.audio/src/actionscript/org/flowplayer/audio/AudioProvider.as
similarity index 99%
rename from typo3/contrib/flowplayer/plugins/flowplayer.audio/src/actionscript/org/flowplayer/audio/AudioProvider.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.audio/src/actionscript/org/flowplayer/audio/AudioProvider.as
index a34e2405e467..6d8327814c80 100644
--- a/typo3/contrib/flowplayer/plugins/flowplayer.audio/src/actionscript/org/flowplayer/audio/AudioProvider.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.audio/src/actionscript/org/flowplayer/audio/AudioProvider.as
@@ -1 +1 @@
-/*
* Copyright 2008, 2009 Flowplayer Oy
*
* This file is part of FlowPlayer.
*
* FlowPlayer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* FlowPlayer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with FlowPlayer. If not, see <http://www.gnu.org/licenses/>.
*/
package org.flowplayer.audio {
import flash.display.DisplayObject;
import flash.display.Loader;
import flash.events.Event;
import flash.events.IOErrorEvent;
import flash.events.ProgressEvent;
import flash.events.TimerEvent;
import flash.media.ID3Info;
import flash.media.Sound;
import flash.media.SoundChannel;
import flash.media.SoundLoaderContext;
import flash.net.NetConnection;
import flash.net.NetStream;
import flash.net.URLRequest;
import flash.utils.Dictionary;
import flash.utils.Timer;
import org.flowplayer.controller.ClipURLResolverHelper;
import org.flowplayer.controller.ConnectionProvider;
import org.flowplayer.controller.ResourceLoader;
import org.flowplayer.controller.StreamProvider;
import org.flowplayer.controller.TimeProvider;
import org.flowplayer.controller.VolumeController;
import org.flowplayer.model.Clip;
import org.flowplayer.model.ClipError;
import org.flowplayer.model.ClipEvent;
import org.flowplayer.model.ClipEventType;
import org.flowplayer.model.Playlist;
import org.flowplayer.model.Plugin;
import org.flowplayer.model.PluginModel;
import org.flowplayer.util.Log;
import org.flowplayer.view.Flowplayer;
/**
* @author api
*/
public class AudioProvider implements StreamProvider, Plugin {
private var log:Log = new Log(this);
private var _sound:Sound;
private var _paused:Boolean;
private var _durationSeconds:Number;
private var _prevClip:Clip;
private var _pausedPosition:Number;
private var _channel:SoundChannel;
private var _playlist:Playlist;
private var _progressTimer:Timer;
private var _seeking:Boolean;
private var _started:Boolean;
private var _volumeController:VolumeController;
private var _pauseAfterStart:Boolean;
private var _bufferFullDispatched:Boolean;
private var _timeProvider:TimeProvider;
private var _model:PluginModel;
private var _lastDurationDispatched:Number = 0;
private var _imageLoader:ResourceLoader;
private var _imageDisplay:Loader = null;
private var context:SoundLoaderContext;
private var _clipUrlResolverHelper:ClipURLResolverHelper;
private var _metadataDispatched:Boolean;
public function stop(event:ClipEvent, closeStream:Boolean = false):void {
seek(null, 0);
if (_channel) {
log.debug("in stop(), stopping channel");
_channel.stop();
}
if (closeStream || clip.live) {
closeSound();
}
resetState();
if (event && clip) {
clip.dispatchEvent(event);
}
}
private function closeSound():void {
try {
_sound.close();
} catch (e:Error) {
log.error(e.getStackTrace());
// ignore
}
if(clip.live) {
_sound = null;
}
}
private function resetState():void {
_paused = false;
_started = false;
_bufferFullDispatched = false;
_durationSeconds = 0;
_pausedPosition = 0;
if (_progressTimer) {
_progressTimer.stop();
_progressTimer.removeEventListener(TimerEvent.TIMER, onProgressTimer);
_progressTimer = null;
}
}
public function attachStream(video:DisplayObject):void {
}
private function doLoad():void {
}
public function load(event:ClipEvent, clip:Clip, pauseAfterStart:Boolean = true):void {
log.debug("load()");
_metadataDispatched = false;
resetState();
if ((_prevClip == clip) && _sound) {
log.debug("load() reusing existing sound object");
addListeners(_sound);
play(0);
clip.dispatch(ClipEventType.BEGIN);
//#575 send the start event after begin
clip.dispatch(ClipEventType.START);
} else {
log.debug("load(), creating new sound object");
_prevClip = clip;
_sound = new Sound();
context = new SoundLoaderContext(1000, true);
//#582 clear any preloaded images
_imageDisplay = null;
if (clip.getCustomProperty("coverImage")) {
var cover:Object = getCoverImage(clip);
log.debug("Loading Artwork For Audio " + cover.url);
_imageLoader.load(cover.url, onImageComplete);
} else {
playAudio();
}
}
_pauseAfterStart = pauseAfterStart;
}
private function getCoverImage(clip:Clip):Object {
var cover:Object = clip.getCustomProperty("coverImage");
if (cover is String) return { url: "" + cover };
if (cover.hasOwnProperty("scaling")) {
clip.setScaling(cover["scaling"]);
}
return cover;
}
private function playAudio():void {
addListeners(_sound);
_clipUrlResolverHelper.resolveClipUrl(clip, function onClipUrlResolved(clip:Clip):void {
_sound.load(new URLRequest(clip.completeUrl), context);
play(0);
});
}
private function onImageError(error:IOErrorEvent):void {
log.debug("Cover artwork doesn't exist playing now");
playAudio();
}
private function onImageComplete(loader:ResourceLoader):void {
log.debug("Cover image loaded playing now");
_imageDisplay = loader.getContent() as Loader;
clip.originalWidth = _imageDisplay.width;
clip.originalHeight = _imageDisplay.height;
playAudio();
}
private function removeListeners(sound:Sound):void {
sound.removeEventListener(ProgressEvent.PROGRESS, onProgress);
sound.removeEventListener(Event.COMPLETE, onDownloadComplete);
sound.removeEventListener(IOErrorEvent.IO_ERROR, onIoError);
sound.removeEventListener(Event.ID3, onId3);
}
private function addListeners(sound:Sound):void {
removeListeners(sound);
sound.addEventListener(ProgressEvent.PROGRESS, onProgress);
sound.addEventListener(Event.COMPLETE, onDownloadComplete);
sound.addEventListener(IOErrorEvent.IO_ERROR, onIoError);
sound.addEventListener(Event.ID3, onId3);
_progressTimer = new Timer(200);
_progressTimer.addEventListener(TimerEvent.TIMER, onProgressTimer);
_progressTimer.start();
}
private function onIoError(event:IOErrorEvent):void {
log.error("Unable to load audio file: " + event.text);
//#611 close the channel and sound on stream not found errors.
stopSoundChannel();
stop(null, true);
clip.dispatchError(ClipError.STREAM_NOT_FOUND);
}
private function addId3Metadata():void {
var metadata:Object = clip.metaData || new Object();
log.debug("current metadata", metadata);
try {
var tag:ID3Info = _sound.id3;
} catch (e:Error) {
log.warn("unable to access ID3 tag: " + e);
}
for (var prop:String in tag) {
log.debug(prop + ": " + _sound.id3[prop]);
metadata[prop] = _sound.id3[prop];
}
clip.metaData = metadata;
}
private function dispatchMetadata():void
{
if (_metadataDispatched) return;
clip.dispatch(ClipEventType.METADATA);
clip.dispatch(ClipEventType.START);
_started = true;
_metadataDispatched = true;
}
private function onId3(event:Event):void {
log.debug("onId3(), _started == " + _started);
addId3Metadata();
//#428 when fully downloaded ID3 is resent and update the duration
//#582 prevent dispatching for files with id1 tags at the end of their files
if (_started) {
return;
}
//#475 if we have a clip duration set, dispatch start or else wait until the duration is estimated. Start required for beginning duration tracker.
//#501 fixes for start dispatching issue.
if (clip.duration > 0 && !_started) {
log.debug("duration is available dispatching start");
dispatchMetadata();
}
//#569 if the playlist has been reset but the audio has been already buffered, set the duration and start event.
if (clip.duration <= 0 && !_started && (_sound.bytesLoaded >= _sound.bytesTotal)) {
clip.durationFromMetadata = getDuration();
dispatchMetadata();
}
if (_pauseAfterStart) {
pause(new ClipEvent(ClipEventType.PAUSE));
//begin the progress timer to start buffering.
_progressTimer.start();
}
}
private function onProgress(event:ProgressEvent):void {
_sound.removeEventListener(ProgressEvent.PROGRESS, onProgress);
clip.dispatch(ClipEventType.BEGIN);
}
private function onProgressTimer(event:TimerEvent):void {
if (! clip.duration > 0) {
estimateDuration();
}
var bTotal:Number = _sound.bytesTotal;
var bLoaded:Number = _sound.bytesLoaded;
if (clip.live) bTotal = bLoaded + 1;
if (! bTotal > 0) return;
if (! bLoaded > 0) return;
if (_sound.isBuffering == true && bTotal > bLoaded) {
clip.dispatch(ClipEventType.BUFFER_EMPTY);
} else if (! _bufferFullDispatched) {
clip.dispatch(ClipEventType.BUFFER_FULL);
_bufferFullDispatched = true;
}
}
private function getDuration():Number
{
return (_sound.length / (_sound.bytesLoaded / _sound.bytesTotal)) / 1000;
}
private function estimateDuration():void {
if (clip.live) return;
//#428 regression issue calculating the initial duration, was returning too small for the duration tracker.
var durationSecs:Number = getDuration();
clip.durationFromMetadata = durationSecs;
if (durationSecs > 0 && Math.abs(_lastDurationDispatched - durationSecs) >= 0.5) {
if (clip.metaData) {
clip.dispatch(ClipEventType.METADATA);
}
_lastDurationDispatched = durationSecs;
log.debug("dispatching onDuration(), " + clip.duration);
clip.dispatch(ClipEventType.START);
_started = true;
}
}
private function onDownloadComplete(event:Event):void {
log.debug("Audio is buffered dispatching metadata");
clip.durationFromMetadata = getDuration();
dispatchMetadata();
}
private function onComplete(event:Event):void {
//#501 stop the progress timer on completion.
_progressTimer.stop();
stopSoundChannel();
//#582 send the buffer full event here so playlist items will end and transition correctly.
clip.dispatchEvent(new ClipEvent(ClipEventType.BUFFER_FULL));
// dispatch a before event because the finish has default behavior that can be prevented by listeners
//clip.dispatchBeforeEvent(new ClipEvent(ClipEventType.FINISH));
}
public function getVideo(clip:Clip):DisplayObject {
log.debug("getVideo() " + _imageDisplay);
return _imageDisplay as DisplayObject;
}
public function resume(event:ClipEvent):void {
log.debug("resume");
_paused = false;
//start the progress timer
_progressTimer.start();
play(_pausedPosition);
if (event) {
clip.dispatchEvent(event);
}
}
public function pause(event:ClipEvent):void {
log.debug("pause");
if (clip.live) {
stop(event);
return;
}
_paused = true;
_pausedPosition = _channel.position;
stopSoundChannel();
//pause the progress timer
_progressTimer.stop();
if (event) {
clip.dispatchEvent(event);
}
}
private function stopSoundChannel():void
{
_channel.stop();
//#501 clear the complete event before creating a new sound channel.
_channel.removeEventListener(Event.SOUND_COMPLETE, onComplete);
_channel = null;
}
public function seek(event:ClipEvent, seconds:Number):void {
if (! _channel) return;
stopSoundChannel();
_seeking = true;
play(seconds * 1000);
if (event && clip) {
clip.dispatchEvent(event);
}
if (_paused) {
_pausedPosition = _channel.position;
_channel.stop();
}
}
private function play(posMillis:Number):void {
_channel = _sound.play(posMillis, 0);
//#501 use the sound channel for the completion event to finish correctly.
_channel.addEventListener(Event.SOUND_COMPLETE, onComplete);
_volumeController.soundChannel = _channel;
}
public function get stopping():Boolean {
return false;
}
public function get allowRandomSeek():Boolean {
return false;
}
public function get bufferStart():Number {
return 0;
}
public function get playlist():Playlist {
return _playlist;
}
public function get time():Number {
if (_timeProvider) {
return _timeProvider.getTime(null);
}
return _channel ? _channel.position / 1000 : 0;
}
public function get bufferEnd():Number {
return _sound && clip ? _sound.bytesLoaded / _sound.bytesTotal * clip.duration : 0;
}
public function get fileSize():Number {
return _sound ? _sound.bytesLoaded : 0;
}
public function set playlist(playlist:Playlist):void {
_playlist = playlist;
}
public function set netStreamClient(client:Object):void {
}
public function set volumeController(controller:VolumeController):void {
_volumeController = controller;
}
public function onConfig(model:PluginModel):void {
_model = model;
model.dispatchOnLoad();
}
public function getDefaultConfig():Object {
return null;
}
public function onLoad(player:Flowplayer):void {
_imageLoader = player.createLoader();
_clipUrlResolverHelper = new ClipURLResolverHelper(player, this);
}
public function addConnectionCallback(name:String, listener:Function):void {
}
public function addStreamCallback(name:String, listener:Function):void {
}
public function get netStream():NetStream {
return null;
}
public function get netConnection():NetConnection {
return null;
}
public function getDefaultConnectionProvider():ConnectionProvider {
return null;
}
public function set timeProvider(timeProvider:TimeProvider):void {
_timeProvider = timeProvider;
}
/**
* the value of this property is "audio"
*/
public function get type():String {
return "audio";
}
public function switchStream(event:ClipEvent, clip:Clip, netStreamPlayOptions:Object = null):void {
}
public function get streamCallbacks():Dictionary {
return null;
}
private function get clip():Clip {
return _playlist.current;
}
}
}
\ No newline at end of file
+/*
* Copyright 2008, 2009 Flowplayer Oy
*
* This file is part of FlowPlayer.
*
* FlowPlayer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* FlowPlayer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with FlowPlayer. If not, see <http://www.gnu.org/licenses/>.
*/
package org.flowplayer.audio {
import flash.display.DisplayObject;
import flash.display.Loader;
import flash.events.Event;
import flash.events.IOErrorEvent;
import flash.events.ProgressEvent;
import flash.events.TimerEvent;
import flash.media.ID3Info;
import flash.media.Sound;
import flash.media.SoundChannel;
import flash.media.SoundLoaderContext;
import flash.net.NetConnection;
import flash.net.NetStream;
import flash.net.URLRequest;
import flash.utils.Dictionary;
import flash.utils.Timer;
import org.flowplayer.controller.ClipURLResolverHelper;
import org.flowplayer.controller.ConnectionProvider;
import org.flowplayer.controller.ResourceLoader;
import org.flowplayer.controller.StreamProvider;
import org.flowplayer.controller.TimeProvider;
import org.flowplayer.controller.VolumeController;
import org.flowplayer.model.Clip;
import org.flowplayer.model.ClipError;
import org.flowplayer.model.ClipEvent;
import org.flowplayer.model.ClipEventType;
import org.flowplayer.model.Playlist;
import org.flowplayer.model.Plugin;
import org.flowplayer.model.PluginModel;
import org.flowplayer.util.Log;
import org.flowplayer.view.Flowplayer;
/**
* @author api
*/
public class AudioProvider implements StreamProvider, Plugin {
private var log:Log = new Log(this);
private var _sound:Sound;
private var _paused:Boolean;
private var _durationSeconds:Number;
private var _prevClip:Clip;
private var _pausedPosition:Number;
private var _channel:SoundChannel;
private var _playlist:Playlist;
private var _progressTimer:Timer;
private var _seeking:Boolean;
private var _started:Boolean;
private var _volumeController:VolumeController;
private var _pauseAfterStart:Boolean;
private var _bufferFullDispatched:Boolean;
private var _timeProvider:TimeProvider;
private var _model:PluginModel;
private var _lastDurationDispatched:Number = 0;
private var _imageLoader:ResourceLoader;
private var _imageDisplay:Loader = null;
private var context:SoundLoaderContext;
private var _clipUrlResolverHelper:ClipURLResolverHelper;
private var _metadataDispatched:Boolean;
public function stop(event:ClipEvent, closeStream:Boolean = false):void {
seek(null, 0);
if (_channel) {
log.debug("in stop(), stopping channel");
_channel.stop();
}
if (closeStream || clip.live) {
closeSound();
}
resetState();
if (event && clip) {
clip.dispatchEvent(event);
}
}
private function closeSound():void {
try {
_sound.close();
} catch (e:Error) {
log.error(e.getStackTrace());
// ignore
}
if(clip.live) {
_sound = null;
}
}
private function resetState():void {
_paused = false;
_started = false;
_bufferFullDispatched = false;
_durationSeconds = 0;
_pausedPosition = 0;
if (_progressTimer) {
_progressTimer.stop();
_progressTimer.removeEventListener(TimerEvent.TIMER, onProgressTimer);
_progressTimer = null;
}
}
public function attachStream(video:DisplayObject):void {
}
private function doLoad():void {
}
public function load(event:ClipEvent, clip:Clip, pauseAfterStart:Boolean = true):void {
log.debug("load()");
_metadataDispatched = false;
resetState();
if ((_prevClip == clip) && _sound) {
log.debug("load() reusing existing sound object");
addListeners(_sound);
play(0);
clip.dispatch(ClipEventType.BEGIN);
//#575 send the start event after begin
clip.dispatch(ClipEventType.START);
} else {
log.debug("load(), creating new sound object");
_prevClip = clip;
_sound = new Sound();
context = new SoundLoaderContext(1000, true);
//#582 clear any preloaded images
_imageDisplay = null;
if (clip.getCustomProperty("coverImage")) {
var cover:Object = getCoverImage(clip);
log.debug("Loading Artwork For Audio " + cover.url);
_imageLoader.load(cover.url, onImageComplete);
} else {
playAudio();
}
}
_pauseAfterStart = pauseAfterStart;
}
private function getCoverImage(clip:Clip):Object {
var cover:Object = clip.getCustomProperty("coverImage");
if (cover is String) return { url: "" + cover };
if (cover.hasOwnProperty("scaling")) {
clip.setScaling(cover["scaling"]);
}
return cover;
}
private function playAudio():void {
addListeners(_sound);
_clipUrlResolverHelper.resolveClipUrl(clip, function onClipUrlResolved(clip:Clip):void {
_sound.load(new URLRequest(clip.completeUrl), context);
play(0);
});
}
private function onImageError(error:IOErrorEvent):void {
log.debug("Cover artwork doesn't exist playing now");
playAudio();
}
private function onImageComplete(loader:ResourceLoader):void {
log.debug("Cover image loaded playing now");
_imageDisplay = loader.getContent() as Loader;
clip.originalWidth = _imageDisplay.width;
clip.originalHeight = _imageDisplay.height;
playAudio();
}
private function removeListeners(sound:Sound):void {
sound.removeEventListener(ProgressEvent.PROGRESS, onProgress);
sound.removeEventListener(Event.COMPLETE, onDownloadComplete);
sound.removeEventListener(IOErrorEvent.IO_ERROR, onIoError);
sound.removeEventListener(Event.ID3, onId3);
}
private function addListeners(sound:Sound):void {
removeListeners(sound);
sound.addEventListener(ProgressEvent.PROGRESS, onProgress);
sound.addEventListener(Event.COMPLETE, onDownloadComplete);
sound.addEventListener(IOErrorEvent.IO_ERROR, onIoError);
sound.addEventListener(Event.ID3, onId3);
_progressTimer = new Timer(200);
_progressTimer.addEventListener(TimerEvent.TIMER, onProgressTimer);
_progressTimer.start();
}
private function onIoError(event:IOErrorEvent):void {
log.error("Unable to load audio file: " + event.text);
//#611 close the channel and sound on stream not found errors.
stopSoundChannel();
stop(null, true);
clip.dispatchError(ClipError.STREAM_NOT_FOUND);
}
private function addId3Metadata():void {
var metadata:Object = clip.metaData || new Object();
log.debug("current metadata", metadata);
try {
var tag:ID3Info = _sound.id3;
} catch (e:Error) {
log.warn("unable to access ID3 tag: " + e);
}
for (var prop:String in tag) {
log.debug(prop + ": " + _sound.id3[prop]);
metadata[prop] = _sound.id3[prop];
}
clip.metaData = metadata;
}
private function dispatchMetadata():void
{
if (_metadataDispatched) return;
clip.dispatch(ClipEventType.METADATA);
clip.dispatch(ClipEventType.START);
_started = true;
_metadataDispatched = true;
}
private function onId3(event:Event):void {
log.debug("onId3(), _started == " + _started);
addId3Metadata();
//#428 when fully downloaded ID3 is resent and update the duration
//#582 prevent dispatching for files with id1 tags at the end of their files
if (_started) {
return;
}
//#475 if we have a clip duration set, dispatch start or else wait until the duration is estimated. Start required for beginning duration tracker.
//#501 fixes for start dispatching issue.
if (clip.duration > 0 && !_started) {
log.debug("duration is available dispatching start");
dispatchMetadata();
}
//#569 if the playlist has been reset but the audio has been already buffered, set the duration and start event.
if (clip.duration <= 0 && !_started && (_sound.bytesLoaded >= _sound.bytesTotal)) {
clip.durationFromMetadata = getDuration();
dispatchMetadata();
}
if (_pauseAfterStart) {
pause(new ClipEvent(ClipEventType.PAUSE));
//begin the progress timer to start buffering.
_progressTimer.start();
}
}
private function onProgress(event:ProgressEvent):void {
_sound.removeEventListener(ProgressEvent.PROGRESS, onProgress);
clip.dispatch(ClipEventType.BEGIN);
}
private function onProgressTimer(event:TimerEvent):void {
if (! clip.duration > 0) {
estimateDuration();
}
var bTotal:Number = _sound.bytesTotal;
var bLoaded:Number = _sound.bytesLoaded;
if (clip.live) bTotal = bLoaded + 1;
if (! bTotal > 0) return;
if (! bLoaded > 0) return;
if (_sound.isBuffering == true && bTotal > bLoaded) {
clip.dispatch(ClipEventType.BUFFER_EMPTY);
} else if (! _bufferFullDispatched) {
clip.dispatch(ClipEventType.BUFFER_FULL);
_bufferFullDispatched = true;
}
}
private function getDuration():Number
{
return (_sound.length / (_sound.bytesLoaded / _sound.bytesTotal)) / 1000;
}
private function estimateDuration():void {
if (clip.live) return;
//#428 regression issue calculating the initial duration, was returning too small for the duration tracker.
var durationSecs:Number = getDuration();
clip.durationFromMetadata = durationSecs;
if (durationSecs > 0 && Math.abs(_lastDurationDispatched - durationSecs) >= 0.5) {
if (clip.metaData) {
clip.dispatch(ClipEventType.METADATA);
}
_lastDurationDispatched = durationSecs;
log.debug("dispatching onDuration(), " + clip.duration);
clip.dispatch(ClipEventType.START);
_started = true;
}
}
private function onDownloadComplete(event:Event):void {
log.debug("Audio is buffered dispatching metadata");
clip.durationFromMetadata = getDuration();
dispatchMetadata();
}
private function onComplete(event:Event):void {
//#501 stop the progress timer on completion.
_progressTimer.stop();
stopSoundChannel();
//#582 send the buffer full event here so playlist items will end and transition correctly.
clip.dispatchEvent(new ClipEvent(ClipEventType.BUFFER_FULL));
// dispatch a before event because the finish has default behavior that can be prevented by listeners
//clip.dispatchBeforeEvent(new ClipEvent(ClipEventType.FINISH));
}
public function getVideo(clip:Clip):DisplayObject {
log.debug("getVideo() " + _imageDisplay);
return _imageDisplay as DisplayObject;
}
public function resume(event:ClipEvent):void {
log.debug("resume");
_paused = false;
//start the progress timer
_progressTimer.start();
play(_pausedPosition);
if (event) {
clip.dispatchEvent(event);
}
}
public function pause(event:ClipEvent):void {
log.debug("pause");
if (clip.live) {
stop(event);
return;
}
_paused = true;
_pausedPosition = _channel.position;
stopSoundChannel();
//pause the progress timer
_progressTimer.stop();
if (event) {
clip.dispatchEvent(event);
}
}
private function stopSoundChannel():void
{
_channel.stop();
//#501 clear the complete event before creating a new sound channel.
_channel.removeEventListener(Event.SOUND_COMPLETE, onComplete);
_channel = null;
}
public function seek(event:ClipEvent, seconds:Number):void {
if (! _channel) return;
stopSoundChannel();
_seeking = true;
play(seconds * 1000);
if (event && clip) {
clip.dispatchEvent(event);
}
if (_paused) {
_pausedPosition = _channel.position;
_channel.stop();
}
}
private function play(posMillis:Number):void {
_channel = _sound.play(posMillis, 0);
//#501 use the sound channel for the completion event to finish correctly.
_channel.addEventListener(Event.SOUND_COMPLETE, onComplete);
_volumeController.soundChannel = _channel;
}
public function get stopping():Boolean {
return false;
}
public function get allowRandomSeek():Boolean {
return false;
}
public function get bufferStart():Number {
return 0;
}
public function get playlist():Playlist {
return _playlist;
}
public function get time():Number {
if (_timeProvider) {
return _timeProvider.getTime(null);
}
return _channel ? _channel.position / 1000 : 0;
}
public function get bufferEnd():Number {
return _sound && clip ? _sound.bytesLoaded / _sound.bytesTotal * clip.duration : 0;
}
public function get fileSize():Number {
return _sound ? _sound.bytesLoaded : 0;
}
public function set playlist(playlist:Playlist):void {
_playlist = playlist;
}
public function set netStreamClient(client:Object):void {
}
public function set volumeController(controller:VolumeController):void {
_volumeController = controller;
}
public function onConfig(model:PluginModel):void {
_model = model;
model.dispatchOnLoad();
}
public function getDefaultConfig():Object {
return null;
}
public function onLoad(player:Flowplayer):void {
_imageLoader = player.createLoader();
_clipUrlResolverHelper = new ClipURLResolverHelper(player, this);
}
public function addConnectionCallback(name:String, listener:Function):void {
}
public function addStreamCallback(name:String, listener:Function):void {
}
public function get netStream():NetStream {
return null;
}
public function get netConnection():NetConnection {
return null;
}
public function getDefaultConnectionProvider():ConnectionProvider {
return null;
}
public function set timeProvider(timeProvider:TimeProvider):void {
_timeProvider = timeProvider;
}
/**
* the value of this property is "audio"
*/
public function get type():String {
return "audio";
}
public function switchStream(event:ClipEvent, clip:Clip, netStreamPlayOptions:Object = null):void {
}
public function get streamCallbacks():Dictionary {
return null;
}
private function get clip():Clip {
return _playlist.current;
}
}
}
\ No newline at end of file
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.audio/src/actionscript/org/flowplayer/audio/AudioProviderFactory.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.audio/src/actionscript/org/flowplayer/audio/AudioProviderFactory.as
similarity index 96%
rename from typo3/contrib/flowplayer/plugins/flowplayer.audio/src/actionscript/org/flowplayer/audio/AudioProviderFactory.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.audio/src/actionscript/org/flowplayer/audio/AudioProviderFactory.as
index 29ab6a1ba43d..177c729b307c 100644
--- a/typo3/contrib/flowplayer/plugins/flowplayer.audio/src/actionscript/org/flowplayer/audio/AudioProviderFactory.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.audio/src/actionscript/org/flowplayer/audio/AudioProviderFactory.as
@@ -1 +1 @@
-/*
* Copyright 2008, 2009 Flowplayer Oy
*
* This file is part of FlowPlayer.
*
* FlowPlayer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* FlowPlayer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with FlowPlayer. If not, see <http://www.gnu.org/licenses/>.
*/
package org.flowplayer.audio {
import org.flowplayer.model.PluginFactory;
import flash.display.Sprite;
/**
* @author api
*/
public class AudioProviderFactory extends Sprite implements PluginFactory {
public function newPlugin():Object {
return new AudioProvider();
}
}
}
\ No newline at end of file
+/*
* Copyright 2008, 2009 Flowplayer Oy
*
* This file is part of FlowPlayer.
*
* FlowPlayer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* FlowPlayer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with FlowPlayer. If not, see <http://www.gnu.org/licenses/>.
*/
package org.flowplayer.audio {
import org.flowplayer.model.PluginFactory;
import flash.display.Sprite;
/**
* @author api
*/
public class AudioProviderFactory extends Sprite implements PluginFactory {
public function newPlugin():Object {
return new AudioProvider();
}
}
}
\ No newline at end of file
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions-3.2.9.swf b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions-3.2.9.swf
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions-3.2.9.swf
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions-3.2.9.swf
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/LICENSE.txt b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/LICENSE.txt
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/LICENSE.txt
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/LICENSE.txt
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/README.txt b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/README.txt
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/README.txt
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/README.txt
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/build.properties b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/build.properties
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/build.properties
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/build.properties
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/build.xml b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/build.xml
similarity index 99%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/build.xml
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/build.xml
index aaec26474dee..12e79dae2eae 100644
--- a/typo3/contrib/flowplayer/plugins/flowplayer.captions/build.xml
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/build.xml
@@ -2,7 +2,7 @@
<property file="build.generated.properties"/>
<property file="${user.home}/plugin.properties" />
<property file="build.properties" />
-
+
<property file="${devkit-dir}/plugin-build.properties" />
<import file="${devkit-dir}/plugin-build.xml"/>
<property name="flowplayer_lib" value="${devkit-dir}/flowplayer.swc" />
@@ -13,7 +13,7 @@
<property name="plugin-binary" value="${basename}.swf" />
<property name="plugin-binary-versioned" value="${basename}-${version}.swf" />
<property name="plugin-swc" value="${basename}.swc" />
-
+
<property name="plugin-main-class" value="org/flowplayer/captions/CaptionPluginFactory.as" />
<target name="release" description="makes a release" depends="build">
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/flowplayer.captions.js b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/flowplayer.captions.js
similarity index 79%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/example/flowplayer.captions.js
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/flowplayer.captions.js
index 788ab3641a09..fd4eaf17640a 100644
--- a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/flowplayer.captions.js
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/flowplayer.captions.js
@@ -1,6 +1,6 @@
/**
* flowplayer.playlist.js 3.0.0. Flowplayer JavaScript plugin.
- *
+ *
* This file is part of Flowplayer, http://flowplayer.org
*
* Author: Tero Piirainen, <support@flowplayer.org>
@@ -8,126 +8,126 @@
*
* Dual licensed under MIT and GPL 2+ licenses
* SEE: http://www.opensource.org/licenses
- *
+ *
* Version: 3.0.0 - Tue Nov 25 2008 16:30:11 GMT-0000 (GMT+00:00)
*/
(function($) {
-
+
$f.addPlugin("captions", function(container, options) {
-
+
// self points to current Player instance
- var self = this;
+ var self = this;
var api = null;
var opts = {
activeClass: 'active',
template: '<img src="images/${time}.jpg"/>',
padTime: true,
fadeTime: 500
- };
-
+ };
+
$.extend(opts, options);
var wrap = container;
var template = null;
-
- //wrap = $(wrap);
+
+ //wrap = $(wrap);
//alert(wrap.html());
- //var template = wrap.is(":empty") ? opts.template : wrap.html();
+ //var template = wrap.is(":empty") ? opts.template : wrap.html();
var el = "";
- //wrap.empty();
-
-
+ //wrap.empty();
+
+
function seek()
{
- var status = api.getStatus();
+ var status = api.getStatus();
alert(status.index);
}
-
+
function parseTemplate(values)
{
$.each(values, function(key, val) {
-
+
if (typeof val == 'object')
- {
+ {
parseTemplate(key);
} else {
if (key == "time") {
val = Math.round(val / 1000);
if (opts.padTime && val < 10) val = "0" + val;
}
-
+
el = el.replace("$\{" +key+ "\}", val).replace("$%7B" +key+ "%7D", val);
}
});
}
-
+
// onStart
self.onStart(function(clip) {
-
+
var index = 1;
-
- wrap = $(wrap);
- template = wrap.is(":empty") ? opts.template : wrap.html();
+
+ wrap = $(wrap);
+ template = wrap.is(":empty") ? opts.template : wrap.html();
wrap.fadeOut(opts.fadeTime).empty();
-
+
// wrap.empty();
-
- $.each(clip.cuepoints, function(key, val) {
-
+
+ $.each(clip.cuepoints, function(key, val) {
+
el = template;
if (val !== null) {
var time = Math.round(val[0].time / 1000);
parseTemplate(val[0]);
-
- el = $(el);
+
+ el = $(el);
el.attr("index",index);
index++;
- el.click(function() {
+ el.click(function() {
self.seek(time);
api.seekTo($(this).attr("index"));
//api.next();
});
-
+
wrap.append(el);
}
});
-
+
if (wrap.parent().css('display') == "none") {
wrap.show();
wrap.parent('div').fadeIn(opts.fadeTime);
} else {
wrap.fadeIn(opts.fadeTime);
}
-
-
+
+
$(wrap.parent()).scrollable({items:wrap,size:4, clickable:true, activeClass: opts.activeClass});
api = $(wrap.parent()).scrollable();
-
-
+
+
$("a.prevPage").click(function() {
- api.prevPage(500);
+ api.prevPage(500);
});
-
+
$("a.prevPage").mouseover(function() {
- api.prevPage(500);
+ api.prevPage(500);
});
-
+
$("a.nextPage").click(function() {
- api.nextPage(500);
- });
-
+ api.nextPage(500);
+ });
+
$("a.nextPage").mouseover(function() {
- api.nextPage(500);
- });
-
+ api.nextPage(500);
+ });
+
els = wrap.children();
-
- });
-
-
- self.onCuepoint(function(clip, cuepoint) {
-
+
+ });
+
+
+ self.onCuepoint(function(clip, cuepoint) {
+
//var cue = els.filter("[@time=" + cuepoint.time + "]");
//api.move();
api.next();
@@ -136,51 +136,51 @@
//self.getPlugin("scrollable").next();
//console.log(cue.text());
//alert(cuepoint.time);
- //alert("embedded cuepoint entered, time: " + cuepoint.time);
+ //alert("embedded cuepoint entered, time: " + cuepoint.time);
});
/*
- // onPause
+ // onPause
self.onPause(function(clip) {
- getEl(clip).removeClass(opts.playingClass).addClass(opts.pausedClass);
- });
-
+ getEl(clip).removeClass(opts.playingClass).addClass(opts.pausedClass);
+ });
+
// onResume
self.onResume(function(clip) {
- getEl(clip).removeClass(opts.pausedClass).addClass(opts.playingClass);
- });
-
+ getEl(clip).removeClass(opts.pausedClass).addClass(opts.playingClass);
+ });
+
// what happens when clip ends ?
if (!opts.loop && !manual) {
-
+
// stop the playback exept on the last clip, which is stopped by default
self.onBeforeFinish(function(clip) {
if (clip.index < els.length -1) {
return false;
}
- });
+ });
}*/
-
+
// on manual setups perform looping here
/*if (manual && opts.loop) {
self.onBeforeFinish(function(clip) {
var el = getEl(clip);
if (el.next().length) {
- el.next().click();
+ el.next().click();
} else {
- els.eq(0).click();
- }
- return false;
- });
- }*/
-
+ els.eq(0).click();
+ }
+ return false;
+ });
+ }*/
+
// onUnload
self.onUnload(function() {
- clearCSS();
+ clearCSS();
});
-
-
+
+
return self;
-
+
});
-
-})(jQuery);
+
+})(jQuery);
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/flvtool2-cuepoints.sh b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/flvtool2-cuepoints.sh
similarity index 99%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/example/flvtool2-cuepoints.sh
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/flvtool2-cuepoints.sh
index a69dc043e3d9..4adee0df69d5 100644
--- a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/flvtool2-cuepoints.sh
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/flvtool2-cuepoints.sh
@@ -39,12 +39,12 @@ if [ "$2" = "" ]
then FIL="cuepoints.xml"
else FIL="$2"
fi
-
+
# Write the header
echo "<?xml version=\"1.0\"?>" > $FIL
echo "<tags>" >> $FIL
echo " <!-- navigation cue points -->" >> $FIL
-
+
# Write the body
for N in $(seq 0 10 $LENGTH)
do
@@ -55,11 +55,10 @@ do
echo " <type>navigation</type>" >> $FIL
echo " </metatag>" >> $FIL
done
-
+
# Write the footer
echo "</tags>" >> $FIL
-
+
echo -e "An XML file specifying $LENGTH timestamps has been written to $FIL\n"
echo -e "To create a flash file with these cuepoints, use \"flvtool2 -AUPt cuepoints.xml input.flv output.flv\"\n"
-
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/left.png b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/left.png
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/left.png
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/left.png
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/right.png b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/right.png
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/right.png
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/right.png
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame00.jpg b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame00.jpg
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame00.jpg
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame00.jpg
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame01.jpg b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame01.jpg
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame01.jpg
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame01.jpg
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame02.jpg b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame02.jpg
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame02.jpg
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame02.jpg
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame03.jpg b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame03.jpg
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame03.jpg
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame03.jpg
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame04.jpg b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame04.jpg
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame04.jpg
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame04.jpg
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame05.jpg b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame05.jpg
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame05.jpg
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame05.jpg
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame06.jpg b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame06.jpg
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame06.jpg
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame06.jpg
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame07.jpg b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame07.jpg
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame07.jpg
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame07.jpg
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame08.jpg b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame08.jpg
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame08.jpg
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame08.jpg
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame09.jpg b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame09.jpg
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame09.jpg
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame09.jpg
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame10.jpg b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame10.jpg
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame10.jpg
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame10.jpg
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame11.jpg b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame11.jpg
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame11.jpg
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame11.jpg
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame12.jpg b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame12.jpg
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame12.jpg
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame12.jpg
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame13.jpg b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame13.jpg
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame13.jpg
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame13.jpg
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame14.jpg b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame14.jpg
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame14.jpg
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame14.jpg
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame15.jpg b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame15.jpg
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame15.jpg
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame15.jpg
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame16.jpg b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame16.jpg
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame16.jpg
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame16.jpg
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame17.jpg b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame17.jpg
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame17.jpg
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame17.jpg
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame18.jpg b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame18.jpg
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame18.jpg
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame18.jpg
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame19.jpg b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame19.jpg
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame19.jpg
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame19.jpg
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame20.jpg b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame20.jpg
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame20.jpg
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/images/thumbs/frame20.jpg
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/index.html.tmpl b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/index.html.tmpl
similarity index 92%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/example/index.html.tmpl
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/index.html.tmpl
index 918fdba1c07c..60b9b54ca79e 100644
--- a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/index.html.tmpl
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/index.html.tmpl
@@ -1,11 +1,11 @@
-<!DOCTYPE html
+<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
- Flowplayer website, forums & jQuery Tools by Tero Piirainen
-
- Prefer web standards over Flash. Video is the only exception.
+<!--
+ Flowplayer website, forums & jQuery Tools by Tero Piirainen
+
+ Prefer web standards over Flash. Video is the only exception.
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@@ -13,37 +13,37 @@
<head>
<title>Flowplayer - Flash Video Player for the Web</title>
- <meta name="Description" content="Embed video streams to your website. Superior alternative to YouTube. Open Sourced under the GPL license. No other software makes this smoother." />
- <meta name="Keywords" content="video player for the web, flash video player,web media player,free video player,free flv player,mp4 flash player,mp4 player,open source video player,flash 9 video,flash video,web video,flv player,flv video" />
-
+ <meta name="Description" content="Embed video streams to your website. Superior alternative to YouTube. Open Sourced under the GPL license. No other software makes this smoother." />
+ <meta name="Keywords" content="video player for the web, flash video player,web media player,free video player,free flv player,mp4 flash player,mp4 player,open source video player,flash 9 video,flash video,web video,flv player,flv video" />
+
+
-
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<meta name="Distribution" content="Global" />
<meta name="Author" content="Tero Piirainen" />
- <meta name="Robots" content="index,follow" />
-
-
+ <meta name="Robots" content="index,follow" />
+
+
<link rel="stylesheet" type="text/css" href="http://static.flowplayer.org/css/global-0.25.css" />
-
-
- <script type="text/javascript" src="http://static.flowplayer.org/js/flowplayer-3.2.2.min.js"></script>
+
+
+ <script type="text/javascript" src="http://static.flowplayer.org/js/flowplayer-3.2.2.min.js"></script>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.min.js"></script>
<script type="text/javascript" src="http://cdn.jquerytools.org/1.2.3/jquery.tools.min.js"></script>
<link rel="stylesheet" type="text/css" href="http://static.flowplayer.org/tools/css/overlay-apple.css"/>
- <script type="text/javascript" src="http://flowplayer.org/tools/download/1.2.3/overlay/overlay.apple.min.js"></script>
-
+ <script type="text/javascript" src="http://flowplayer.org/tools/download/1.2.3/overlay/overlay.apple.min.js"></script>
+
<script type="text/javascript" src="flowplayer.captions.js"></script>
-
+
<style type="text/css">
div.overlay {
- width:1024px;
+ width:1024px;
height:432px;
}
-
+
#cuethumbs {
height:115px;
background:#f5fbfb url(/img/global/gradient/h150.png) repeat-x;
@@ -51,25 +51,25 @@
border:1px solid #ddd;
width: 780px;
}
-
+
#cuethumbs div.items {
height:115px;
width: 700px;
float:left;
}
-
+
#cuethumbs div.items img:hover {
border:3px solid #000000;
}
-
+
active {
border:3px solid #CCCCCC;
}
-
+
#cuethumbs div.items img.active {
border:3px solid #CCCCCC;
}
-
+
#cuethumbs div.items img {
border:1px solid #000000;
float:left;
@@ -78,33 +78,33 @@
margin-right:7px;
width:150px;
}
-
+
#cuethumbs div.items a:hover {
background-position:-140px 0;
color:#000;
}
-
+
#cuethumbs div.items a.playing {
- background-position:-280px 0;
+ background-position:-280px 0;
color:#000;
}
-
+
#cuethumbs div.items a.paused {
- background-position:-420px 0;
+ background-position:-420px 0;
color:#000;
}
-
+
#cuethumbs div.items a.progress {
opacity:0.8;
}
-
- #cuethumbs div.items em {
+
+ #cuethumbs div.items em {
float:right;
margin-top:15px;
color:red;
font-style:normal;
}
-
+
#cuethumbs a.nextPage, #cuethumbs a.prevPage {
display:block;
width:18px;
@@ -114,38 +114,38 @@
cursor:pointer;
float:left;
}
-
+
#cuethumbs a.nextPage:hover, #cuethumbs a.prevPage:hover {
- background-position:0px -18px;
+ background-position:0px -18px;
}
-
+
#cuethumbs a.nextPage {
- background-image:url(images/right.png);
+ background-image:url(images/right.png);
}
-
+
</style>
-
+
<!--[if lt IE 7]>
<style type="text/css">
@import "http://static.flowplayer.org/css/ie6.css?v=0.2";
</style>
<![endif]-->
-
+
<!--[if lt IE 8]>
<style>
html { overflow-x:hidden; }
#content ol, #content ul {margin-left: 50px; }
</style>
- <![endif]-->
+ <![endif]-->
</head>
<body id="plugins_captions">
-<div id="wrap">
+<div id="wrap">
- <div id="content">
+ <div id="content">
<h1>
Flash plugin: <strong>Captions</strong>
@@ -184,28 +184,28 @@
</p>
<!-- player container-->
-<a
- href="http://vod01.netdna.com/vod/demo.flowplayer/flowplayer-700.flv"
- style="display:block;width:500px;height:330px;"
+<a
+ href="http://vod01.netdna.com/vod/demo.flowplayer/flowplayer-700.flv"
+ style="display:block;width:500px;height:330px;"
id="player">
-
+
<!-- splash image inside the container -->
<img src="http://www.flowplayer.org/img/home/flow_eye.jpg" alt="Search engine friendly content" />
-
+
</a>
<!-- Flowplayer installation and configuration -->
<script language="JavaScript">
$f("player", "@PLAYER_SWF@", {
- clip: {
-
+ clip: {
+
// here is our high quality movie
//url: 'mp4:buffalo_soldiers.mp4',
url: 'http://video.flowplayer.org/flowplayer.flv',
// this is the SubRib file with captions info
captionUrl: 'http://releases.flowplayer.org/data/buffalo.srt',
-
+
// we want to use RTMP since this is a 1,5 hour long movie.
//provider: 'rtmp'
},
@@ -214,17 +214,17 @@ $f("player", "@PLAYER_SWF@", {
filter: 'org.flowplayer.captions.*'
},
plugins: {
-
+
// the captions plugin
captions: {
url: '@MAIN_PLAYER_SWF@',
-
+
// pointer to a content plugin (see below)
captionTarget: 'content'
},
-
+
/*
- configure a content plugin so that it
+ configure a content plugin so that it
looks good for showing subtitles
*/
content: {
@@ -235,59 +235,59 @@ $f("player", "@PLAYER_SWF@", {
backgroundGradient: 'none',
border: 0,
textDecoration: 'outline',
- style: {
- body: {
- fontSize: 14,
+ style: {
+ body: {
+ fontSize: 14,
fontFamily: 'Arial',
textAlign: 'center',
color: '#ffffff'
- }
- }
+ }
+ }
},
-
+
// streaming plugin configuration
- rtmp: {
- url: '../flowplayer.rtmp.swf',
+ rtmp: {
+ url: '../flowplayer.rtmp.swf',
netConnectionUrl: 'rtmp://flashy.flowplayer.org:1935/fastplay'
},
-
+
// change default skin to "tube"
controls: {
url: '../flowplayer.controls.swf'
}
-
+
}
});
-</script>
+</script>
<div class="box code">
<pre><code class="javascript">$f("player", "@PLAYER_SWF@", {
- clip: {
-
+ clip: {
+
// here is our high quality movie
url: 'mp4:buffalo_soldiers.mp4',
-
+
// this is the SubRib file with captions info
captionUrl: 'http://releases.flowplayer.org/data/buffalo.srt',
-
+
// we want to use RTMP since this is a 1,5 hour long movie.
provider: 'rtmp'
},
plugins: {
-
+
// the captions plugin
captions: {
url: '@MAIN_PLAYER_SWF@',
-
+
// pointer to a content plugin (see below)
captionTarget: 'content'
},
-
+
/*
- configure a content plugin so that it
+ configure a content plugin so that it
looks good for showing subtitles
*/
content: {
@@ -298,27 +298,27 @@ $f("player", "@PLAYER_SWF@", {
backgroundGradient: 'none',
border: 0,
textDecoration: 'outline',
- style: {
- body: {
- fontSize: 14,
+ style: {
+ body: {
+ fontSize: 14,
fontFamily: 'Arial',
textAlign: 'center',
color: '#ffffff'
- }
- }
+ }
+ }
},
-
+
// streaming plugin configuration
- rtmp: {
- url: '../flowplayer.rtmp.swf',
+ rtmp: {
+ url: '../flowplayer.rtmp.swf',
netConnectionUrl: 'rtmp://flashy.flowplayer.org:1935/fastplay'
},
-
+
// change default skin to "tube"
controls: {
url: '../flowplayer.controls.swf'
}
-
+
}
});</code></pre>
</div>
@@ -353,7 +353,7 @@ $f("player", "@PLAYER_SWF@", {
<td></td>
<td>
- A json array of cuepoint objects ie
+ A json array of cuepoint objects ie
{
time: 0,
name: 'cue1',
@@ -442,7 +442,7 @@ $f("player", "@PLAYER_SWF@", {
<td class="code">loadCaptions(clipIndex, captions)</td>
<td class="code" nowrap>loadCaptions(0, captions)</td>
<td>
- Loads a json array of captions for the specified clip.
+ Loads a json array of captions for the specified clip.
</td>
</tr>
</table>
@@ -698,7 +698,7 @@ $f("embedded", "@PLAYER_SWF@", {
<h2>Json Config Captions Example</h2>
<p>
- This example is Captions based on a Json config.
+ This example is Captions based on a Json config.
</p>
<a class="player" id="json">
@@ -739,7 +739,7 @@ $f("json", "@PLAYER_SWF@", {
text: '3rd caption using a small black font'
}
},
-
+
]
},
log: {
@@ -763,14 +763,14 @@ $f("json", "@PLAYER_SWF@", {
backgroundGradient: 'none',
border: 0,
textDecoration: 'outline',
- style: {
- body: {
- fontSize: 14,
+ style: {
+ body: {
+ fontSize: 14,
fontFamily: 'Arial',
textAlign: 'center',
color: '#ffffff'
- }
- }
+ }
+ }
},
}
});
@@ -809,7 +809,7 @@ $f("json", "@PLAYER_SWF@", {
text: '3rd caption using a small black font'
}
},
-
+
]
},
plugins: {
@@ -899,7 +899,7 @@ $f("javascript-plugin", "@PLAYER_SWF@", {
text: '3rd caption using a small black font'
}
},
-
+
]
},
log: {
@@ -923,17 +923,17 @@ $f("javascript-plugin", "@PLAYER_SWF@", {
backgroundGradient: 'none',
border: 0,
textDecoration: 'outline',
- style: {
- body: {
- fontSize: 14,
+ style: {
+ body: {
+ fontSize: 14,
fontFamily: 'Arial',
textAlign: 'center',
color: '#ffffff'
- }
- }
+ }
+ }
},
}
-}).captions("div.items", {});
+}).captions("div.items", {});
</script>
<div id="cuethumbs" style="display:none;">
@@ -977,7 +977,7 @@ $f("javascript-plugin", "@PLAYER_SWF@", {
text: '3rd caption using a small black font'
}
},
-
+
]
},
plugins: {
@@ -1011,7 +1011,7 @@ $f("javascript-plugin", "@PLAYER_SWF@", {
}
}
}
-}).captions("div.items", {});
+}).captions("div.items", {});
</code></pre>
</div>
@@ -1037,20 +1037,20 @@ $f("javascript-plugin", "@PLAYER_SWF@", {
<td class="code">template <div class="type">string</div></td>
<td class="code default"><img src="images/${time}.jpg"/></td>
<td class="description">
- The template config to be used for generating the thumbnails. The fields of the cuepoints are used for the template like ${time}.
- If the wrapper has the template set, it will be used instead of the template config.
+ The template config to be used for generating the thumbnails. The fields of the cuepoints are used for the template like ${time}.
+ If the wrapper has the template set, it will be used instead of the template config.
</td>
</tr>
<tr>
<td class="code">fadeTime <div class="type">int</div></td>
<td class="code default">100</td>
<td class="description">
- The interval time for fading the wrapper in and out. Useful for hiding the wrapper if a template is set in it.
+ The interval time for fading the wrapper in and out. Useful for hiding the wrapper if a template is set in it.
</td>
</tr>
</table>
- </div>
+ </div>
</div>
</body>
</html>
\ No newline at end of file
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/tools.scrollable-1.1.2.js b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/tools.scrollable-1.1.2.js
similarity index 63%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/example/tools.scrollable-1.1.2.js
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/tools.scrollable-1.1.2.js
index 319357ceb898..538bb2a15231 100644
--- a/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/tools.scrollable-1.1.2.js
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/example/tools.scrollable-1.1.2.js
@@ -1,6 +1,6 @@
/**
* tools.scrollable 1.1.2 - Scroll your HTML with eye candy.
- *
+ *
* Copyright (c) 2009 Tero Piirainen
* http://flowplayer.org/tools/scrollable.html
*
@@ -9,437 +9,437 @@
*
* Launch : March 2008
* Date: ${date}
- * Revision: ${revision}
+ * Revision: ${revision}
*/
-(function($) {
-
+(function($) {
+
// static constructs
$.tools = $.tools || {};
-
+
$.tools.scrollable = {
version: '1.1.2',
-
+
conf: {
-
+
// basics
size: 5,
vertical: false,
speed: 400,
- keyboard: true,
-
+ keyboard: true,
+
// by default this is the same as size
- keyboardSteps: null,
-
+ keyboardSteps: null,
+
// other
disabledClass: 'disabled',
- hoverClass: null,
+ hoverClass: null,
clickable: true,
- activeClass: 'active',
+ activeClass: 'active',
easing: 'swing',
loop: false,
-
+
items: '.items',
item: null,
-
- // navigational elements
+
+ // navigational elements
prev: '.prev',
next: '.next',
prevPage: '.prevPage',
- nextPage: '.nextPage',
+ nextPage: '.nextPage',
api: false
-
+
// CALLBACKS: onBeforeSeek, onSeek, onReload
- }
+ }
};
-
- var current;
-
+
+ var current;
+
// constructor
- function Scrollable(root, conf) {
-
+ function Scrollable(root, conf) {
+
// current instance
var self = this, $self = $(this),
horizontal = !conf.vertical,
wrap = root.children(),
index = 0,
- forward;
-
-
+ forward;
+
+
if (!current) { current = self; }
-
+
// bind all callbacks from configuration
$.each(conf, function(name, fn) {
if ($.isFunction(fn)) { $self.bind(name, fn); }
});
-
+
if (wrap.length > 1) { wrap = $(conf.items, root); }
-
+
// navigational items can be anywhere when globalNav = true
function find(query) {
var els = $(query);
- return conf.globalNav ? els : root.parent().find(query);
+ return conf.globalNav ? els : root.parent().find(query);
}
-
+
// to be used by plugins
root.data("finder", find);
-
+
// get handle to navigational elements
var prev = find(conf.prev),
next = find(conf.next),
prevPage = find(conf.prevPage),
nextPage = find(conf.nextPage);
-
+
// methods
$.extend(self, {
-
+
getIndex: function() {
- return index;
+ return index;
},
-
+
getClickIndex: function() {
- var items = self.getItems();
- return items.index(items.filter("." + conf.activeClass));
+ var items = self.getItems();
+ return items.index(items.filter("." + conf.activeClass));
},
-
+
getConf: function() {
- return conf;
+ return conf;
},
-
+
getSize: function() {
- return self.getItems().size();
+ return self.getItems().size();
},
-
+
getPageAmount: function() {
- return Math.ceil(this.getSize() / conf.size);
+ return Math.ceil(this.getSize() / conf.size);
},
-
+
getPageIndex: function() {
- return Math.ceil(index / conf.size);
+ return Math.ceil(index / conf.size);
},
getNaviButtons: function() {
- return prev.add(next).add(prevPage).add(nextPage);
+ return prev.add(next).add(prevPage).add(nextPage);
},
-
+
getRoot: function() {
- return root;
+ return root;
},
-
+
getItemWrap: function() {
- return wrap;
+ return wrap;
},
-
+
getItems: function() {
- return wrap.children(conf.item);
+ return wrap.children(conf.item);
},
-
+
getVisibleItems: function() {
- return self.getItems().slice(index, index + conf.size);
+ return self.getItems().slice(index, index + conf.size);
},
-
- /* all seeking functions depend on this */
+
+ /* all seeking functions depend on this */
seekTo: function(i, time, fn) {
- if (i < 0) { i = 0; }
-
-
+ if (i < 0) { i = 0; }
+
+
// nothing happens
- if (index === i) { return self; }
-
+ if (index === i) { return self; }
+
// function given as second argument
if ($.isFunction(time)) {
fn = time;
}
- // seeking exceeds the end
-
- if (i > self.getSize() - conf.size) {
- return conf.loop ? self.begin() : this.end();
- }
-
-
- var item = self.getItems().eq(i);
- if (!item.length) { return self; }
-
+ // seeking exceeds the end
+
+ if (i > self.getSize() - conf.size) {
+ return conf.loop ? self.begin() : this.end();
+ }
+
+
+ var item = self.getItems().eq(i);
+ if (!item.length) { return self; }
+
// onBeforeSeek
var e = $.Event("onBeforeSeek");
- $self.trigger(e, [i]);
-
- if (e.isDefaultPrevented()) { return self; }
-
+ $self.trigger(e, [i]);
+
+ if (e.isDefaultPrevented()) { return self; }
+
// get the (possibly altered) speed
if (time === undefined || $.isFunction(time)) { time = conf.speed; }
-
+
function callback() {
if (fn) { fn.call(self, i); }
$self.trigger("onSeek", [i]);
}
-
-
+
+
if (horizontal) {
- wrap.animate({left: -item.position().left}, time, conf.easing, callback);
+ wrap.animate({left: -item.position().left}, time, conf.easing, callback);
} else {
- wrap.animate({top: -item.position().top}, time, conf.easing, callback);
+ wrap.animate({top: -item.position().top}, time, conf.easing, callback);
}
-
-
+
+
current = self;
- index = i;
-
+ index = i;
+
// onStart
e = $.Event("onStart");
- $self.trigger(e, [i]);
- if (e.isDefaultPrevented()) { return self; }
-
-
+ $self.trigger(e, [i]);
+ if (e.isDefaultPrevented()) { return self; }
+
+
/* default behaviour */
-
+
// prev/next buttons disabled flags
prev.add(prevPage).toggleClass(conf.disabledClass, i === 0);
next.add(nextPage).toggleClass(conf.disabledClass, i >= self.getSize() - conf.size);
-
- return self;
- },
-
-
+
+ return self;
+ },
+
+
move: function(offset, time, fn) {
forward = offset > 0;
return this.seekTo(index + offset, time, fn);
},
-
+
next: function(time, fn) {
- return this.move(1, time, fn);
+ return this.move(1, time, fn);
},
-
+
prev: function(time, fn) {
- return this.move(-1, time, fn);
+ return this.move(-1, time, fn);
},
-
+
movePage: function(offset, time, fn) {
forward = offset > 0;
var steps = conf.size * offset;
-
+
var i = index % conf.size;
if (i > 0) {
- steps += (offset > 0 ? -i : conf.size - i);
+ steps += (offset > 0 ? -i : conf.size - i);
}
-
- return this.move(steps, time, fn);
+
+ return this.move(steps, time, fn);
},
-
+
prevPage: function(time, fn) {
return this.movePage(-1, time, fn);
- },
-
+ },
+
nextPage: function(time, fn) {
return this.movePage(1, time, fn);
- },
-
+ },
+
setPage: function(page, time, fn) {
return this.seekTo(page * conf.size, time, fn);
- },
-
+ },
+
begin: function(time, fn) {
forward = false;
- return this.seekTo(0, time, fn);
+ return this.seekTo(0, time, fn);
},
-
+
end: function(time, fn) {
forward = true;
var to = this.getSize() - conf.size;
- return to > 0 ? this.seekTo(to, time, fn) : self;
+ return to > 0 ? this.seekTo(to, time, fn) : self;
},
-
- reload: function() {
+
+ reload: function() {
$self.trigger("onReload");
return self;
- },
-
+ },
+
focus: function() {
current = self;
return self;
},
-
+
click: function(i) {
-
- var item = self.getItems().eq(i),
+
+ var item = self.getItems().eq(i),
klass = conf.activeClass,
- size = conf.size;
-
+ size = conf.size;
+
// check that i is sane
if (i < 0 || i >= self.getSize()) { return self; }
-
- // size == 1
+
+ // size == 1
if (size == 1) {
if (conf.loop) { return self.next(); }
-
- if (i === 0 || i == self.getSize() -1) {
- forward = (forward === undefined) ? true : !forward;
+
+ if (i === 0 || i == self.getSize() -1) {
+ forward = (forward === undefined) ? true : !forward;
}
- return forward === false ? self.prev() : self.next();
- }
-
+ return forward === false ? self.prev() : self.next();
+ }
+
// size == 2
if (size == 2) {
if (i == index) { i--; }
self.getItems().removeClass(klass);
- item.addClass(klass);
+ item.addClass(klass);
return self.seekTo(i, time, fn);
- }
-
- if (!item.hasClass(klass)) {
+ }
+
+ if (!item.hasClass(klass)) {
self.getItems().removeClass(klass);
item.addClass(klass);
var delta = Math.floor(size / 2);
var to = i - delta;
-
+
// next to last item must work
- if (to > self.getSize() - size) {
- to = self.getSize() - size;
+ if (to > self.getSize() - size) {
+ to = self.getSize() - size;
}
-
+
if (to !== i) {
- return self.seekTo(to);
+ return self.seekTo(to);
}
}
-
+
return self;
},
-
+
// bind / unbind
bind: function(name, fn) {
$self.bind(name, fn);
- return self;
- },
-
+ return self;
+ },
+
unbind: function(name) {
$self.unbind(name);
- return self;
- }
-
+ return self;
+ }
+
});
-
- // callbacks
+
+ // callbacks
$.each("onBeforeSeek,onStart,onSeek,onReload".split(","), function(i, ev) {
self[ev] = function(fn) {
- return self.bind(ev, fn);
+ return self.bind(ev, fn);
};
- });
-
-
- // prev button
+ });
+
+
+ // prev button
prev.addClass(conf.disabledClass).click(function() {
- self.prev();
+ self.prev();
});
-
+
// next button
- next.click(function() {
- self.next();
+ next.click(function() {
+ self.next();
});
-
+
// prev page button
- nextPage.click(function() {
- self.nextPage();
+ nextPage.click(function() {
+ self.nextPage();
});
-
+
if (self.getSize() < conf.size) {
- next.add(nextPage).addClass(conf.disabledClass);
+ next.add(nextPage).addClass(conf.disabledClass);
}
-
+
// next page button
- prevPage.addClass(conf.disabledClass).click(function() {
- self.prevPage();
- });
-
-
+ prevPage.addClass(conf.disabledClass).click(function() {
+ self.prevPage();
+ });
+
+
// hover
- var hc = conf.hoverClass, keyId = "keydown." + Math.random().toString().substring(10);
-
- self.onReload(function() {
+ var hc = conf.hoverClass, keyId = "keydown." + Math.random().toString().substring(10);
+
+ self.onReload(function() {
// hovering
if (hc) {
self.getItems().hover(function() {
- $(this).addClass(hc);
+ $(this).addClass(hc);
}, function() {
- $(this).removeClass(hc);
- });
+ $(this).removeClass(hc);
+ });
}
-
+
// clickable
if (conf.clickable) {
self.getItems().each(function(i) {
$(this).unbind("click.scrollable").bind("click.scrollable", function(e) {
- if ($(e.target).is("a")) { return; }
+ if ($(e.target).is("a")) { return; }
return self.click(i);
});
});
- }
-
- // keyboard
- if (conf.keyboard) {
-
+ }
+
+ // keyboard
+ if (conf.keyboard) {
+
// keyboard works on one instance at the time. thus we need to unbind first
$(document).unbind(keyId).bind(keyId, function(evt) {
// do nothing with CTRL / ALT buttons
if (evt.altKey || evt.ctrlKey) { return; }
-
+
// do nothing for unstatic and unfocused instances
if (conf.keyboard != 'static' && current != self) { return; }
-
- var s = conf.keyboardSteps;
-
- if (horizontal && (evt.keyCode == 37 || evt.keyCode == 39)) {
+
+ var s = conf.keyboardSteps;
+
+ if (horizontal && (evt.keyCode == 37 || evt.keyCode == 39)) {
self.move(evt.keyCode == 37 ? -s : s);
return evt.preventDefault();
- }
-
+ }
+
if (!horizontal && (evt.keyCode == 38 || evt.keyCode == 40)) {
self.move(evt.keyCode == 38 ? -s : s);
return evt.preventDefault();
}
-
+
return true;
-
+
});
-
+
} else {
- $(document).unbind(keyId);
- }
+ $(document).unbind(keyId);
+ }
});
-
- self.reload();
-
- }
-
+ self.reload();
+
+ }
+
+
// jQuery plugin implementation
- $.fn.scrollable = function(conf) {
-
+ $.fn.scrollable = function(conf) {
+
// already constructed --> return API
var el = this.eq(typeof conf == 'number' ? conf : 0).data("scrollable");
- if (el) { return el; }
-
+ if (el) { return el; }
+
var globals = $.extend({}, $.tools.scrollable.conf);
conf = $.extend(globals, conf);
-
+
conf.keyboardSteps = conf.keyboardSteps || conf.size;
-
- this.each(function() {
+
+ this.each(function() {
el = new Scrollable($(this), conf);
- $(this).data("scrollable", el);
+ $(this).data("scrollable", el);
});
-
- return conf.api ? el: this;
-
+
+ return conf.api ? el: this;
+
};
-
-
+
+
})(jQuery);
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CCButton.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CCButton.as
similarity index 99%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CCButton.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CCButton.as
index dd323355aeaa..d2b75cb5b1b3 100644
--- a/typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CCButton.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CCButton.as
@@ -27,7 +27,7 @@ package org.flowplayer.captions {
_background.buttonMode = true;
addChild(_background);
createText(player);
-
+
isDown = true;
}
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/Caption.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/Caption.as
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/Caption.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/Caption.as
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionLoader.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionLoader.as
similarity index 96%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionLoader.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionLoader.as
index a911efe9d122..f38ef8293ced 100644
--- a/typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionLoader.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionLoader.as
@@ -82,12 +82,12 @@ package org.flowplayer.captions {
});
// load files
iterateCaptions(function(clip:Clip):void {
- if (clip.getCustomProperty("captions")) {
+ if (clip.getCustomProperty("captions")) {
_captionData[clip] = clip.getCustomProperty("captions");
checkAllLoaded();
- } else {
- loadCaptionFile(clip, clip.getCustomProperty("captionUrl") as String);
- }
+ } else {
+ loadCaptionFile(clip, clip.getCustomProperty("captionUrl") as String);
+ }
});
}
@@ -124,11 +124,11 @@ package org.flowplayer.captions {
}
protected function doAddCaptions(clip:Clip, captions:Array):void {
- parseCuePoints(clip, captions);
+ parseCuePoints(clip, captions);
_numCaptionsLoaded++;
log.debug(_numCaptionsLoaded + " clip captions out of " + _totalCaptions + " loaded");
if (_numCaptionsLoaded == _totalCaptions && ! _allLoaded) {
- log.debug("all caption files loaded, executing callback");
+ log.debug("all caption files loaded, executing callback");
_allLoaded = true;
_loadedCallback();
}
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionLoading.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionLoading.as
similarity index 99%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionLoading.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionLoading.as
index 543313fb5835..e568d658b26e 100644
--- a/typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionLoading.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionLoading.as
@@ -1,4 +1,4 @@
-/*
+/*
* Author: Anssi Piirainen, <api@iki.fi>
*
* Copyright (c) 2010 Flowplayer Oy
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionPlugin.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionPlugin.as
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionPlugin.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionPlugin.as
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionPluginFactory.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionPluginFactory.as
similarity index 98%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionPluginFactory.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionPluginFactory.as
index cb2070683aa3..785a0202569f 100644
--- a/typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionPluginFactory.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionPluginFactory.as
@@ -1,4 +1,4 @@
-/*
+/*
* Author: Anssi Piirainen, <api@iki.fi>
*
* Copyright (c) 2010 Flowplayer Oy
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionViewDelegate.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionViewDelegate.as
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionViewDelegate.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/CaptionViewDelegate.as
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/Config.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/Config.as
similarity index 99%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/Config.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/Config.as
index 91de2c252e0b..e9e66ba83054 100644
--- a/typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/Config.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/Config.as
@@ -86,6 +86,3 @@ package org.flowplayer.captions
}
}
-
-
-
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/parsers/AbstractCaptionParser.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/parsers/AbstractCaptionParser.as
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/parsers/AbstractCaptionParser.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/parsers/AbstractCaptionParser.as
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/parsers/CaptionParser.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/parsers/CaptionParser.as
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/parsers/CaptionParser.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/parsers/CaptionParser.as
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/parsers/JSONParser.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/parsers/JSONParser.as
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/parsers/JSONParser.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/parsers/JSONParser.as
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/parsers/SRTParser.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/parsers/SRTParser.as
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/parsers/SRTParser.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/parsers/SRTParser.as
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/parsers/TTXTParser.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/parsers/TTXTParser.as
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/parsers/TTXTParser.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/actionscript/org/flowplayer/captions/parsers/TTXTParser.as
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/src/flash/closebutton.fla b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/flash/closebutton.fla
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/src/flash/closebutton.fla
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/flash/closebutton.fla
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/src/flash/closebutton.swc b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/flash/closebutton.swc
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/src/flash/closebutton.swc
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/flash/closebutton.swc
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.captions/src/flash/closebutton.swf b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/flash/closebutton.swf
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.captions/src/flash/closebutton.swf
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.captions/src/flash/closebutton.swf
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.content-3.2.8.swf b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.content-3.2.8.swf
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.content-3.2.8.swf
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.content-3.2.8.swf
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.content/LICENSE.txt b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.content/LICENSE.txt
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.content/LICENSE.txt
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.content/LICENSE.txt
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.content/README.txt b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.content/README.txt
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.content/README.txt
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.content/README.txt
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.content/build.properties b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.content/build.properties
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.content/build.properties
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.content/build.properties
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.content/build.xml b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.content/build.xml
similarity index 97%
rename from typo3/contrib/flowplayer/plugins/flowplayer.content/build.xml
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.content/build.xml
index c8e3a6bc197c..109e1fc9074f 100644
--- a/typo3/contrib/flowplayer/plugins/flowplayer.content/build.xml
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.content/build.xml
@@ -1,30 +1,30 @@
-<project name="Flowplayer content" default="deploy">
- <property file="build.generated.properties"/>
-
- <property file="${user.home}/plugin.properties" />
- <property file="build.properties" />
-
- <property file="${devkit-dir}/plugin-build.properties" />
- <import file="${devkit-dir}/plugin-build.xml"/>
- <property name="flowplayer_lib" value="${devkit-dir}/flowplayer.swc" />
-
-
- <property name="shortname" value="content" />
- <property name="basename" value="flowplayer.${shortname}" />
- <property name="releasedir" value="${basename}" />
- <property name="plugin-binary" value="${basename}.swf" />
- <property name="plugin-binary-versioned" value="${basename}-${version}.swf" />
- <property name="plugin-main-class" value="org/flowplayer/content/Content.as" />
- <property name="library-path" value="src/flash" />
-
- <target name="release" description="makes a release" depends="build">
- <copyrelease targetdir="flowplayer.content">
- <releasefiles>
- <fileset dir="${build-dir}">
- <include name="${plugin-binary-versioned}"/>
- </fileset>
- </releasefiles>
- </copyrelease>
- </target>
-
+<project name="Flowplayer content" default="deploy">
+ <property file="build.generated.properties"/>
+
+ <property file="${user.home}/plugin.properties" />
+ <property file="build.properties" />
+
+ <property file="${devkit-dir}/plugin-build.properties" />
+ <import file="${devkit-dir}/plugin-build.xml"/>
+ <property name="flowplayer_lib" value="${devkit-dir}/flowplayer.swc" />
+
+
+ <property name="shortname" value="content" />
+ <property name="basename" value="flowplayer.${shortname}" />
+ <property name="releasedir" value="${basename}" />
+ <property name="plugin-binary" value="${basename}.swf" />
+ <property name="plugin-binary-versioned" value="${basename}-${version}.swf" />
+ <property name="plugin-main-class" value="org/flowplayer/content/Content.as" />
+ <property name="library-path" value="src/flash" />
+
+ <target name="release" description="makes a release" depends="build">
+ <copyrelease targetdir="flowplayer.content">
+ <releasefiles>
+ <fileset dir="${build-dir}">
+ <include name="${plugin-binary-versioned}"/>
+ </fileset>
+ </releasefiles>
+ </copyrelease>
+ </target>
+
</project>
\ No newline at end of file
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.content/src/actionscript/org/flowplayer/content/CloseButton.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.content/src/actionscript/org/flowplayer/content/CloseButton.as
similarity index 95%
rename from typo3/contrib/flowplayer/plugins/flowplayer.content/src/actionscript/org/flowplayer/content/CloseButton.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.content/src/actionscript/org/flowplayer/content/CloseButton.as
index 208b8ff8afc9..773e812d7d3d 100644
--- a/typo3/contrib/flowplayer/plugins/flowplayer.content/src/actionscript/org/flowplayer/content/CloseButton.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.content/src/actionscript/org/flowplayer/content/CloseButton.as
@@ -1 +1 @@
-/*
* This file is part of Flowplayer, http://flowplayer.org
*
* By: Anssi Piirainen, <support@flowplayer.org>
* Copyright (c) 2008-2011 Flowplayer Oy *
* Released under the MIT License:
* http://www.opensource.org/licenses/mit-license.php
*/
package org.flowplayer.content {
import flash.display.DisplayObject;
import flash.display.Sprite;
import flash.events.MouseEvent;
/**
* @author api
*/
internal class CloseButton extends Sprite {
private var _icon:DisplayObject;
public function CloseButton(icon:DisplayObject = null) {
_icon = icon || new CloseIcon();
_icon.width = 10;
_icon.height = 10;
addChild(_icon);
addEventListener(MouseEvent.MOUSE_OVER, onMouseOver);
addEventListener(MouseEvent.MOUSE_OUT, onMouseOut);
onMouseOut();
buttonMode = true;
}
private function onMouseOut(event:MouseEvent = null):void {
_icon.alpha = 0.7;
}
private function onMouseOver(event:MouseEvent):void {
_icon.alpha = 1;
}
}
}
\ No newline at end of file
+/*
* This file is part of Flowplayer, http://flowplayer.org
*
* By: Anssi Piirainen, <support@flowplayer.org>
* Copyright (c) 2008-2011 Flowplayer Oy *
* Released under the MIT License:
* http://www.opensource.org/licenses/mit-license.php
*/
package org.flowplayer.content {
import flash.display.DisplayObject;
import flash.display.Sprite;
import flash.events.MouseEvent;
/**
* @author api
*/
internal class CloseButton extends Sprite {
private var _icon:DisplayObject;
public function CloseButton(icon:DisplayObject = null) {
_icon = icon || new CloseIcon();
_icon.width = 10;
_icon.height = 10;
addChild(_icon);
addEventListener(MouseEvent.MOUSE_OVER, onMouseOver);
addEventListener(MouseEvent.MOUSE_OUT, onMouseOut);
onMouseOut();
buttonMode = true;
}
private function onMouseOut(event:MouseEvent = null):void {
_icon.alpha = 0.7;
}
private function onMouseOver(event:MouseEvent):void {
_icon.alpha = 1;
}
}
}
\ No newline at end of file
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.content/src/actionscript/org/flowplayer/content/Content.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.content/src/actionscript/org/flowplayer/content/Content.as
similarity index 99%
rename from typo3/contrib/flowplayer/plugins/flowplayer.content/src/actionscript/org/flowplayer/content/Content.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.content/src/actionscript/org/flowplayer/content/Content.as
index 43606d4be6a2..23e8a57a1722 100644
--- a/typo3/contrib/flowplayer/plugins/flowplayer.content/src/actionscript/org/flowplayer/content/Content.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.content/src/actionscript/org/flowplayer/content/Content.as
@@ -1 +1 @@
-/*
* This file is part of Flowplayer, http://flowplayer.org
*
* By: Anssi Piirainen, <support@flowplayer.org>
* Copyright (c) 2008-2011 Flowplayer Oy *
* Released under the MIT License:
* http://www.opensource.org/licenses/mit-license.php
*/
package org.flowplayer.content {
import flash.display.DisplayObject;
import flash.events.MouseEvent;
import flash.filters.DropShadowFilter;
import org.flowplayer.controller.ResourceLoader;
import org.flowplayer.model.DisplayPluginModel;
import org.flowplayer.model.Plugin;
import org.flowplayer.model.PluginEventType;
import org.flowplayer.model.PluginModel;
import org.flowplayer.util.Assert;
import org.flowplayer.view.AbstractSprite;
import org.flowplayer.view.FlowStyleSheet;
import org.flowplayer.view.Flowplayer;
import org.flowplayer.view.Styleable;
/**
* Content plugin.
*
* @author api
*/
public class Content extends AbstractSprite implements Plugin, Styleable {
private var _styleSheetFile:String;
private var _player:Flowplayer;
private var _model:DisplayPluginModel;
private var _contentView:ContentView;
private var _closeButton:CloseButton;
private var _html:String;
private var _useCloseButton:Boolean = false;
private var _closeImageUrl:String;
private var _dropShadow:Boolean;
private var _originalAlpha:Number;
public function Content() {
addListeners();
}
internal function addListeners():void {
addEventListener(MouseEvent.ROLL_OVER, onMouseOver);
addEventListener(MouseEvent.ROLL_OUT, onMouseOut);
addEventListener(MouseEvent.CLICK, onClick);
}
internal function removeListeners():void {
removeEventListener(MouseEvent.ROLL_OVER, onMouseOver);
removeEventListener(MouseEvent.ROLL_OUT, onMouseOut);
removeEventListener(MouseEvent.CLICK, onClick);
}
override protected function onResize():void {
if (!_contentView) return;
arrangeCloseButton();
_contentView.setSize(width, height);
_contentView.x = 0;
_contentView.y = 0;
}
/**
* Sets the plugin model. This gets called before the plugin
* has been added to the display list and before the player is set.
* @param plugin
*/
public function onConfig(plugin:PluginModel):void {
_model = plugin as DisplayPluginModel;
if (plugin.config) {
log.debug("config object received with html " + plugin.config.html + ", stylesheet " + plugin.config.stylesheet);
_styleSheetFile = plugin.config.stylesheet;
if(plugin.config.callType != "URL")
_html = plugin.config.html;
_useCloseButton = plugin.config.closeButton;
_closeImageUrl = plugin.config.closeImage;
_dropShadow = plugin.config.dropShadow;
}
}
/**
* Sets the Flowplayer interface. The interface is immediately ready to use, all
* other plugins have been loaded an initialized also.
* @param player
*/
public function onLoad(player:Flowplayer):void {
log.info("set player");
_player = player;
if (_styleSheetFile || _closeImageUrl) {
loadResources(_styleSheetFile, _closeImageUrl);
} else {
createContentView(null, null);
if (_useCloseButton) {
createCloseButton();
}
_model.dispatchOnLoad();
}
}
/**
* Sets the HTML content.
* @param htmlText
*/
[External]
public function set html(htmlText:String):void {
log.debug("set hetml()");
_contentView.html = htmlText;
}
public function get html():String {
log.debug("get hetml()");
return _contentView.html;
}
/**
* Appends HTML text to the content.
* @param htmlText
* @return the new text after append
*/
[External]
public function append(htmlText:String):String {
log.debug("apped()");
return _contentView.append(htmlText);
}
/**
* Loads a new stylesheet and changes the style from the loaded sheet.
*/
[External]
public function loadStylesheet(styleSheetFile:String):void {
if (! styleSheetFile) return;
log.info("loading stylesheet from " + styleSheetFile);
loadResources(styleSheetFile);
}
/**
* Sets style properties.
*/
public function css(styleProps:Object = null):Object {
var result:Object = _contentView.css(styleProps);
return result;
}
public function get style():FlowStyleSheet {
return _contentView ? _contentView.style : null;
}
public function set style(value:FlowStyleSheet):void {
Assert.notNull(_contentView, "content view not created yet");
_contentView.style = value;
}
private function loadResources(styleSheetFile:String = null, imageFile:String = null):void {
var loader:ResourceLoader = _player.createLoader();
if (styleSheetFile) {
log.debug("loading stylesheet from file " + _styleSheetFile);
}
if (imageFile) {
log.debug("loading closeImage from file " + _closeImageUrl);
}
if (styleSheetFile) {
loader.addTextResourceUrl(styleSheetFile);
}
if (imageFile) {
loader.addBinaryResourceUrl(imageFile);
}
loader.load(null, onResourcesLoaded);
}
private function onResourcesLoaded(loader:ResourceLoader):void {
if (_contentView) {
if (_styleSheetFile) {
_contentView.style = createStyleSheet(loader.getContent(_styleSheetFile) as String);
}
} else {
createContentView(_styleSheetFile ? loader.getContent(_styleSheetFile) as String : null, _closeImageUrl ? loader.getContent(_closeImageUrl) as DisplayObject : null);
}
if (_useCloseButton) {
closeImage = loader.getContent(_closeImageUrl) as DisplayObject;
}
_model.dispatchOnLoad();
}
private function createStyleSheet(cssText:String = null):FlowStyleSheet {
var styleSheet:FlowStyleSheet = new FlowStyleSheet("#content", cssText);
// all root style properties come in config root (backgroundImage, backgroundGradient, borderRadius etc)
addRules(styleSheet, _model.config);
// style rules for the textField come inside a style node
addRules(styleSheet, _model.config.style);
return styleSheet;
}
private function addRules(styleSheet:FlowStyleSheet, rules:Object):void {
var rootStyleProps:Object;
for (var styleName:String in rules) {
log.debug("adding additional style rule for " + styleName);
if (FlowStyleSheet.isRootStyleProperty(styleName)) {
if (! rootStyleProps) {
rootStyleProps = new Object();
}
log.debug("setting root style property " + styleName + " to value " + rules[styleName]);
rootStyleProps[styleName] = rules[styleName];
} else {
styleSheet.setStyle(styleName, rules[styleName]);
}
}
styleSheet.addToRootStyle(rootStyleProps);
}
private function createContentView(cssText:String = null, closeImage:DisplayObject = null):void {
log.debug("creating content view");
_contentView = new ContentView(_player);
log.debug("callign onResize");
onResize(); // make it correct size before adding to display list (avoids unnecessary re-arrangement)
log.debug("setting stylesheet " + cssText);
_contentView.style = createStyleSheet(cssText);
log.debug("setting html");
_contentView.html = _html;
log.debug("adding to display list");
// distance, angle, color, alpha, blurX, blurY, strength,quality,inner,knockout
if (_dropShadow) {
_contentView.filters = [new DropShadowFilter(3, 45, 0x777777, 0.8, 15, 15, 2, 3)];
}
addChild(_contentView);
}
public override function set alpha(value:Number):void {
super.alpha = value;
if (!_contentView) return;
_contentView.alpha = value;
}
private function onMouseOver(event:MouseEvent):void {
if (!_model) return;
if (_contentView.redrawing) return;
_model.dispatch(PluginEventType.PLUGIN_EVENT, "onMouseOver");
}
private function onMouseOut(event:MouseEvent):void {
if (!_model) return;
_model.dispatch(PluginEventType.PLUGIN_EVENT, "onMouseOut");
}
private function onClick(event:MouseEvent):void {
if (!_model) return;
_model.dispatch(PluginEventType.PLUGIN_EVENT, "onClick");
}
public function getDefaultConfig():Object {
return { top: 10, left: '50%', width: '95%', height: 50, opacity: 0.9, borderRadius: 10, backgroundGradient: 'low' };
}
public function animate(styleProps:Object):Object {
return _contentView.animate(styleProps);
}
public function onBeforeCss(styleProps:Object = null):void {
}
public function onBeforeAnimate(styleProps:Object):void {
}
private function set closeImage(image:DisplayObject):void {
if (_closeButton) {
removeChild(_closeButton);
}
createCloseButton(image);
}
private function arrangeCloseButton():void {
if (_closeButton && style) {
_closeButton.x = width - _closeButton.width - 1 - style.borderRadius / 5;
_closeButton.y = 1 + style.borderRadius / 5;
setChildIndex(_closeButton, numChildren - 1);
}
}
private function createCloseButton(icon:DisplayObject = null):void {
_closeButton = new CloseButton(icon);
addChild(_closeButton);
_closeButton.addEventListener(MouseEvent.CLICK, onCloseClicked);
}
private function onCloseClicked(event:MouseEvent):void {
this.removeListeners();
_originalAlpha = this.alpha;
_player.animationEngine.fadeOut(this, 500, onFadeOut);
}
private function onFadeOut():void {
log.debug("faded out");
//
// restore original alpha value
_model.alpha = _originalAlpha;
_model.getDisplayObject().alpha = _originalAlpha;
// we need to update the properties to the registry, so that animations happen correctly after this
_player.pluginRegistry.updateDisplayProperties(_model);
this.addListeners();
}
}
}
\ No newline at end of file
+/*
* This file is part of Flowplayer, http://flowplayer.org
*
* By: Anssi Piirainen, <support@flowplayer.org>
* Copyright (c) 2008-2011 Flowplayer Oy *
* Released under the MIT License:
* http://www.opensource.org/licenses/mit-license.php
*/
package org.flowplayer.content {
import flash.display.DisplayObject;
import flash.events.MouseEvent;
import flash.filters.DropShadowFilter;
import org.flowplayer.controller.ResourceLoader;
import org.flowplayer.model.DisplayPluginModel;
import org.flowplayer.model.Plugin;
import org.flowplayer.model.PluginEventType;
import org.flowplayer.model.PluginModel;
import org.flowplayer.util.Assert;
import org.flowplayer.view.AbstractSprite;
import org.flowplayer.view.FlowStyleSheet;
import org.flowplayer.view.Flowplayer;
import org.flowplayer.view.Styleable;
/**
* Content plugin.
*
* @author api
*/
public class Content extends AbstractSprite implements Plugin, Styleable {
private var _styleSheetFile:String;
private var _player:Flowplayer;
private var _model:DisplayPluginModel;
private var _contentView:ContentView;
private var _closeButton:CloseButton;
private var _html:String;
private var _useCloseButton:Boolean = false;
private var _closeImageUrl:String;
private var _dropShadow:Boolean;
private var _originalAlpha:Number;
public function Content() {
addListeners();
}
internal function addListeners():void {
addEventListener(MouseEvent.ROLL_OVER, onMouseOver);
addEventListener(MouseEvent.ROLL_OUT, onMouseOut);
addEventListener(MouseEvent.CLICK, onClick);
}
internal function removeListeners():void {
removeEventListener(MouseEvent.ROLL_OVER, onMouseOver);
removeEventListener(MouseEvent.ROLL_OUT, onMouseOut);
removeEventListener(MouseEvent.CLICK, onClick);
}
override protected function onResize():void {
if (!_contentView) return;
arrangeCloseButton();
_contentView.setSize(width, height);
_contentView.x = 0;
_contentView.y = 0;
}
/**
* Sets the plugin model. This gets called before the plugin
* has been added to the display list and before the player is set.
* @param plugin
*/
public function onConfig(plugin:PluginModel):void {
_model = plugin as DisplayPluginModel;
if (plugin.config) {
log.debug("config object received with html " + plugin.config.html + ", stylesheet " + plugin.config.stylesheet);
_styleSheetFile = plugin.config.stylesheet;
if(plugin.config.callType != "URL")
_html = plugin.config.html;
_useCloseButton = plugin.config.closeButton;
_closeImageUrl = plugin.config.closeImage;
_dropShadow = plugin.config.dropShadow;
}
}
/**
* Sets the Flowplayer interface. The interface is immediately ready to use, all
* other plugins have been loaded an initialized also.
* @param player
*/
public function onLoad(player:Flowplayer):void {
log.info("set player");
_player = player;
if (_styleSheetFile || _closeImageUrl) {
loadResources(_styleSheetFile, _closeImageUrl);
} else {
createContentView(null, null);
if (_useCloseButton) {
createCloseButton();
}
_model.dispatchOnLoad();
}
}
/**
* Sets the HTML content.
* @param htmlText
*/
[External]
public function set html(htmlText:String):void {
log.debug("set hetml()");
_contentView.html = htmlText;
}
public function get html():String {
log.debug("get hetml()");
return _contentView.html;
}
/**
* Appends HTML text to the content.
* @param htmlText
* @return the new text after append
*/
[External]
public function append(htmlText:String):String {
log.debug("apped()");
return _contentView.append(htmlText);
}
/**
* Loads a new stylesheet and changes the style from the loaded sheet.
*/
[External]
public function loadStylesheet(styleSheetFile:String):void {
if (! styleSheetFile) return;
log.info("loading stylesheet from " + styleSheetFile);
loadResources(styleSheetFile);
}
/**
* Sets style properties.
*/
public function css(styleProps:Object = null):Object {
var result:Object = _contentView.css(styleProps);
return result;
}
public function get style():FlowStyleSheet {
return _contentView ? _contentView.style : null;
}
public function set style(value:FlowStyleSheet):void {
Assert.notNull(_contentView, "content view not created yet");
_contentView.style = value;
}
private function loadResources(styleSheetFile:String = null, imageFile:String = null):void {
var loader:ResourceLoader = _player.createLoader();
if (styleSheetFile) {
log.debug("loading stylesheet from file " + _styleSheetFile);
}
if (imageFile) {
log.debug("loading closeImage from file " + _closeImageUrl);
}
if (styleSheetFile) {
loader.addTextResourceUrl(styleSheetFile);
}
if (imageFile) {
loader.addBinaryResourceUrl(imageFile);
}
loader.load(null, onResourcesLoaded);
}
private function onResourcesLoaded(loader:ResourceLoader):void {
if (_contentView) {
if (_styleSheetFile) {
_contentView.style = createStyleSheet(loader.getContent(_styleSheetFile) as String);
}
} else {
createContentView(_styleSheetFile ? loader.getContent(_styleSheetFile) as String : null, _closeImageUrl ? loader.getContent(_closeImageUrl) as DisplayObject : null);
}
if (_useCloseButton) {
closeImage = loader.getContent(_closeImageUrl) as DisplayObject;
}
_model.dispatchOnLoad();
}
private function createStyleSheet(cssText:String = null):FlowStyleSheet {
var styleSheet:FlowStyleSheet = new FlowStyleSheet("#content", cssText);
// all root style properties come in config root (backgroundImage, backgroundGradient, borderRadius etc)
addRules(styleSheet, _model.config);
// style rules for the textField come inside a style node
addRules(styleSheet, _model.config.style);
return styleSheet;
}
private function addRules(styleSheet:FlowStyleSheet, rules:Object):void {
var rootStyleProps:Object;
for (var styleName:String in rules) {
log.debug("adding additional style rule for " + styleName);
if (FlowStyleSheet.isRootStyleProperty(styleName)) {
if (! rootStyleProps) {
rootStyleProps = new Object();
}
log.debug("setting root style property " + styleName + " to value " + rules[styleName]);
rootStyleProps[styleName] = rules[styleName];
} else {
styleSheet.setStyle(styleName, rules[styleName]);
}
}
styleSheet.addToRootStyle(rootStyleProps);
}
private function createContentView(cssText:String = null, closeImage:DisplayObject = null):void {
log.debug("creating content view");
_contentView = new ContentView(_player);
log.debug("callign onResize");
onResize(); // make it correct size before adding to display list (avoids unnecessary re-arrangement)
log.debug("setting stylesheet " + cssText);
_contentView.style = createStyleSheet(cssText);
log.debug("setting html");
_contentView.html = _html;
log.debug("adding to display list");
// distance, angle, color, alpha, blurX, blurY, strength,quality,inner,knockout
if (_dropShadow) {
_contentView.filters = [new DropShadowFilter(3, 45, 0x777777, 0.8, 15, 15, 2, 3)];
}
addChild(_contentView);
}
public override function set alpha(value:Number):void {
super.alpha = value;
if (!_contentView) return;
_contentView.alpha = value;
}
private function onMouseOver(event:MouseEvent):void {
if (!_model) return;
if (_contentView.redrawing) return;
_model.dispatch(PluginEventType.PLUGIN_EVENT, "onMouseOver");
}
private function onMouseOut(event:MouseEvent):void {
if (!_model) return;
_model.dispatch(PluginEventType.PLUGIN_EVENT, "onMouseOut");
}
private function onClick(event:MouseEvent):void {
if (!_model) return;
_model.dispatch(PluginEventType.PLUGIN_EVENT, "onClick");
}
public function getDefaultConfig():Object {
return { top: 10, left: '50%', width: '95%', height: 50, opacity: 0.9, borderRadius: 10, backgroundGradient: 'low' };
}
public function animate(styleProps:Object):Object {
return _contentView.animate(styleProps);
}
public function onBeforeCss(styleProps:Object = null):void {
}
public function onBeforeAnimate(styleProps:Object):void {
}
private function set closeImage(image:DisplayObject):void {
if (_closeButton) {
removeChild(_closeButton);
}
createCloseButton(image);
}
private function arrangeCloseButton():void {
if (_closeButton && style) {
_closeButton.x = width - _closeButton.width - 1 - style.borderRadius / 5;
_closeButton.y = 1 + style.borderRadius / 5;
setChildIndex(_closeButton, numChildren - 1);
}
}
private function createCloseButton(icon:DisplayObject = null):void {
_closeButton = new CloseButton(icon);
addChild(_closeButton);
_closeButton.addEventListener(MouseEvent.CLICK, onCloseClicked);
}
private function onCloseClicked(event:MouseEvent):void {
this.removeListeners();
_originalAlpha = this.alpha;
_player.animationEngine.fadeOut(this, 500, onFadeOut);
}
private function onFadeOut():void {
log.debug("faded out");
//
// restore original alpha value
_model.alpha = _originalAlpha;
_model.getDisplayObject().alpha = _originalAlpha;
// we need to update the properties to the registry, so that animations happen correctly after this
_player.pluginRegistry.updateDisplayProperties(_model);
this.addListeners();
}
}
}
\ No newline at end of file
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.content/src/actionscript/org/flowplayer/content/ContentView.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.content/src/actionscript/org/flowplayer/content/ContentView.as
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.content/src/actionscript/org/flowplayer/content/ContentView.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.content/src/actionscript/org/flowplayer/content/ContentView.as
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.content/src/flash/closebutton.fla b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.content/src/flash/closebutton.fla
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.content/src/flash/closebutton.fla
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.content/src/flash/closebutton.fla
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.content/src/flash/closebutton.swc b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.content/src/flash/closebutton.swc
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.content/src/flash/closebutton.swc
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.content/src/flash/closebutton.swc
diff --git a/typo3/contrib/flowplayer/plugins/flowplayer.content/src/flash/closebutton.swf b/typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.content/src/flash/closebutton.swf
similarity index 100%
rename from typo3/contrib/flowplayer/plugins/flowplayer.content/src/flash/closebutton.swf
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/plugins/flowplayer.content/src/flash/closebutton.swf
diff --git a/typo3/contrib/flowplayer/release.xml b/typo3/sysext/mediace/Resources/Contrib/flowplayer/release.xml
similarity index 97%
rename from typo3/contrib/flowplayer/release.xml
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/release.xml
index 02ecf46f38f0..65d6ceb38085 100644
--- a/typo3/contrib/flowplayer/release.xml
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/release.xml
@@ -1,235 +1,235 @@
-<project name="Flowplayer release" default="release">
- <property file="build.properties" />
- <property file="${user.home}/fprelease.properties" />
- <import file="../lib/devkit/remotecopy.xml"/>
- <import file="build.xml"/>
-
- <target name="release-core-resources">
- <remotecopy bucketname="flowplayer-releases/flowplayer" keyfile="${keyfile}" pass="${remotepass}" >
- <releasefiles>
- <fileset dir="${dist-dir}">
- <include name="${dist-name}"/>
- <include name="${commercial-dist-name}"/>
- <include name="${source-dist-name}"/>
- <include name="${multidomain-dist-name}"/>
- </fileset>
- <fileset dir="${build-dir}">
- <include name="${player-binary}"/>
- <include name="${player-binary-versioned}"/>
- <include name="${commercial-player-binary}"/>
- <include name="${commercial-player-binary-versioned}"/>
- </fileset>
- </releasefiles>
- </remotecopy>
- <remotecopy bucketname="flowplayer-releases/flowplayer.devkit" keyfile="${keyfile}" pass="${remotepass}" >
- <releasefiles>
- <fileset dir="${dist-dir}">
- <include name="${devkit-dist-name}"/>
- </fileset>
- </releasefiles>
- </remotecopy>
- <remotecopy bucketname="flowplayer-releases/swf" keyfile="${keyfile}" pass="${remotepass}">
- <releasefiles>
- <fileset dir="${build-dir}">
- <!--<include name="${player-binary}"/>-->
- <include name="${player-binary-versioned}"/>
- <include name="${commercial-player-binary}"/>
- <include name="${commercial-player-binary-versioned}"/>
- </fileset>
- </releasefiles>
- </remotecopy>
- </target>
-
- <target name="upload-dev-core">
- <remotecopy bucketname="flowplayer-releases/flowplayer" keyfile="${keyfile}" pass="${remotepass}" >
- <releasefiles>
- <fileset dir="${dist-dir}">
- <include name="${dist-name-dev}"/>
- <include name="${commercial-dist-name-dev}"/>
- </fileset>
- <fileset dir="${build-dir}">
- <include name="${player-binary}"/>
- <include name="${commercial-player-binary}"/>
- </fileset>
- </releasefiles>
- </remotecopy>
- <remotecopy bucketname="flowplayer-releases/swf" keyfile="${keyfile}" pass="${remotepass}">
- <releasefiles>
- <fileset dir="${build-dir}">
- <!--<include name="${player-binary}"/>-->
- <include name="${player-binary}"/>
- <include name="${commercial-player-binary}"/>
- </fileset>
- </releasefiles>
- </remotecopy>
- </target>
-
- <target name="release-core-resources-dev">
- <remotecopy-dev remotedir="${swfremotedir}" keyfile="${keyfile}" pass="${remotepass}">
- <releasefiles>
- <fileset dir="${build-dir}">
- <!--<include name="${player-binary}"/>-->
- <include name="${player-binary-versioned}"/>
- <include name="${commercial-player-binary}"/>
- <include name="${commercial-player-binary-versioned}"/>
- </fileset>
- </releasefiles>
- </remotecopy-dev>
- </target>
-
- <target name="zip-core-swfs">
- <delete file="${dist-dir}/latest.zip" verbose="true"/>
- <updatezip zip="${dist-dir}/latest.zip">
- <zipfiles>
- <fileset dir="${build-dir}">
- <include name="flowplayer.swf"/>
- <include name="flowplayer.commercial.swf"/>
- </fileset>
- </zipfiles>
- </updatezip>
- </target>
-
- <target name="release-swf-zip">
- <remotecopy bucketname="flowplayer-releases" keyfile="${keyfile}" pass="${remotepass}">
- <releasefiles>
- <fileset dir="${dist-dir}">
- <include name="latest.zip"/>
- </fileset>
- </releasefiles>
- </remotecopy>
- </target>
-
- <target name="release-apidoc">
- <remotecopy bucketname="flowplayer-releases/asdoc-latest" keyfile="${keyfile}" pass="${remotepass}" >
- <releasefiles>
- <fileset dir="${apidoc-dir}" />
- </releasefiles>
- </remotecopy>
- </target>
-
- <target name="release-js-plugins">
- <iterate-plugins target="release-remote" buildfiles="${jsplugins.buildfiles}" basedirectory="../js-plugins"/>
- </target>
-
- <target name="release" description="Release to S3" depends="prepare, dist, release-core-resources, release-js-plugins">
- <iterate-plugins target="release-remote" />
- <iterate-plugins target="write-filesize" buildfiles="${jsplugins.buildfiles}" basedirectory="../js-plugins"/>
- <antcall target="zip-swfs" />
- <antcall target="release-swf-zip" />
- <antcall target="upload-release-files" />
- </target>
-
- <target name="upload-dev" description="Upload dev versions to S3, all plugins" depends="prepare, all-dist, upload-dev-core">
- <iterate-plugins target="upload-dev-version" buildfiles="${allplugins.buildfiles}" />
- <antcall target="zip-swfs" />
- <antcall target="release-swf-zip" />
- <antcall target="upload-release-files" />
- </target>
-
- <target name="release-dev" description="Release to the dev server" depends="prepare, dist, release-core-resources-dev">
- <iterate-plugins target="release-remote-dev" />
- </target>
-
- <target name="zip-swfs" depends="zip-core-swfs">
- <iterate-plugins target="zip-swfs" buildfiles="${allplugins.buildfiles}" />
- </target>
-
- <target name="upload-release-files" depends="generate-url-file, generate-release-yaml, deploy-release-yaml">
- <remotecopy bucketname="flowplayer-releases/info" keyfile="${keyfile}" pass="${remotepass}" >
- <releasefiles>
- <fileset dir="${core-dir}/dist">
- <include name="dist.html" />
- <include name="releases.yaml" />
- </fileset>
- </releasefiles>
- </remotecopy>
- </target>
-
- <target name="deploy-release-yaml" depends="generate-release-yaml">
- <copy file="${core-dir}/dist/releases.yaml" todir="${site.dir}" />
- </target>
-
- <target name="generate-url-file" description="generates a text file with paths to plugin zip files in flowplayer.org">
- <!--<property name="url-file-from-plugins" value="${basedir}/dist/dist.html" />-->
- <property name="url-file" value="${basedir}/dist/dist.html" />
-
- <delete file="${url-file}" />
- <echo message="writing zip urls to ${url-file}" />
-
- <echo file="${url-file}" append="true"><a href="http://flowplayer-releases.s3.amazonaws.com/flowplayer/flowplayer.zip">flowplayer.zip</a> <br />
-</echo>
- <echo file="${url-file}" append="true"><a href="http://flowplayer-releases.s3.amazonaws.com/flowplayer/flowplayer.commercial.zip">flowplayer.commercial.zip</a> <br />
-</echo>
- <echo file="${url-file}" append="true"><a href="http://flowplayer-releases.s3.amazonaws.com/flowplayer/flowplayer-src.zip">flowplayer-src.zip</a> <br />
-</echo>
- <iterate-plugins target="write-zip-url" buildfiles="${plugin.buildfiles}" />
- <tstamp>
- <format property="build.time" pattern="MMMM dd yyyy hh:mm aa"
- timezone="GMT" />
- </tstamp>
-<echo file="${url-file}" append="true">
-<br />
-<a href="http://flowplayer-releases.s3.amazonaws.com/latest.zip">latest.zip: All latest dev-version swf files in one zip</a> <br />
- <br />
- Build time: ${build.time} GMT
-</echo>
- </target>
-
- <target name="generate-release-yaml" description="Generates a YAML formatted file containing URLs to all released/uploaded plugins" depends="jsplugins">
- <property name="yaml-file" value="${basedir}/dist/releases.yaml" />
- <property name="urlbase" value="http://releases.flowplayer.org/" />
- <delete file="${yaml-file}" />
- <echo message="writing SWF urls to ${yaml-file}" />
-
-<echo file="${yaml-file}" append="true" message="urls:">
-</echo>
-<echo file="${yaml-file}" append="true" message=" swf:">
-</echo>
-<echo file="${yaml-file}" append="true" message=" base: ${urlbase}">
-</echo>
-<echo file="${yaml-file}" append="true" message=" js:">
-</echo>
-<echo file="${yaml-file}" append="true" message=" base: ${urlbase}">
-</echo>
-<echo file="${yaml-file}" append="true" message=" zip:">
-</echo>
-<echo file="${yaml-file}" append="true" message=" base: ${urlbase}">
-</echo>
-
-<echo file="${yaml-file}" append="true" message="versions:">
-</echo>
-<echo file="${yaml-file}" append="true" message=" swf:">
-</echo>
-<echo file="${yaml-file}" append="true" message=" player: ${version-info}">
-</echo>
-<echo file="${yaml-file}" append="true" message=" commercial: ${version-info}">
-</echo>
-<iterate-plugins target="write-version" buildfiles="${allplugins.buildfiles}" />
-<!-- 3rd party plugins -->
-<echo file="${yaml-file}" append="true" message=" cloudfrontsignedurl: ${cloudfront.version}">
-</echo>
-<echo file="${yaml-file}" append="true" message=" adsense: ${adsense.version}">
-</echo>
-
-<echo file="${yaml-file}" append="true" message=" js:">
-</echo>
-<echo file="${yaml-file}" append="true" message=" player: ${flowplayer-js-version-info}">
-</echo>
-
-<iterate-plugins target="write-version" buildfiles="${jsplugins.buildfiles}" basedirectory="../js-plugins"/>
-
-<echo file="${yaml-file}" append="true" message=" zip:">
-</echo>
-<echo file="${yaml-file}" append="true" message=" devkit: ${version-info}">
-</echo>
-<echo file="${yaml-file}" append="true" message=" flowplayer: ${version-info}">
-</echo>
-
-<echo file="${yaml-file}" append="true" message=" filesizes:">
-</echo>
-<iterate-plugins target="write-filesize" buildfiles="${allplugins.buildfiles}" />
-<iterate-plugins target="write-filesize" buildfiles="${jsplugins.buildfiles}" basedirectory="../js-plugins"/>
-
- </target>
-
+<project name="Flowplayer release" default="release">
+ <property file="build.properties" />
+ <property file="${user.home}/fprelease.properties" />
+ <import file="../lib/devkit/remotecopy.xml"/>
+ <import file="build.xml"/>
+
+ <target name="release-core-resources">
+ <remotecopy bucketname="flowplayer-releases/flowplayer" keyfile="${keyfile}" pass="${remotepass}" >
+ <releasefiles>
+ <fileset dir="${dist-dir}">
+ <include name="${dist-name}"/>
+ <include name="${commercial-dist-name}"/>
+ <include name="${source-dist-name}"/>
+ <include name="${multidomain-dist-name}"/>
+ </fileset>
+ <fileset dir="${build-dir}">
+ <include name="${player-binary}"/>
+ <include name="${player-binary-versioned}"/>
+ <include name="${commercial-player-binary}"/>
+ <include name="${commercial-player-binary-versioned}"/>
+ </fileset>
+ </releasefiles>
+ </remotecopy>
+ <remotecopy bucketname="flowplayer-releases/flowplayer.devkit" keyfile="${keyfile}" pass="${remotepass}" >
+ <releasefiles>
+ <fileset dir="${dist-dir}">
+ <include name="${devkit-dist-name}"/>
+ </fileset>
+ </releasefiles>
+ </remotecopy>
+ <remotecopy bucketname="flowplayer-releases/swf" keyfile="${keyfile}" pass="${remotepass}">
+ <releasefiles>
+ <fileset dir="${build-dir}">
+ <!--<include name="${player-binary}"/>-->
+ <include name="${player-binary-versioned}"/>
+ <include name="${commercial-player-binary}"/>
+ <include name="${commercial-player-binary-versioned}"/>
+ </fileset>
+ </releasefiles>
+ </remotecopy>
+ </target>
+
+ <target name="upload-dev-core">
+ <remotecopy bucketname="flowplayer-releases/flowplayer" keyfile="${keyfile}" pass="${remotepass}" >
+ <releasefiles>
+ <fileset dir="${dist-dir}">
+ <include name="${dist-name-dev}"/>
+ <include name="${commercial-dist-name-dev}"/>
+ </fileset>
+ <fileset dir="${build-dir}">
+ <include name="${player-binary}"/>
+ <include name="${commercial-player-binary}"/>
+ </fileset>
+ </releasefiles>
+ </remotecopy>
+ <remotecopy bucketname="flowplayer-releases/swf" keyfile="${keyfile}" pass="${remotepass}">
+ <releasefiles>
+ <fileset dir="${build-dir}">
+ <!--<include name="${player-binary}"/>-->
+ <include name="${player-binary}"/>
+ <include name="${commercial-player-binary}"/>
+ </fileset>
+ </releasefiles>
+ </remotecopy>
+ </target>
+
+ <target name="release-core-resources-dev">
+ <remotecopy-dev remotedir="${swfremotedir}" keyfile="${keyfile}" pass="${remotepass}">
+ <releasefiles>
+ <fileset dir="${build-dir}">
+ <!--<include name="${player-binary}"/>-->
+ <include name="${player-binary-versioned}"/>
+ <include name="${commercial-player-binary}"/>
+ <include name="${commercial-player-binary-versioned}"/>
+ </fileset>
+ </releasefiles>
+ </remotecopy-dev>
+ </target>
+
+ <target name="zip-core-swfs">
+ <delete file="${dist-dir}/latest.zip" verbose="true"/>
+ <updatezip zip="${dist-dir}/latest.zip">
+ <zipfiles>
+ <fileset dir="${build-dir}">
+ <include name="flowplayer.swf"/>
+ <include name="flowplayer.commercial.swf"/>
+ </fileset>
+ </zipfiles>
+ </updatezip>
+ </target>
+
+ <target name="release-swf-zip">
+ <remotecopy bucketname="flowplayer-releases" keyfile="${keyfile}" pass="${remotepass}">
+ <releasefiles>
+ <fileset dir="${dist-dir}">
+ <include name="latest.zip"/>
+ </fileset>
+ </releasefiles>
+ </remotecopy>
+ </target>
+
+ <target name="release-apidoc">
+ <remotecopy bucketname="flowplayer-releases/asdoc-latest" keyfile="${keyfile}" pass="${remotepass}" >
+ <releasefiles>
+ <fileset dir="${apidoc-dir}" />
+ </releasefiles>
+ </remotecopy>
+ </target>
+
+ <target name="release-js-plugins">
+ <iterate-plugins target="release-remote" buildfiles="${jsplugins.buildfiles}" basedirectory="../js-plugins"/>
+ </target>
+
+ <target name="release" description="Release to S3" depends="prepare, dist, release-core-resources, release-js-plugins">
+ <iterate-plugins target="release-remote" />
+ <iterate-plugins target="write-filesize" buildfiles="${jsplugins.buildfiles}" basedirectory="../js-plugins"/>
+ <antcall target="zip-swfs" />
+ <antcall target="release-swf-zip" />
+ <antcall target="upload-release-files" />
+ </target>
+
+ <target name="upload-dev" description="Upload dev versions to S3, all plugins" depends="prepare, all-dist, upload-dev-core">
+ <iterate-plugins target="upload-dev-version" buildfiles="${allplugins.buildfiles}" />
+ <antcall target="zip-swfs" />
+ <antcall target="release-swf-zip" />
+ <antcall target="upload-release-files" />
+ </target>
+
+ <target name="release-dev" description="Release to the dev server" depends="prepare, dist, release-core-resources-dev">
+ <iterate-plugins target="release-remote-dev" />
+ </target>
+
+ <target name="zip-swfs" depends="zip-core-swfs">
+ <iterate-plugins target="zip-swfs" buildfiles="${allplugins.buildfiles}" />
+ </target>
+
+ <target name="upload-release-files" depends="generate-url-file, generate-release-yaml, deploy-release-yaml">
+ <remotecopy bucketname="flowplayer-releases/info" keyfile="${keyfile}" pass="${remotepass}" >
+ <releasefiles>
+ <fileset dir="${core-dir}/dist">
+ <include name="dist.html" />
+ <include name="releases.yaml" />
+ </fileset>
+ </releasefiles>
+ </remotecopy>
+ </target>
+
+ <target name="deploy-release-yaml" depends="generate-release-yaml">
+ <copy file="${core-dir}/dist/releases.yaml" todir="${site.dir}" />
+ </target>
+
+ <target name="generate-url-file" description="generates a text file with paths to plugin zip files in flowplayer.org">
+ <!--<property name="url-file-from-plugins" value="${basedir}/dist/dist.html" />-->
+ <property name="url-file" value="${basedir}/dist/dist.html" />
+
+ <delete file="${url-file}" />
+ <echo message="writing zip urls to ${url-file}" />
+
+ <echo file="${url-file}" append="true"><a href="http://flowplayer-releases.s3.amazonaws.com/flowplayer/flowplayer.zip">flowplayer.zip</a> <br />
+</echo>
+ <echo file="${url-file}" append="true"><a href="http://flowplayer-releases.s3.amazonaws.com/flowplayer/flowplayer.commercial.zip">flowplayer.commercial.zip</a> <br />
+</echo>
+ <echo file="${url-file}" append="true"><a href="http://flowplayer-releases.s3.amazonaws.com/flowplayer/flowplayer-src.zip">flowplayer-src.zip</a> <br />
+</echo>
+ <iterate-plugins target="write-zip-url" buildfiles="${plugin.buildfiles}" />
+ <tstamp>
+ <format property="build.time" pattern="MMMM dd yyyy hh:mm aa"
+ timezone="GMT" />
+ </tstamp>
+<echo file="${url-file}" append="true">
+<br />
+<a href="http://flowplayer-releases.s3.amazonaws.com/latest.zip">latest.zip: All latest dev-version swf files in one zip</a> <br />
+ <br />
+ Build time: ${build.time} GMT
+</echo>
+ </target>
+
+ <target name="generate-release-yaml" description="Generates a YAML formatted file containing URLs to all released/uploaded plugins" depends="jsplugins">
+ <property name="yaml-file" value="${basedir}/dist/releases.yaml" />
+ <property name="urlbase" value="http://releases.flowplayer.org/" />
+ <delete file="${yaml-file}" />
+ <echo message="writing SWF urls to ${yaml-file}" />
+
+<echo file="${yaml-file}" append="true" message="urls:">
+</echo>
+<echo file="${yaml-file}" append="true" message=" swf:">
+</echo>
+<echo file="${yaml-file}" append="true" message=" base: ${urlbase}">
+</echo>
+<echo file="${yaml-file}" append="true" message=" js:">
+</echo>
+<echo file="${yaml-file}" append="true" message=" base: ${urlbase}">
+</echo>
+<echo file="${yaml-file}" append="true" message=" zip:">
+</echo>
+<echo file="${yaml-file}" append="true" message=" base: ${urlbase}">
+</echo>
+
+<echo file="${yaml-file}" append="true" message="versions:">
+</echo>
+<echo file="${yaml-file}" append="true" message=" swf:">
+</echo>
+<echo file="${yaml-file}" append="true" message=" player: ${version-info}">
+</echo>
+<echo file="${yaml-file}" append="true" message=" commercial: ${version-info}">
+</echo>
+<iterate-plugins target="write-version" buildfiles="${allplugins.buildfiles}" />
+<!-- 3rd party plugins -->
+<echo file="${yaml-file}" append="true" message=" cloudfrontsignedurl: ${cloudfront.version}">
+</echo>
+<echo file="${yaml-file}" append="true" message=" adsense: ${adsense.version}">
+</echo>
+
+<echo file="${yaml-file}" append="true" message=" js:">
+</echo>
+<echo file="${yaml-file}" append="true" message=" player: ${flowplayer-js-version-info}">
+</echo>
+
+<iterate-plugins target="write-version" buildfiles="${jsplugins.buildfiles}" basedirectory="../js-plugins"/>
+
+<echo file="${yaml-file}" append="true" message=" zip:">
+</echo>
+<echo file="${yaml-file}" append="true" message=" devkit: ${version-info}">
+</echo>
+<echo file="${yaml-file}" append="true" message=" flowplayer: ${version-info}">
+</echo>
+
+<echo file="${yaml-file}" append="true" message=" filesizes:">
+</echo>
+<iterate-plugins target="write-filesize" buildfiles="${allplugins.buildfiles}" />
+<iterate-plugins target="write-filesize" buildfiles="${jsplugins.buildfiles}" basedirectory="../js-plugins"/>
+
+ </target>
+
</project>
\ No newline at end of file
diff --git a/typo3/contrib/flowplayer/src/actionscript-builtin/BuiltInConfig.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript-builtin/BuiltInConfig.as
similarity index 95%
rename from typo3/contrib/flowplayer/src/actionscript-builtin/BuiltInConfig.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript-builtin/BuiltInConfig.as
index db467815bf13..85ea390c38da 100644
--- a/typo3/contrib/flowplayer/src/actionscript-builtin/BuiltInConfig.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript-builtin/BuiltInConfig.as
@@ -3,7 +3,7 @@ package {
//import org.flowplayer.controls.Controls;
// import org.flowplayer.shareembed.ShareEmbed;
// import org.flowplayer.pseudostreaming.PseudoStreaming;
-
+
public class BuiltInConfig {
// private var rtmp:org.flowplayer.rtmp.RTMPStreamProvider;
// private var controls:org.flowplayer.controls.Controls;
@@ -16,7 +16,7 @@ public class BuiltInConfig {
// [Embed(source="../assets/play.png")]
// public var Logo:Class;
- public static const config:Object = {
+ public static const config:Object = {
"plugins": {
// "pseudo": {
// "url": 'org.flowplayer.pseudostreaming.PseudoStreamProvider'
@@ -31,5 +31,5 @@ public class BuiltInConfig {
// url: 'org.flowplayer.shareembed.ShareEmbed'
}
}
- };
+ };
}
\ No newline at end of file
diff --git a/typo3/contrib/flowplayer/src/actionscript-commercial/org/flowplayer/config/VersionInfo.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript-commercial/org/flowplayer/config/VersionInfo.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript-commercial/org/flowplayer/config/VersionInfo.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript-commercial/org/flowplayer/config/VersionInfo.as
index c5d10482766f..4650436c98da 100644
--- a/typo3/contrib/flowplayer/src/actionscript-commercial/org/flowplayer/config/VersionInfo.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript-commercial/org/flowplayer/config/VersionInfo.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -23,29 +23,29 @@ package org.flowplayer.config {
*/
public class VersionInfo {
private static const VERSION_NUMBER:String = CONFIG::version1 + "." + CONFIG::version2 + "." + CONFIG::version3;
-
+
private static const VERSION_INFO:String = (CONFIG::commercialVersion ? "Flowplayer commercial version " :
"Flowplayer free version " ) + VERSION_NUMBER + (CONFIG::versionStatus ? "-" + CONFIG::versionStatus : "");
public static function get version():Array {
return [new int(CONFIG::version1), new int(CONFIG::version2), new int(CONFIG::version3), CONFIG::commercialVersion ? 'commercial' : 'free', CONFIG::versionStatus];
}
-
+
public static function versionInfo():String {
return VERSION_INFO;
}
-
+
public static function get commercial():Boolean {
return CONFIG::commercialVersion;
}
-
+
public static function get controlsVersion():String {
return CONFIG::controlsVersion;
}
-
+
public static function get audioVersion():String {
return CONFIG::audioVersion;
}
}
-
+
}
diff --git a/typo3/contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/ContextMenuBuilder.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/ContextMenuBuilder.as
similarity index 96%
rename from typo3/contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/ContextMenuBuilder.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/ContextMenuBuilder.as
index bd0a43cb995d..4e33eb8c2a69 100644
--- a/typo3/contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/ContextMenuBuilder.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/ContextMenuBuilder.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of Flowplayer.
@@ -18,16 +18,16 @@
*/
package org.flowplayer.view {
- import org.flowplayer.util.Log;
-
+ import org.flowplayer.util.Log;
+
import flash.events.ContextMenuEvent;
import flash.external.ExternalInterface;
import flash.net.URLRequest;
import flash.net.navigateToURL;
import flash.ui.ContextMenu;
import flash.ui.ContextMenuItem;
-
- import org.flowplayer.config.VersionInfo;
+
+ import org.flowplayer.config.VersionInfo;
/**
* @author api
@@ -41,8 +41,8 @@ package org.flowplayer.view {
_playerId = playerId;
_menuItems = menuItems;
}
-
- public function build():ContextMenu {
+
+ public function build():ContextMenu {
CONFIG::freeVersion {
return buildMenu(createMenu());
}
@@ -51,7 +51,7 @@ package org.flowplayer.view {
return buildCustomMenu(createMenu(), _menuItems);
}
}
-
+
CONFIG::commercialVersion
private function buildCustomMenu(menu:ContextMenu, menuItems:Array):ContextMenu {
if (! menuItems) return menu;
@@ -75,7 +75,7 @@ package org.flowplayer.view {
}
return menu;
}
-
+
CONFIG::commercialVersion
private function addCustomMenuItem(menu:ContextMenu, label:String, itemIndex:int, callback:*, separatorBeforeNextItem:Boolean):void {
if (! callback || callback == "null") {
@@ -104,7 +104,7 @@ package org.flowplayer.view {
CONFIG::freeVersion
private function buildMenu(menu:ContextMenu):ContextMenu {
-
+
addItem(menu, new ContextMenuItem("About " +VersionInfo.versionInfo()+ "...", false, true), function(event:ContextMenuEvent):void {
navigateToURL(new URLRequest("http://flowplayer.org"), "_self");
});
@@ -118,9 +118,9 @@ package org.flowplayer.view {
addItem(menu, new ContextMenuItem("GNU GENERAL PUBLIC LICENSE...", false, true), function(event:ContextMenuEvent):void {
navigateToURL(new URLRequest("http://flowplayer.org/license/"), "_self");
});
- return menu;
+ return menu;
}
-
+
private function createMenu():ContextMenu {
var menu:ContextMenu = new ContextMenu();
menu.hideBuiltInItems();
diff --git a/typo3/contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/LabelPlayButton.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/LabelPlayButton.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/LabelPlayButton.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/LabelPlayButton.as
index b6946b314416..762e96e991e7 100644
--- a/typo3/contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/LabelPlayButton.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/LabelPlayButton.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of FlowPlayer.
@@ -23,10 +23,10 @@ package org.flowplayer.view {
import flash.text.TextField;
import flash.text.TextFieldAutoSize;
import flash.text.TextFormat;
-
+
import org.flowplayer.LabelHolderLeft;
import org.flowplayer.util.Arrange;
- import org.flowplayer.view.AbstractSprite;
+ import org.flowplayer.view.AbstractSprite;
/**
* @author api
@@ -45,7 +45,7 @@ package org.flowplayer.view {
_resizeToTextWidth = adjustToTextWidth;
createChildren(label);
}
-
+
public function setLabel(value:String, changeWidth:Boolean = true):void {
log.debug("setLabel, changeWidth " + changeWidth);
if (_label.text == value) return;
@@ -53,7 +53,7 @@ package org.flowplayer.view {
_label.text = value;
onResize();
}
-
+
private function createChildren(label:String):void {
_labelHolderLeft = new LabelHolderLeft();
addChild(_labelHolderLeft);
@@ -77,7 +77,7 @@ package org.flowplayer.view {
addChild(_label);
}
-
+
override protected function onResize():void {
log.debug("arranging label");
_labelHolderRight.height = height;
@@ -85,7 +85,7 @@ package org.flowplayer.view {
_labelHolderLeft.height = height;
_labelHolderLeft.scaleX = _labelHolderLeft.scaleY;
-
+
var format:TextFormat = _label.defaultTextFormat;
format.size = _labelHolder.height/3;
_label.setTextFormat(format);
diff --git a/typo3/contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/LicenseKey.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/LicenseKey.as
similarity index 96%
rename from typo3/contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/LicenseKey.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/LicenseKey.as
index b6e59b08717f..03dc90322f4b 100644
--- a/typo3/contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/LicenseKey.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/LicenseKey.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of Flowplayer.
@@ -18,12 +18,12 @@
*/
package org.flowplayer.view {
- import org.flowplayer.util.Log;
-
+ import org.flowplayer.util.Log;
+
CONFIG::commercialVersion {
import org.flowplayer.FlowplayerLicenseKey;
- }
+ }
CONFIG::commercialVersion
public class LicenseKey {
@@ -34,7 +34,7 @@ package org.flowplayer.view {
return FlowplayerLicenseKey.validate(swfUrl, version, configuredKeys, externalInterfaceAvailable);
}
}
-
+
CONFIG::freeVersion
public class LicenseKey {
diff --git a/typo3/contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/LogoView.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/LogoView.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/LogoView.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/LogoView.as
index 6c62674d74a6..96b78a2af0b9 100644
--- a/typo3/contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/LogoView.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/LogoView.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -100,21 +100,21 @@ package org.flowplayer.view {
}
}
}
-
+
CONFIG::freeVersion
private function copyrightNoticeheight():Number {
return _copyrightNotice.height;
}
-
+
CONFIG::commercialVersion
private function copyrightNoticeheight():Number {
return 0;
}
-
+
// override public function get width():Number {
// return managedWidth;
// }
-//
+//
// override public function get height():Number {
// return managedHeight;
// }
@@ -163,7 +163,7 @@ package org.flowplayer.view {
log.debug("image loaded " + loader.getContent());
initializeLogoImage(loader.getContent() as DisplayObject);
}
-
+
private function initializeLogoImage(image:DisplayObject):void {
log.debug("initializeLogoImage(), setting logo alpha to " + _model.alpha);
_image = image;
@@ -209,7 +209,7 @@ package org.flowplayer.view {
private function onFullscreen(event:FullScreenEvent):void {
log.debug("onFullscreen(), " + (event.fullScreen ? "enter fullscreen" : "exit fullscreen"));
if (event.fullScreen) {
-
+
if ( (_hideTimer && _hideTimer.running)) {
log.debug("onFullscreen(), hide timer is running -> returning")
// hide timer is running or the hide time already passed
@@ -264,7 +264,7 @@ package org.flowplayer.view {
_player.pluginRegistry.updateDisplayProperties(_model);
}
}
-
+
private function hide(fadeSpeed:int = 0):void {
log.debug("hide(), hiding logo");
_preHideAlpha = _model.alpha;
@@ -282,7 +282,7 @@ package org.flowplayer.view {
_panel.removeChild(this);
}
}
-
+
private function startTimer():void {
_hideTimer = new Timer(_model.displayTime * 1000, 1);
@@ -294,7 +294,7 @@ package org.flowplayer.view {
});
_hideTimer.start();
}
-
+
CONFIG::freeVersion
public function setModel(model:Logo):void {
log.debug("setModel() ignoring configured logo settings");
@@ -309,7 +309,7 @@ package org.flowplayer.view {
_model.linkUrl = "http://flowplayer.org";
log.debug("initial model dimensions " + _model.dimensions);
}
-
+
CONFIG::commercialVersion
public function setModel(model:Logo):void {
log.debug("setModel() using configured logo settings");
diff --git a/typo3/contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/PlayButtonOverlayView.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/PlayButtonOverlayView.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/PlayButtonOverlayView.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/PlayButtonOverlayView.as
index 73c8fbd7a1f7..a512b0e7ecfb 100644
--- a/typo3/contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/PlayButtonOverlayView.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript-commercial/org/flowplayer/view/PlayButtonOverlayView.as
@@ -43,7 +43,7 @@ package org.flowplayer.view {
import org.flowplayer.view.BuiltInAssetHelper;
public class PlayButtonOverlayView extends AbstractSprite implements Plugin {
-
+
private var _button:DisplayObject;
private var _pluginRegistry:PluginRegistry;
@@ -68,18 +68,18 @@ package org.flowplayer.view {
//#443 set accessibility for play button
AccessibilityUtil.setAccessible(this, "play");
-
+
startBuffering();
-
+
addEventListener(MouseEvent.MOUSE_OVER, onMouseOver);
addEventListener(MouseEvent.MOUSE_OUT, onMouseOut);
}
public function set playlist(playlist:Playlist):void {
_playlist = playlist;
- addListeners(playlist);
+ addListeners(playlist);
}
-
+
[External]
public function set label(label:String):void {
@@ -158,7 +158,7 @@ package org.flowplayer.view {
if (_play.label && _showButtonInitially) {
showButton(null, _play.label);
}
-
+
CONFIG::commercialVersion {
if (useLoadedImage()) {
loadImage(_play.url, function():void {
@@ -174,7 +174,7 @@ package org.flowplayer.view {
_play.dispatch(PluginEventType.LOAD);
}
}
-
+
CONFIG::commercialVersion
private function useLoadedImage():Boolean {
return Boolean(_play.url && ! _play.label && ! BuiltInAssetHelper.hasPlayButton);
@@ -200,7 +200,7 @@ package org.flowplayer.view {
eventSupport.onStop(stopBuffering);
eventSupport.onStop(showButton, isParentClip);
-
+
// onBeforeFinish: call stopBuffering first and then showButton (stopBuffering hides the button)
eventSupport.onBeforeFinish(stopBuffering);
@@ -212,7 +212,7 @@ package org.flowplayer.view {
//#415 regression issue with #395, stop the buffering animation correctly.
eventSupport.onBufferFull(stopBuffering, applyForClip);
-
+
eventSupport.onBeforeSeek(bufferUntilStarted);
eventSupport.onSeek(stopBuffering);
@@ -238,11 +238,11 @@ package org.flowplayer.view {
private function rotate(event:TimerEvent):void {
_rotation.rotation += 10;
}
-
- private function createChildren():void {
+
+ private function createChildren():void {
_rotation = new RotatingAnimation();
//addChild(_rotation); // bug #38
-
+
if (! _play.label) {
createInternalButton();
}
@@ -275,7 +275,7 @@ package org.flowplayer.view {
}
});
}
-
+
CONFIG::commercialVersion
private function initializeButtonImage(image:DisplayObject, show:Boolean):void {
switchButton(image);
@@ -299,7 +299,7 @@ package org.flowplayer.view {
_button.scaleX = _button.scaleY;
}
_rotation.setSize(width, height);
-
+
Arrange.center(_button, width, height);
log.debug("arranged to y " + _button.y + ", this height " + height + ", screen height " + (_screen ? _screen.height : 0));
}
@@ -316,7 +316,7 @@ package org.flowplayer.view {
onFadeOut();
}
}
-
+
private function onFadeOut():void {
restoreOriginalAlpha();
if (_tween && _tween.canceled) {
@@ -325,29 +325,29 @@ package org.flowplayer.view {
}
_tween = null;
log.debug("removing button");
-
+
removeChildIfAdded(_button);
// _screen.hidePlay();
}
-
+
private function show():void {
if (_tween) {
restoreOriginalAlpha();
log.debug("canceling fadeOut tween");
_tween.cancel();
}
-
+
if (_screen && this.parent == _screen) {
_screen.arrangePlay();
return;
}
-
+
if (_screen) {
log.debug("calling screen.showPlay");
_screen.showPlay();
}
}
-
+
private function restoreOriginalAlpha():void {
alpha = _origAlpha;
var play:DisplayProperties = model;
@@ -367,13 +367,13 @@ package org.flowplayer.view {
CONFIG::freeVersion {
switchLabel(label || _play.label);
}
-
+
if (! _button) return;
if (_rotation.parent == this) return;
-
+
if (event == null) {
// not called based on event --> update display props
-
+
var props:DisplayProperties = model;
props.display = "block";
_pluginRegistry.updateDisplayProperties(props);
@@ -384,27 +384,27 @@ package org.flowplayer.view {
show();
onResize();
}
-
+
public function showReplayButton(event:ClipEvent = null):void {
-
+
log.info("showReplayButton, playlist has more clips " + _playlist.hasNext(false));
if (event.isDefaultPrevented() && _playlist.hasNext(false)) {
// default prevented, will stop after current clip. Show replay button.
log.debug("showing replay button");
showButton(null, _play.replayLabel);
- return;
+ return;
}
if (_playlist.hasNext(false) && _playlist.nextClip.autoPlay) {
return;
}
showButton(event, _playlist.hasNext(false) ? null : _play.replayLabel);
}
-
+
public function hideButton(event:ClipEvent = null):void {
log.debug("hideButton() " + _button);
removeChildIfAdded(_button);
}
-
+
public function startBuffering(event:ClipEvent = null):void {
log.debug("startBuffering()" + event);
if (event && event.isDefaultPrevented()) return;
@@ -415,16 +415,16 @@ package org.flowplayer.view {
// return;
// }
addChild(_rotation);
-
+
// bug #62
if ( _tween && _player && _player.state == State.PLAYING ) {
removeChildIfAdded(_button);
}
-
+
show();
_rotation.start();
}
-
+
public function stopBuffering(event:ClipEvent = null):void {
log.debug("stopBuffering()");
_rotation.stop();
@@ -440,14 +440,14 @@ package org.flowplayer.view {
log.debug("removing child " + child);
removeChild(child);
}
-
+
public function onConfig(configProps:PluginModel):void {
}
-
+
public function getDefaultConfig():Object {
return null;
}
-
+
public function setScreen(screen:Screen, showInitially:Boolean = false):void {
_screen = screen;
_showButtonInitially = showInitially;
@@ -456,7 +456,7 @@ package org.flowplayer.view {
}
startBuffering();
}
-
+
private function get model():DisplayPluginModel {
return DisplayPluginModel(_pluginRegistry.getPlugin("play"));
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/mx/core/BitmapAsset.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/mx/core/BitmapAsset.as
similarity index 100%
rename from typo3/contrib/flowplayer/src/actionscript/mx/core/BitmapAsset.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/mx/core/BitmapAsset.as
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/config/Config.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/config/Config.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/config/Config.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/config/Config.as
index 70def5b63a6a..f2aefb032bc5 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/config/Config.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/config/Config.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -34,15 +34,15 @@ package org.flowplayer.config {
import org.flowplayer.util.Assert;
import org.flowplayer.util.LogConfiguration;
import org.flowplayer.util.PropertyBinder;
-
- import flash.display.DisplayObject;
-
+
+ import flash.display.DisplayObject;
+
use namespace flow_internal;
/**
* @author anssi
*/
- public class Config {
+ public class Config {
private var playList:Playlist;
private var _configObject:Object;
@@ -109,7 +109,7 @@ package org.flowplayer.config {
public function createClip(clipObj:Object):Clip {
return _playlistBuilder.createClip(clipObj);
}
-
+
public function createCuepoints(cueObjects:Array, callbackId:String, timeMultiplier:Number):Array {
return _playlistBuilder.createCuepointGroup(cueObjects, callbackId, timeMultiplier);
}
@@ -145,14 +145,14 @@ package org.flowplayer.config {
}
return null;
}
-
+
private function get viewObjectBuilder():PluginBuilder {
if (_pluginBuilder == null) {
_pluginBuilder = new PluginBuilder(_playerSwfUrl, _controlsVersion, _audioVersion, this, _configObject.plugins, _configObject);
}
return _pluginBuilder;
}
-
+
public function getScreenProperties():DisplayProperties {
return viewObjectBuilder.getScreen(getObject("screen"));
}
@@ -164,24 +164,24 @@ package org.flowplayer.config {
}
return play;
}
-
+
public function getLogo(view:DisplayObject):Logo {
return new PropertyBinder(new Logo(view, "logo"), null).copyProperties(getObject("logo"), true) as Logo;
}
-
+
public function getObject(name:String):Object {
return _configObject[name];
}
-
+
public function getLogConfiguration():LogConfiguration {
if (! _configObject.log) return new LogConfiguration();
return new PropertyBinder(new LogConfiguration(), null).copyProperties(_configObject.log) as LogConfiguration;
}
-
+
public function get licenseKey():Object {
return _configObject.key || _configObject.keys;
}
-
+
public function get canvas():Canvas {
if (! _canvas) {
var style:Object = getObject("canvas");
@@ -206,31 +206,31 @@ package org.flowplayer.config {
style[prop] = value;
}
}
-
+
public function get contextMenu():Array {
return getObject("contextMenu") as Array;
}
-
+
public function getPlugin(disp:DisplayObject, name:String, config:Object):PluginModel {
return viewObjectBuilder.getPlugin(disp, name, config);
}
-
+
public function get showErrors():Boolean {
if (! _configObject.hasOwnProperty("showErrors")) return true;
return _configObject["showErrors"];
}
-
+
public function get useBufferingAnimation():Boolean {
if (! _configObject.hasOwnProperty("buffering")) return true;
return _configObject["buffering"];
}
-
+
public function createHttpProvider(name:String):ProviderModel {
var provider:NetStreamControllingStreamProvider = new NetStreamControllingStreamProvider();
-
+
var model:ProviderModel = new ProviderModel(provider, name);
provider.model = model;
-
+
// var conf:Loadable = config.http;
// if (conf) {
// new PropertyBinder(model).copyProperties(conf.config);
@@ -249,9 +249,9 @@ package org.flowplayer.config {
public function get playlistFeed():String {
return _configObject.playlist is String ? _configObject.playlist : null;
}
-
+
public function get playerSwfUrl():String {
- return _playerSwfUrl;
+ return _playerSwfUrl;
}
public function get configObject():Object {
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/config/ConfigParser.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/config/ConfigParser.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/config/ConfigParser.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/config/ConfigParser.as
index 7a7c2929dbc6..698f3b945cd0 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/config/ConfigParser.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/config/ConfigParser.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/config/ExternalInterfaceHelper.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/config/ExternalInterfaceHelper.as
similarity index 95%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/config/ExternalInterfaceHelper.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/config/ExternalInterfaceHelper.as
index a2b7123b8633..695989ae1605 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/config/ExternalInterfaceHelper.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/config/ExternalInterfaceHelper.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -21,10 +21,10 @@ package org.flowplayer.config {
import flash.utils.describeType;
import flash.utils.getDefinitionByName;
import flash.utils.getQualifiedClassName;
-
+
import org.flowplayer.model.Callable;
import org.flowplayer.model.PluginMethod;
- import org.flowplayer.util.Log;
+ import org.flowplayer.util.Log;
/**
* @author api
@@ -36,7 +36,7 @@ package org.flowplayer.config {
public static function initializeInterface(callable:Callable, plugin:Object):void {
if (!ExternalInterface.available) return;
var xml:XML = describeType(plugin);
-
+
var exposed:XMLList = xml.*.(hasOwnProperty("metadata") && metadata.@name=="External");
log.info("Number of exposed methods and accessors: " + exposed.length());
for each (var exposedNode:XML in exposed) {
@@ -44,28 +44,28 @@ package org.flowplayer.config {
addMethods(callable, exposedNode, plugin);
}
}
-
+
private static function addMethods(callable:Callable, exposedNode:XML, plugin:Object):void {
var methodName:String = exposedNode.@name;
var convert:Boolean = exposedNode.metadata.arg.@key == "convert" ? exposedNode.metadata.arg.@value == "true" : false;
-
+
log.debug("------------" + methodName + ", has return value " + (exposedNode.@returnType != "void") +", convertResult " + convert);
- if (exposedNode.name() == "method") {
+ if (exposedNode.name() == "method") {
callable.addMethod(PluginMethod.method(methodName, methodName, (exposedNode.@returnType != "void"), convert));
-
+
} else if (exposedNode.name() == "accessor") {
var methodNameUppercased:String = methodName.charAt(0).toUpperCase() + methodName.substring(1);
if (exposedNode.@access == "readwrite") {
callable.addMethod(PluginMethod.getter("get" + methodNameUppercased, methodName, convert));
callable.addMethod(PluginMethod.setter("set" + methodNameUppercased, methodName));
-
+
} else if (exposedNode.@access == "readonly") {
callable.addMethod(PluginMethod.getter("get" + methodNameUppercased, methodName, convert));
-
+
} else {
callable.addMethod(PluginMethod.setter("set" + methodNameUppercased, methodName));
}
- }
+ }
}
public static function addCallback(methodName:String, func:Function):void {
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/config/PlaylistBuilder.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/config/PlaylistBuilder.as
similarity index 96%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/config/PlaylistBuilder.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/config/PlaylistBuilder.as
index ecb6825bdac3..cf9f65d3ee0d 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/config/PlaylistBuilder.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/config/PlaylistBuilder.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -24,7 +24,7 @@ package org.flowplayer.config {
import org.flowplayer.model.Playlist;
import org.flowplayer.util.Log;
import org.flowplayer.util.PropertyBinder;
- import org.flowplayer.util.URLUtil;
+ import org.flowplayer.util.URLUtil;
use namespace flow_internal;
@@ -61,7 +61,7 @@ package org.flowplayer.config {
* @return
*/
public function set playlistFeed(feed:String):void {
- _playlistFeed = feed;
+ _playlistFeed = feed;
}
@@ -119,7 +119,7 @@ package org.flowplayer.config {
if (isChild || clipObj.hasOwnProperty("position")) {
return clip;
}
-
+
if (clipObj.hasOwnProperty(NESTED_PLAYLIST)) {
addChildClips(clip, clipObj[NESTED_PLAYLIST]);
} else if (_commonClipObject && _commonClipObject.hasOwnProperty(NESTED_PLAYLIST)) {
@@ -156,10 +156,10 @@ package org.flowplayer.config {
}
return cues;
}
-
+
private function setDefaults(clipObj:Object):void {
if (clipObj == _commonClipObject) return;
-
+
for (var prop:String in _commonClipObject) {
if (! clipObj.hasOwnProperty(prop) && prop != NESTED_PLAYLIST) {
clipObj[prop] = _commonClipObject[prop];
@@ -189,7 +189,7 @@ package org.flowplayer.config {
}
return cue;
}
-
+
private function roundTime(time:int, timeMultiplier:Number):int {
return Math.round(time * timeMultiplier / 100) * 100;
}
@@ -197,10 +197,10 @@ package org.flowplayer.config {
private function parse(document:String, playlist:Playlist, commonClipObj:Object):void {
var playlist:Playlist = playlist;
if (document.indexOf("[") == 0) {
- var clips:Object = ConfigParser.parse(document);
- playlist.setClips(createClips(clips));
+ var clips:Object = ConfigParser.parse(document);
+ playlist.setClips(createClips(clips));
} else {
- new RSSPlaylistParser().parse(document, playlist, commonClipObj);
+ new RSSPlaylistParser().parse(document, playlist, commonClipObj);
}
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/config/PluginBuilder.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/config/PluginBuilder.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/config/PluginBuilder.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/config/PluginBuilder.as
index c580aefccafb..b8eb5b02646e 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/config/PluginBuilder.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/config/PluginBuilder.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -21,9 +21,9 @@ package org.flowplayer.config {
import org.flowplayer.model.Clip;
import org.flowplayer.model.ClipType;
import org.flowplayer.model.Playlist;
-
+
import flash.display.DisplayObject;
-
+
import org.flowplayer.model.DisplayPluginModel;
import org.flowplayer.model.DisplayPluginModelImpl;
import org.flowplayer.model.DisplayProperties;
@@ -89,7 +89,7 @@ package org.flowplayer.config {
}
private function hasAudioClipsWithoutProvider(playlist:Playlist):Boolean {
- var clips:Array = playlist.clips;
+ var clips:Array = playlist.clips;
for (var i:int; i < clips.length; i++) {
var clip:Clip = clips[i] as Clip;
@@ -145,7 +145,7 @@ package org.flowplayer.config {
var pluginObj:Object = confObjects[name];
return pluginObj == null;
}
-
+
private function initLoadable(name:String, version:String):Loadable {
log.debug("createLoadable() '" + name + "' version " + version);
if (isObjectDisabled(name, _pluginObjects)) {
@@ -160,14 +160,14 @@ package org.flowplayer.config {
} else {
log.debug(name + " was found in configuration, will not automatically add it into loadables");
}
-
+
if (! loadable.url) {
loadable.url = getLoadableUrl(name, version);
}
log.debug("createLoadable(), created loadable with url " + loadable.url)
return loadable;
}
-
+
private function findLoadable(name:String):Loadable {
for (var i:Number = 0; i < _loadables.length; i++) {
var plugin:Loadable = _loadables[i];
@@ -187,7 +187,7 @@ package org.flowplayer.config {
return "flowplayer." + name + ".swf";
}
}
-
+
private function getPlayerVersion():String {
var version:String = getVersionFromSwfName("flowplayer");
if (version) return version;
@@ -197,7 +197,7 @@ package org.flowplayer.config {
return getVersionFromSwfName("flowplayer.unlimited");
}
-
+
private function getVersionFromSwfName(swfName:String):String {
log.debug("getVersionFromSwfName() " + playerSwfName);
if (playerSwfName.indexOf(swfName + "-") < 0) return null;
@@ -207,7 +207,7 @@ package org.flowplayer.config {
private function get playerSwfName():String {
var lastSlash:Number = _playerURL.lastIndexOf("/");
- return _playerURL.substring(lastSlash + 1, _playerURL.indexOf(".swf") + 4);
+ return _playerURL.substring(lastSlash + 1, _playerURL.indexOf(".swf") + 4);
}
@@ -223,7 +223,7 @@ package org.flowplayer.config {
props.name = name;
return props;
}
-
+
public function getScreen(screenObj:Object):DisplayProperties {
log.warn("getScreen " + screenObj);
var screen:DisplayProperties = new DisplayPropertiesImpl(null, "screen", false);
@@ -246,11 +246,11 @@ package org.flowplayer.config {
screen.zIndex = 0;
return screen;
}
-
+
public function getPlugin(disp:DisplayObject, name:String, config:Object):PluginModel {
var plugin:DisplayPluginModel = new PropertyBinder(new DisplayPluginModelImpl(disp, name, false), "config").copyProperties(config, true) as DisplayPluginModel;
log.debug(name + " position specified in config " + plugin.position);
-
+
// add defaults settings from the plugin instance (will not override those set in config)
if (disp is Plugin) {
log.debug(name + " implements Plugin, querying defaultConfig");
@@ -267,12 +267,12 @@ package org.flowplayer.config {
}
return plugin;
}
-
+
private function fixPositionSettings(props:DisplayProperties, defaults:Object):void {
clearOpposite("bottom", "top", props, defaults);
clearOpposite("left", "right", props, defaults);
}
-
+
private function clearOpposite(prop1:String, prop2:String, props:DisplayProperties, defaults:Object):void {
if (props.position[prop1].hasValue() && defaults.hasOwnProperty(prop2)) {
delete defaults[prop2];
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/config/RSSPlaylistParser.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/config/RSSPlaylistParser.as
similarity index 92%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/config/RSSPlaylistParser.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/config/RSSPlaylistParser.as
index 38291316acf8..d45b73a7b709 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/config/RSSPlaylistParser.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/config/RSSPlaylistParser.as
@@ -1,5 +1,5 @@
package org.flowplayer.config {
-
+
import com.adobe.utils.XMLUtil;
import org.flowplayer.flow_internal;
@@ -11,9 +11,9 @@ package org.flowplayer.config {
use namespace flow_internal;
-
-
+
+
internal class RSSPlaylistParser {
private static const UNSUPPORTED_TYPE:int = 10;
private var log:Log = new Log(this);
@@ -21,7 +21,7 @@ package org.flowplayer.config {
private var ym:Namespace = new Namespace("http://search.yahoo.com/mrss/");
private var fp:Namespace = new Namespace("http://flowplayer.org/fprss/");
-
+
public function createClips(rawRSS:String, playlist:Playlist, commonClipObject:Object):Array {
return parse(rawRSS, playlist, commonClipObject);
}
@@ -31,18 +31,18 @@ package org.flowplayer.config {
if(! XMLUtil.isValidXML(rawRSS)) {
throw new Error("Feed does not contain valid XML.");
}
-
+
default xml namespace = ns;
var rss:XML = new XML(rawRSS);
-
+
if (rss.name() == "rss" && Number(rss.@version) <= 2)
- {
-
- for each (var item:XML in rss.channel.item) {
+ {
-
- try {
+ for each (var item:XML in rss.channel.item) {
+
+
+ try {
if(item.ym::content.length() > 0 && item.ym::thumbnail.length() > 0) {
var thumbnail:Clip = parseThumbnail(item, commonClipObject);
} else {
@@ -51,9 +51,9 @@ package org.flowplayer.config {
var clip:Clip = parseClip(item, commonClipObject, thumbnail != null);
} catch (e:Error) {
if (e.errorID == UNSUPPORTED_TYPE) {
- log.info("unsupported media type, ignoring this item");
+ log.info("unsupported media type, ignoring this item");
} else {
- throw e;
+ throw e;
}
}
@@ -73,40 +73,40 @@ package org.flowplayer.config {
}
}
- }
+ }
}
//#470 check for a playlist when replacing the playlist with an rss feed.
if (playlist) playlist.toIndex(0);
return result;
}
-
+
private function parseClip(item:XML, commonClipObject:Object, hasThumbnail:Boolean = false):Clip {
var clip:Clip = new Clip();
if (hasThumbnail) {
clip.autoPlay = false;
}
new PropertyBinder(clip, "customProperties").copyProperties(commonClipObject) as Clip;
-
+
if (!clip.getCustomProperty("bitrates")) clip.setCustomProperty("bitrates", []);
if (item.link) clip.linkUrl = item.link;
- //parse a group media:content items inside a media:group tag
+ //parse a group media:content items inside a media:group tag
if (item.ym::group.ym::content.length() > 0) {
parseMediaGroup(item.ym::group, clip);
}
-
+
//parse a single media:content item
if (item.ym::content.length() > 0) {
parseMediaItem(XML(item.ym::content), clip);
addBitrateItems(XML(item.ym::content), clip);
}
-
+
//add flowplayer clip properties
if (item.fp::clip.attributes().length() > 0) {
- parseClipProperties(item.fp::clip, clip);
+ parseClipProperties(item.fp::clip, clip);
}
-
+
//add custom clip properties from rss elements
for each (var childItem:XML in item.children()) {
addClipCustomProperty(clip, childItem, parseCustomProperty(childItem));
@@ -118,16 +118,16 @@ package org.flowplayer.config {
private function parseThumbnail(item:XML, commonClipObject:Object):Clip {
var clip:Clip = new Clip();
-
+
if (item.ym::thumbnail.length() > 0) {
parseMediaThumbnail(XML(item.ym::thumbnail), clip);
}
//add flowplayer clip properties
if (item.fp::thumbnail.attributes().length() > 0) {
- parseClipProperties(item.fp::thumbnail, clip);
+ parseClipProperties(item.fp::thumbnail, clip);
}
-
+
//add custom clip properties from rss elements
for each (var childItem:XML in item.children()) {
addClipCustomProperty(clip, childItem, parseCustomProperty(childItem));
@@ -151,7 +151,7 @@ package org.flowplayer.config {
binder.copyProperty(attr.name().toString(), attr.toString(), true);
}
}
-
+
private function addClipCustomProperty(clip:Clip, elem:XML, value:Object):void {
log.debug("getting property name for " + elem.localName() + " value is ", value);
var name:String = getCustomPropName(elem);
@@ -174,10 +174,10 @@ package org.flowplayer.config {
return "'" + elem.namespace().prefix + ":" + elem.localName().toString() + "'";
// return elem.namespace().prefix + elem.localName().charAt(0).toUpperCase() + elem.localName().substring(1);;
}
-
+
private function parseCustomProperty(elem:XML):Object {
if (elem.children().length() == 0 && elem.attributes().length() == 0) {
- return elem.toString();
+ return elem.toString();
}
if (elem.children().length() == 1 && XML(elem.children()[0]).nodeKind() == "text" && elem.attributes().length() == 0) {
log.debug("has one text child only, retrieving it's contents");
@@ -193,22 +193,22 @@ package org.flowplayer.config {
}
return result;
}
-
+
private function parseMediaGroup(group:XMLList, clip:Clip):Boolean {
var clipAdded:Boolean = false;
-
+
//obtain the first default item
var defaultItem:XMLList = group.ym::content.(hasOwnProperty('@isDefault') && @isDefault == 'true');
if (defaultItem[0]) {
- log.debug("parseMedia(): found default media item");
+ log.debug("parseMedia(): found default media item");
if (parseMediaItem(defaultItem[0], clip)) {
- log.debug("parseMedia(): using the default media item");
- clipAdded = true;
+ log.debug("parseMedia(): using the default media item");
+ clipAdded = true;
}
} else {
- //there are no default items obtain the first content that is streamable
+ //there are no default items obtain the first content that is streamable
for each (var itm:XML in group.ym::content) {
if (parseMediaItem(itm, clip)) {
trace("adding item");
@@ -217,21 +217,21 @@ package org.flowplayer.config {
}
}
}
-
+
//add bitrate items
for each (var item:XML in group.ym::content) {
addBitrateItems(item, clip);
}
-
+
if (clipAdded) return true;
-
+
log.info("could not find valid media type");
throw new Error("Could not find a supported media type", UNSUPPORTED_TYPE);
return false;
}
private function parseMediaItem(elem:XML, clip:Clip):Boolean {
-
+
clip.url = elem.@url.toString();
if(int(elem.@duration.toString()) > 0) {
clip.duration = int(elem.@duration.toString());
@@ -273,7 +273,7 @@ package org.flowplayer.config {
return false;
}
-
+
private function addBitrateItems(elem:XML, clip:Clip):void {
if (elem.@bitrate && elem.@width)
{
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/AbstractDurationTrackingController.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/AbstractDurationTrackingController.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/AbstractDurationTrackingController.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/AbstractDurationTrackingController.as
index 80c8dffd3722..3540b2e9311f 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/AbstractDurationTrackingController.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/AbstractDurationTrackingController.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -27,9 +27,9 @@ package org.flowplayer.controller {
import org.flowplayer.model.State;
import org.flowplayer.model.Status;
import org.flowplayer.util.Log;
-
- import flash.events.TimerEvent;
-
+
+ import flash.events.TimerEvent;
+
use namespace flow_internal;
/**
* @author anssi
@@ -124,7 +124,7 @@ package org.flowplayer.controller {
clip.dispatchBeforeEvent(new ClipEvent(ClipEventType.FINISH));
}
}
-
+
protected function onDurationReached():void {
}
@@ -181,26 +181,26 @@ package org.flowplayer.controller {
protected function get clip():Clip {
return _playlist.current;
}
-
+
protected function get playlist():Playlist {
return _playlist;
}
// FOLLOWING METHODS SHOULD BE OVERRIDDEN IN SUBCLASSES:
// The mimimum ilmemetation dispatches the event passed in the first parameter.
-
+
protected function doLoad(event:ClipEvent, clip:Clip, pauseAfterStart:Boolean = false):void {
}
-
+
protected function doPause(event:ClipEvent):void {
}
-
+
protected function doResume(event:ClipEvent):void {
}
-
+
protected function doStop(event:ClipEvent, closeStream:Boolean):void {
}
-
+
protected function doSeekTo(event:ClipEvent, seconds:Number):void {
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/BufferingState.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/BufferingState.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/BufferingState.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/BufferingState.as
index 98d5604b741d..856feb040dd5 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/BufferingState.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/BufferingState.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -18,7 +18,7 @@
package org.flowplayer.controller {
import flash.utils.Dictionary;
-
+
import org.flowplayer.controller.PlayListController;
import org.flowplayer.flow_internal;
import org.flowplayer.model.Clip;
@@ -27,21 +27,21 @@ package org.flowplayer.controller {
import org.flowplayer.model.ClipEventType;
import org.flowplayer.model.Playlist;
import org.flowplayer.model.State;
- import org.flowplayer.model.Status;
-
+ import org.flowplayer.model.Status;
+
use namespace flow_internal;
-
+
/**
* @author api
*/
internal class BufferingState extends PlayState {
-
+
private var _nextStateAfterBufferFull:PlayState;
-
+
public function BufferingState(stateCode:State, playList:Playlist, playListController:PlayListController, providers:Dictionary) {
super(stateCode, playList, playListController, providers);
}
-
+
internal override function play():void {
log.debug("play()");
stop();
@@ -64,7 +64,7 @@ package org.flowplayer.controller {
onEvent(ClipEventType.PAUSE, [silent]);
}
}
-
+
internal override function seekTo(seconds:Number, silent:Boolean = false):void {
if (silent || dispatchBeforeEvent(ClipEventType.SEEK, [seconds, silent]))
onEvent(ClipEventType.SEEK, [seconds]);
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ClipImageLoader.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ClipImageLoader.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ClipImageLoader.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ClipImageLoader.as
index 558ea6d60a6b..bfa39b753932 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ClipImageLoader.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ClipImageLoader.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -32,15 +32,15 @@ package org.flowplayer.controller {
_loader = loader;
_clip = clip;
}
-
+
public function addTextResourceUrl(url:String):void {
_loader.addTextResourceUrl(url);
}
-
+
public function addBinaryResourceUrl(url:String):void {
_loader.addBinaryResourceUrl(url);
}
-
+
public function load(url:String = null, completeListener:Function = null, ignored:Boolean = false):void {
_loader.load(url, completeListener, false);
}
@@ -48,17 +48,17 @@ package org.flowplayer.controller {
public function set completeListener(listener:Function):void {
_loader.completeListener = listener;
}
-
+
public function loadClip(clip:Clip, onLoadComplete:Function):void {
_clip = clip;
var imageLoader:ClipImageLoader = this;
load(clip.completeUrl, function(loader:ResourceLoader):void { onLoadComplete(imageLoader); });
}
-
+
public function getContent(url:String = null):Object {
return _loader.getContent(_clip.completeUrl);
}
-
+
public function clear():void {
_loader.clear();
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ClipURLResolver.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ClipURLResolver.as
similarity index 96%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ClipURLResolver.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ClipURLResolver.as
index 4733307fe684..1282eba020d5 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ClipURLResolver.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ClipURLResolver.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of FlowPlayer.
@@ -20,19 +20,19 @@
package org.flowplayer.controller {
import flash.events.NetStatusEvent;
import flash.net.NetConnection;
-
- import org.flowplayer.model.Clip;
+
+ import org.flowplayer.model.Clip;
/**
* @author api
*/
public interface ClipURLResolver {
-
+
/**
* Sets a listener that gets called if the resolve process fails.
*/
function set onFailure(listener:Function):void;
-
+
/**
* Resolve the URL for the specified clip.
* @param provider
@@ -48,6 +48,6 @@ import flash.net.NetConnection;
* @return if false, the streamProvider will ignore this event and will not send any events for it
*/
function handeNetStatusEvent(event:NetStatusEvent):Boolean;
-
+
}
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ClipURLResolverHelper.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ClipURLResolverHelper.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ClipURLResolverHelper.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ClipURLResolverHelper.as
index 7ec0e1de0289..0615d603a66a 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ClipURLResolverHelper.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ClipURLResolverHelper.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/CompositeClipUrlResolver.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/CompositeClipUrlResolver.as
similarity index 100%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/CompositeClipUrlResolver.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/CompositeClipUrlResolver.as
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ConnectionCallbacks.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ConnectionCallbacks.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ConnectionCallbacks.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ConnectionCallbacks.as
index 20570beaad2f..e028ef65ddc5 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ConnectionCallbacks.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ConnectionCallbacks.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of FlowPlayer.
*
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ConnectionProvider.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ConnectionProvider.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ConnectionProvider.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ConnectionProvider.as
index 7ed7dc4338a0..85f475041d28 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ConnectionProvider.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ConnectionProvider.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of FlowPlayer.
@@ -20,14 +20,14 @@
package org.flowplayer.controller {
import flash.events.NetStatusEvent;
import org.flowplayer.model.Clip;
-
+
/**
* @author api
*/
public interface ConnectionProvider {
-
+
function set connectionClient(client:Object):void;
-
+
/**
* Sets a listener that gets called if the connection fails.
* The function must have a parameter of type NetStatusEvent.
@@ -51,6 +51,6 @@ package org.flowplayer.controller {
* @return if false, the streamProvider will ignore this event and will not send any events for it
*/
function handeNetStatusEvent(event:NetStatusEvent):Boolean;
-
+
}
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/DefaultClipURLResolver.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/DefaultClipURLResolver.as
similarity index 97%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/DefaultClipURLResolver.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/DefaultClipURLResolver.as
index 9f59df1cd85b..7135a0520754 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/DefaultClipURLResolver.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/DefaultClipURLResolver.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of FlowPlayer.
@@ -20,9 +20,9 @@
package org.flowplayer.controller {
import flash.events.NetStatusEvent;
import flash.net.NetConnection;
-
+
import org.flowplayer.controller.ClipURLResolver;
- import org.flowplayer.model.Clip;
+ import org.flowplayer.model.Clip;
/**
* @author api
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/DefaultRTMPConnectionProvider.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/DefaultRTMPConnectionProvider.as
similarity index 97%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/DefaultRTMPConnectionProvider.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/DefaultRTMPConnectionProvider.as
index d134a3fa69b4..2ad44723a7fc 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/DefaultRTMPConnectionProvider.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/DefaultRTMPConnectionProvider.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of FlowPlayer.
@@ -24,9 +24,9 @@ package org.flowplayer.controller {
import org.flowplayer.controller.ConnectionProvider;
import org.flowplayer.model.Clip;
import org.flowplayer.util.Log;
-
+
import flash.events.NetStatusEvent;
- import flash.net.NetConnection;
+ import flash.net.NetConnection;
/**
* @author api
@@ -57,7 +57,7 @@ package org.flowplayer.controller {
_connection.objectEncoding = objectEndocing;
_connectionArgs = connectionArgs;
_clip = clip;
-
+
if (_connectionClient) {
_connection.client = _connectionClient;
}
@@ -76,7 +76,7 @@ package org.flowplayer.controller {
onConnectionStatus(event);
if (event.info.code == "NetConnection.Connect.Success" && _successListener != null) {
_successListener(_connection);
-
+
} else if (event.info.code == "NetConnection.Connect.Rejected") {
if(event.info.ex.code == 302) {
var redirectUrl:String = event.info.ex.redirect;
@@ -84,18 +84,18 @@ package org.flowplayer.controller {
_clip.setCustomProperty("netConnectionUrl", redirectUrl);
setTimeout(connect, 100, _provider, _clip, _successListener, _connection.objectEncoding, _connectionArgs);
}
-
+
} else if (["NetConnection.Connect.Failed", "NetConnection.Connect.AppShutdown", "NetConnection.Connect.InvalidApp"].indexOf(event.info.code) >= 0) {
-
+
if (_failureListener != null) {
_failureListener();
}
- }
+ }
}
/**
* Called when NetStatusEvent.NET_STATUS is received for the NetConnection. This
- * gets called before the successListener() gets called.
+ * gets called before the successListener() gets called.
* @param event
* @return
*/
@@ -108,11 +108,11 @@ package org.flowplayer.controller {
}
_connectionClient = client;
}
-
+
public function set onFailure(listener:Function):void {
_failureListener = listener;
}
-
+
protected function get connection():NetConnection {
return _connection;
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/EndedState.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/EndedState.as
similarity index 96%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/EndedState.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/EndedState.as
index 408b407be099..db66b534ddb8 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/EndedState.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/EndedState.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -18,11 +18,11 @@
package org.flowplayer.controller {
import flash.utils.Dictionary;
-
+
import org.flowplayer.controller.PlayListController;
import org.flowplayer.controller.PlayState;
import org.flowplayer.model.Playlist;
- import org.flowplayer.model.State;
+ import org.flowplayer.model.State;
/**
* @author api
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ImageController.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ImageController.as
similarity index 96%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ImageController.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ImageController.as
index f75973b144af..52bac87c8598 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ImageController.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ImageController.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -17,19 +17,19 @@
*/
package org.flowplayer.controller {
- import org.flowplayer.model.Playlist;
+ import org.flowplayer.model.Playlist;
import flash.display.Loader;
import flash.display.DisplayObject;
import flash.events.Event;
import flash.events.EventDispatcher;
-
+
import org.flowplayer.controller.AbstractDurationTrackingController;
import org.flowplayer.controller.MediaController;
import org.flowplayer.model.Clip;
import org.flowplayer.model.ClipEvent;
import org.flowplayer.model.ClipEventType;
- import org.flowplayer.util.Log;
-
+ import org.flowplayer.util.Log;
+
import org.flowplayer.view.ImageHolder;
/**
@@ -48,7 +48,7 @@ package org.flowplayer.controller {
override protected function get allowRandomSeek():Boolean {
return true;
}
-
+
override protected function doLoad(event:ClipEvent, clip:Clip, pauseAfterStart:Boolean = false):void {
// _durationlessClipPaused = false;
@@ -62,26 +62,26 @@ package org.flowplayer.controller {
_loader.loadClip(clip, onLoadComplete);
dispatchPlayEvent(event);
}
-
+
override protected function doPause(event:ClipEvent):void {
dispatchPlayEvent(event);
}
-
+
override protected function doResume(event:ClipEvent):void {
dispatchPlayEvent(event);
}
-
+
override protected function doStop(event:ClipEvent, closeStream:Boolean):void {
dispatchPlayEvent(event);
}
-
+
override protected function doSeekTo(event:ClipEvent, seconds:Number):void {
if (event) {
dispatchPlayEvent(new ClipEvent(ClipEventType.SEEK, seconds));
}
}
-
- private function onLoadComplete(loader:ClipImageLoader):void {
+
+ private function onLoadComplete(loader:ClipImageLoader):void {
if ( loader.getContent() is Loader && ImageHolder.hasOffscreenContent(loader.getContent() as Loader ))
{
var holder:ImageHolder = new ImageHolder(loader.getContent() as Loader);
@@ -99,13 +99,13 @@ package org.flowplayer.controller {
clip.dispatch(ClipEventType.START);
clip.dispatch(ClipEventType.METADATA);
clip.dispatch(ClipEventType.BUFFER_FULL);
-
+
if (clip.duration == 0) {
-
+
clip.onResume(function(event:ClipEvent):void {
clip.dispatchBeforeEvent(new ClipEvent(ClipEventType.FINISH));
});
-
+
clip.dispatchEvent(new ClipEvent(ClipEventType.RESUME));
}
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/InStreamTracker.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/InStreamTracker.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/InStreamTracker.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/InStreamTracker.as
index 7cabf2ee2918..65ad890de9e4 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/InStreamTracker.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/InStreamTracker.as
@@ -26,7 +26,7 @@ package org.flowplayer.controller {
import org.flowplayer.flow_internal;
use namespace flow_internal;
-
+
public class InStreamTracker {
private var _controller:PlayListController;
private var _timer:Timer;
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/LocalSOVolumeStorage.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/LocalSOVolumeStorage.as
similarity index 95%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/LocalSOVolumeStorage.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/LocalSOVolumeStorage.as
index 0b65235e2ade..884e690a8657 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/LocalSOVolumeStorage.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/LocalSOVolumeStorage.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of FlowPlayer.
@@ -18,10 +18,10 @@
*/
package org.flowplayer.controller {
- import org.flowplayer.util.Log;
+ import org.flowplayer.util.Log;
import org.flowplayer.controller.VolumeStorage;
-
- import flash.net.SharedObject;
+
+ import flash.net.SharedObject;
/**
* @author api
@@ -36,14 +36,14 @@ package org.flowplayer.controller {
}
public static function create():VolumeStorage {
- try {
+ try {
return new LocalSOVolumeStorage(SharedObject.getLocal("org.flowplayer"));
} catch (e:Error) {
return new NullVolumeStorage();
}
- return null;
+ return null;
}
-
+
public function persist():void {
log.debug("persisting volume " + _storedVolume.data.volume);
try {
@@ -58,19 +58,19 @@ package org.flowplayer.controller {
if (_storedVolume.size == 0) return 0.5;
return getVolume(_storedVolume.data.volume);
}
-
+
public function get muted():Boolean {
return _storedVolume.data.volumeMuted;
}
-
+
public function set volume(value:Number):void {
_storedVolume.data.volume = value;
}
-
+
public function set muted(value:Boolean):void {
_storedVolume.data.volumeMuted = value;
}
-
+
private function getVolume(volumeObj:Object):Number {
if (volumeObj == 0) return 0;
if (!volumeObj is Number) return 0.5;
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/MediaController.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/MediaController.as
similarity index 96%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/MediaController.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/MediaController.as
index 4ae81f7a9d10..ef68aade78cd 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/MediaController.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/MediaController.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -19,7 +19,7 @@
package org.flowplayer.controller {
import org.flowplayer.model.ClipEventType;
import org.flowplayer.model.State;
- import org.flowplayer.model.Status;
+ import org.flowplayer.model.Status;
/**
* @author anssi
@@ -31,13 +31,13 @@ package org.flowplayer.controller {
* the specified event when the given event has been successfully
* initiated. For example, the PlayEventType.START event is dispatched
* when the media playback has been initiated without errors.
- *
+ *
* @param event the type of the event to be handled, the event's before phase
* has been already processed, and the event cannot be canceled at this point any more
* @param params parameters related to this event
*/
function onEvent(event:ClipEventType, params:Array = null):void;
-
+
/**
* Gets the status of this controller.
*/
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/MediaControllerFactory.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/MediaControllerFactory.as
similarity index 94%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/MediaControllerFactory.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/MediaControllerFactory.as
index 6ae0bad3452c..d79b4839224b 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/MediaControllerFactory.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/MediaControllerFactory.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -17,19 +17,19 @@
*/
package org.flowplayer.controller {
- import org.flowplayer.model.ClipError;
- import org.flowplayer.config.Config;
- import org.flowplayer.model.ClipEventType;
- import org.flowplayer.view.PlayerEventDispatcher;
- import org.flowplayer.util.Log;
-
+ import org.flowplayer.model.ClipError;
+ import org.flowplayer.config.Config;
+ import org.flowplayer.model.ClipEventType;
+ import org.flowplayer.view.PlayerEventDispatcher;
+ import org.flowplayer.util.Log;
+
import flash.utils.Dictionary;
-
+
import org.flowplayer.flow_internal;
import org.flowplayer.model.Clip;
import org.flowplayer.model.ClipType;
import org.flowplayer.model.Playlist;
- import org.flowplayer.model.ProviderModel;
+ import org.flowplayer.model.ProviderModel;
/**
* @author anssi
@@ -51,7 +51,7 @@ package org.flowplayer.controller {
private var _loader:ResourceLoader;
use namespace flow_internal;
-
+
public function MediaControllerFactory(providers:Dictionary, playerEventDispatcher:PlayerEventDispatcher, config:Config, loader:ResourceLoader) {
_providers = providers;
_instance = this;
@@ -73,11 +73,11 @@ package org.flowplayer.controller {
throw new Error("No media controller found for clip type " + clipType);
return null;
}
-
+
flow_internal function getVolumeController():VolumeController {
return _volumeController;
}
-
+
private function getStreamProviderController(playlist:Playlist, inStream:Boolean = false):MediaController {
if (inStream) {
if (! _inStreamController) {
@@ -85,13 +85,13 @@ package org.flowplayer.controller {
}
return _inStreamController;
}
-
+
if (!_streamProviderController) {
_streamProviderController = new StreamProviderController(this, getVolumeController(), _config, playlist);
}
return _streamProviderController;
}
-
+
private function getImageController(playlist:Playlist, inStream:Boolean = false):MediaController {
if (inStream) {
if (! _inStreamImageController) {
@@ -108,7 +108,7 @@ package org.flowplayer.controller {
internal function addProvider(provider:ProviderModel):void {
_providers[provider.name] = provider.pluginObject;
}
-
+
public function getProvider(clip:Clip):StreamProvider {
var provider:StreamProvider = _providers[clip.provider];
if (! provider) {
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/NetConnectionClient.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/NetConnectionClient.as
similarity index 94%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/NetConnectionClient.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/NetConnectionClient.as
index f5b5661000f6..d251fad09577 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/NetConnectionClient.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/NetConnectionClient.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of FlowPlayer.
*
@@ -17,10 +17,10 @@
*/
package org.flowplayer.controller {
- import org.flowplayer.util.Log;
- import org.flowplayer.model.ClipEventType;
+ import org.flowplayer.util.Log;
+ import org.flowplayer.model.ClipEventType;
import org.flowplayer.controller.ConnectionCallbacks;
- import org.flowplayer.model.Clip;
+ import org.flowplayer.model.Clip;
/**
* @author api
@@ -39,7 +39,7 @@ package org.flowplayer.controller {
// log.debug("received onBWDone");
// _clip.dispatch(ClipEventType.CONNECTION_EVENT, "onBWDone", rest.length > 0 ? rest[0] : null);
// }
-
+
public function onFCSubscribe(infoObject:Object):void {
_clip.dispatch(ClipEventType.CONNECTION_EVENT, "onFCSubscribe", infoObject);
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/NetStreamCallbacks.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/NetStreamCallbacks.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/NetStreamCallbacks.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/NetStreamCallbacks.as
index 27ca5f19716b..6b4184b0600d 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/NetStreamCallbacks.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/NetStreamCallbacks.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of FlowPlayer.
@@ -18,7 +18,7 @@
*/
package org.flowplayer.controller {
-
+
/**
* An interface for objects to be set to the NetStream.client property.
*/
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/NetStreamClient.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/NetStreamClient.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/NetStreamClient.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/NetStreamClient.as
index acecf3f3f6f0..a4903359f16b 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/NetStreamClient.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/NetStreamClient.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of FlowPlayer.
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/NetStreamControllingStreamProvider.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/NetStreamControllingStreamProvider.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/NetStreamControllingStreamProvider.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/NetStreamControllingStreamProvider.as
index 1203ac3b0f2b..41f17abe82f1 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/NetStreamControllingStreamProvider.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/NetStreamControllingStreamProvider.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -308,7 +308,7 @@ package org.flowplayer.controller {
* @inheritDoc
*/
- public function getVideo(clip:Clip):DisplayObject {
+ public function getVideo(clip:Clip):DisplayObject {
var video:Video;
//#355 provide support for 10.0 and 10.1
@@ -325,7 +325,7 @@ package org.flowplayer.controller {
video = new Video();
video.smoothing = clip.smoothing;
}
- return video;
+ return video;
}
@@ -730,7 +730,7 @@ package org.flowplayer.controller {
var defaultResolver:ClipURLResolver = null;
if (_model.urlResolver) {
defaultResolver = PluginModel(_player.pluginRegistry.getPlugin(_model.urlResolver)).pluginObject as ClipURLResolver;
- }
+ }
_clipUrlResolverHelper = new ClipURLResolverHelper(_player, this, defaultResolver);
}
@@ -955,7 +955,7 @@ package org.flowplayer.controller {
}
}
-
+
private function get connectionProvider():ConnectionProvider {
var provider:ConnectionProvider;
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/NullNetStreamClient.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/NullNetStreamClient.as
similarity index 97%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/NullNetStreamClient.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/NullNetStreamClient.as
index 2e402096c11a..b9f8d2ba9ffe 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/NullNetStreamClient.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/NullNetStreamClient.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of FlowPlayer.
@@ -19,44 +19,44 @@
package org.flowplayer.controller {
import org.flowplayer.controller.NetStreamCallbacks;
-
+
/**
* @author api
*/
internal class NullNetStreamClient implements NetStreamCallbacks {
public function onCuePoint(infoObject:Object):void {
}
-
+
public function onXMPData(infoObject:Object):void {
}
-
+
public function onBWDone(infoObject:Object):void {
}
-
+
public function onCaption(cps:String, spk:Number):void {
}
-
+
public function onCaptionInfo(infoObject:Object):void {
}
-
+
public function onFCSubscribe(infoObject:Object):void {
}
-
+
public function onLastSecond(infoObject:Object):void {
}
-
+
public function onPlayStatus(infoObject:Object):void {
}
-
+
public function onImageData(infoObject:Object):void {
}
-
+
public function RtmpSampleAccess(infoObject:Object):void {
}
-
+
public function onTextData(infoObject:Object):void {
}
-
+
public function onMetaData(infoObject:Object):void {
}
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/NullVolumeStorage.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/NullVolumeStorage.as
similarity index 91%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/NullVolumeStorage.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/NullVolumeStorage.as
index 058846a511b7..1fc4787de4b2 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/NullVolumeStorage.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/NullVolumeStorage.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of FlowPlayer.
@@ -18,9 +18,9 @@
*/
package org.flowplayer.controller {
- import org.flowplayer.util.Log;
+ import org.flowplayer.util.Log;
import org.flowplayer.controller.VolumeStorage;
-
+
/**
* @author api
*/
@@ -28,23 +28,23 @@ package org.flowplayer.controller {
private var log:Log = new Log(this);
public function NullVolumeStorage() {
- log.warn("not allowed to store data on this machine");
+ log.warn("not allowed to store data on this machine");
}
-
+
public function persist():void {
}
-
+
public function get volume():Number {
return 1;
}
-
+
public function get muted():Boolean {
return false;
}
-
+
public function set volume(value:Number):void {
}
-
+
public function set muted(value:Boolean):void {
}
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ParallelRTMPConnectionProvider.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ParallelRTMPConnectionProvider.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ParallelRTMPConnectionProvider.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ParallelRTMPConnectionProvider.as
index 9755092c172d..3173d1cce91e 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ParallelRTMPConnectionProvider.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ParallelRTMPConnectionProvider.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of FlowPlayer.
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ParallelRTMPConnector.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ParallelRTMPConnector.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ParallelRTMPConnector.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ParallelRTMPConnector.as
index b9c89a008553..4606b6851117 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ParallelRTMPConnector.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ParallelRTMPConnector.as
@@ -17,7 +17,7 @@ package org.flowplayer.controller {
import org.flowplayer.util.Log;
public class ParallelRTMPConnector {
- protected var log:Log = new Log(this);
+ protected var log:Log = new Log(this);
protected var _url:String;
protected var _successListener:Function;
protected var _connectionClient:Object;
@@ -68,13 +68,13 @@ package org.flowplayer.controller {
}
protected function onConnectionStatus(event:NetStatusEvent):void {
-
+
}
private function _onConnectionStatus(event:NetStatusEvent):void {
-
+
onConnectionStatus(event);
-
+
log.debug(this + "::_onConnectionStatus() " + event.info.code);
if (event.info.code == "NetConnection.Connect.Success") {
@@ -86,7 +86,7 @@ package org.flowplayer.controller {
_connection.close();
}
return;
-
+
}
if (event.info.code == "NetConnection.Connect.Rejected" && event.info.ex && event.info.ex.code == 302) {
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/PausedState.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/PausedState.as
similarity index 97%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/PausedState.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/PausedState.as
index e1814e058f8c..43b7109aed9a 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/PausedState.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/PausedState.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -18,19 +18,19 @@
package org.flowplayer.controller {
import flash.utils.Dictionary;
-
+
import org.flowplayer.controller.PlayListController;
import org.flowplayer.model.ClipEventSupport;
import org.flowplayer.model.ClipEventType;
import org.flowplayer.model.Playlist;
import org.flowplayer.model.State;
- import org.flowplayer.model.Status;
+ import org.flowplayer.model.Status;
/**
* @author api
*/
internal class PausedState extends PlayState {
-
+
public function PausedState(stateCode:State, playList:Playlist, playListController:PlayListController, providers:Dictionary) {
super(stateCode, playList, playListController, providers);
}
@@ -47,14 +47,14 @@ import org.flowplayer.model.ClipEventType;
internal override function play():void {
resume();
}
-
+
internal override function resume(silent:Boolean = false):void {
log.debug("resume(), changing to stage " + playingState);
if (silent || dispatchBeforeEvent(ClipEventType.RESUME, [silent])) {
changeState(playingState);
onEvent(ClipEventType.RESUME, [silent]);
}
- }
+ }
internal override function stopBuffering():void {
log.debug("stopBuffering() called");
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/PlayListController.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/PlayListController.as
similarity index 97%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/PlayListController.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/PlayListController.as
index 62084fe411ed..4e842abc9d4e 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/PlayListController.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/PlayListController.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -28,15 +28,15 @@ package org.flowplayer.controller {
import org.flowplayer.model.Status;
import org.flowplayer.util.Log;
import org.flowplayer.view.PlayerEventDispatcher;
-
- import flash.utils.Dictionary;
-
+
+ import flash.utils.Dictionary;
+
use namespace flow_internal;
/**
* PlayListController is responsible in moving the playback within the clips in the playList.
* It does this by delegating to the the PlayStates.
- *
+ *
* @author anssi
*/
public class PlayListController {
@@ -113,7 +113,7 @@ package org.flowplayer.controller {
flow_internal function playInstream(clip:Clip):void {
_state.pause();
playlist.setInStreamClip(clip);
- setPlayState(PlayState.waitingState);
+ setPlayState(PlayState.waitingState);
_state.play();
}
@@ -131,7 +131,7 @@ package org.flowplayer.controller {
_state.play();
return _playList.current;
}
-
+
private function playClip(clip:Clip = null, clipIndex:Number = undefined):Clip {
if (clip) {
replacePlaylistAndPlay(clip);
@@ -151,7 +151,7 @@ package org.flowplayer.controller {
}
_state.play();
}
- return _playList.current;
+ return _playList.current;
}
flow_internal function startBuffering():Clip {
@@ -163,7 +163,7 @@ package org.flowplayer.controller {
_state.stopBuffering();
return _playList.current;
}
-
+
flow_internal function next(obeyClipPlaySettings:Boolean, silent:Boolean = false, skipPreAndPostroll:Boolean = true):Clip {
if (!_playList.hasNext(skipPreAndPostroll)) return _playList.current;
return moveTo(_playList.next, obeyClipPlaySettings, silent, skipPreAndPostroll);
@@ -171,27 +171,27 @@ package org.flowplayer.controller {
flow_internal function previous(skipPreAndPostroll:Boolean = true):Clip {
if (!_playList.hasPrevious(skipPreAndPostroll)) return _playList.current;
-
+
if (currentIsAudioWithSplash() && _playList.currentIndex >= 3) {
_state.stop();
_playList.toIndex(_playList.currentIndex - 2);
_state.play();
return _playList.current;
}
-
+
return moveTo(_playList.previous, false, false, skipPreAndPostroll);
}
-
+
private function currentIsAudioWithSplash():Boolean {
- return _playList.current.type == ClipType.AUDIO && _playList.current.image
+ return _playList.current.type == ClipType.AUDIO && _playList.current.image
&& _playList.previousClip && _playList.previousClip.type == ClipType.IMAGE;
}
flow_internal function moveTo(advanceFunction:Function, obeyClipPlaySettings:Boolean, silent:Boolean, skipPreAndPostroll:Boolean = true):Clip {
var stateBeforeStopping:State = getState();
-
+
log.debug("moveTo() current state is " + _state);
-
+
if (silent) {
_state.stop(true, true);
setPlayState(PlayState.waitingState);
@@ -202,7 +202,7 @@ package org.flowplayer.controller {
// now we can move to next/previous in the playList
var clip:Clip = advanceFunction(skipPreAndPostroll) as Clip;
log.info("moved in playlist, current clip is " + _playList.current + ", next clip is " + clip);
-
+
log.debug("moved in playlist, next clip autoPlay " + clip.autoPlay + ", autoBuffering " + clip.autoBuffering);
if (obeyClipPlaySettings) {
log.debug("obeying clip autoPlay & autoBuffeing");
@@ -224,26 +224,26 @@ package org.flowplayer.controller {
log.debug("not obeying playlist settings");
if (stateBeforeStopping == State.PAUSED || stateBeforeStopping == State.WAITING) {
_state.startBuffering();
- } else {
+ } else {
_state.play();
}
}
-
+
return clip;
}
-
+
flow_internal function pause(silent:Boolean = false):Clip {
log.debug("pause(), silent? " + silent);
_state.pause(silent);
return _playList.current;
}
-
+
flow_internal function resume(silent:Boolean = false):Clip {
log.debug("resume(), silent? " + silent);
_state.resume(silent);
return _playList.current;
}
-
+
flow_internal function stop(silent:Boolean = false):Clip {
if (silent) {
setPlayState(PlayState.waitingState);
@@ -255,11 +255,11 @@ package org.flowplayer.controller {
if (! _playList) return null;
return _playList.current;
}
-
+
flow_internal function close(silent:Boolean):void {
_state.close(silent);
}
-
+
flow_internal function seekTo(seconds:Number, silent:Boolean = false):Clip {
log.debug("seekTo " + seconds + ", silent? " + silent);
if (seconds >= 0) {
@@ -269,7 +269,7 @@ package org.flowplayer.controller {
}
return _playList.current;
}
-
+
flow_internal function getState():State {
if (! _state) return null;
return _state.state;
@@ -286,15 +286,15 @@ package org.flowplayer.controller {
_state = state;
_state.active = true;
}
-
+
flow_internal function isInState(state:PlayState):Boolean {
return _state == state;
}
-
+
flow_internal function get muted():Boolean {
return _state.muted;
}
-
+
flow_internal function set muted(value:Boolean):void {
_state.muted = value;
}
@@ -307,7 +307,7 @@ package org.flowplayer.controller {
if (! _state) return 0;
return _state.volume;
}
-
+
flow_internal function get status():Status {
return _state.status;
}
@@ -337,7 +337,7 @@ package org.flowplayer.controller {
}
play();
}
-
+
flow_internal function addProvider(provider:ProviderModel):void {
PlayState.addProvider(provider);
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/PlayState.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/PlayState.as
similarity index 97%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/PlayState.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/PlayState.as
index a437331b5c71..f56cd175584c 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/PlayState.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/PlayState.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -18,7 +18,7 @@
package org.flowplayer.controller {
import flash.utils.Dictionary;
-
+
import org.flowplayer.config.Config;
import org.flowplayer.controller.MediaController;
import org.flowplayer.controller.MediaControllerFactory;
@@ -35,23 +35,23 @@ package org.flowplayer.controller {
import org.flowplayer.model.Status;
import org.flowplayer.util.Assert;
import org.flowplayer.util.Log;
- import org.flowplayer.view.PlayerEventDispatcher;
- use namespace flow_internal;
-
+ import org.flowplayer.view.PlayerEventDispatcher;
+ use namespace flow_internal;
+
/**
* PlayStates are responsible for controlling the media playback of one clip.
* The states delegate to MediaControllers. PlayStates also dispatch PlayEvents.
- *
- *
+ *
+ *
* @author api
*/
internal class PlayState {
-
+
protected var log:Log = new Log(this);
protected var playListController:PlayListController;
protected var playList:Playlist;
//private var screen:Screen;
-
+
internal static var waitingState:PlayState;
internal static var endedState:EndedState;
internal static var playingState:PlayingState;
@@ -78,7 +78,7 @@ package org.flowplayer.controller {
if (!_controllerFactory)
_controllerFactory = new MediaControllerFactory(providers, playerEventDispatcher, config, loader);
}
-
+
internal static function addProvider(provider:ProviderModel):void {
_controllerFactory.addProvider(provider);
}
@@ -138,38 +138,38 @@ package org.flowplayer.controller {
} else {
if ( dispatchBeforeEvent(ClipEventType.STOP, [closeStreamAndConnection]) )
- onEvent(ClipEventType.STOP, [closeStreamAndConnection]);
+ onEvent(ClipEventType.STOP, [closeStreamAndConnection]);
if (closeStreamAndConnection && playList.current.parent != null) {
playList.setInStreamClip(null);
onEvent(ClipEventType.STOP, [true]);
}
- }
+ }
}
-
+
internal function close(silent:Boolean):void {
if (dispatchBeforeEvent(ClipEventType.STOP, [true, silent])) {
changeState(waitingState);
onEvent(ClipEventType.STOP, [true, silent]);
}
}
-
+
internal function pause(silent:Boolean = false):void {
log.debug("cannot pause in this state");
}
-
+
internal function resume(silent:Boolean = false):void {
log.debug("cannot resume in this state");
}
-
+
internal function seekTo(seconds:Number, silent:Boolean = false):void {
log.debug("cannot seek in this state");
}
-
+
internal function get muted():Boolean {
return _controllerFactory.getVolumeController().muted;
}
-
+
internal function set muted(value:Boolean):void {
_controllerFactory.getVolumeController().muted = value;
}
@@ -203,7 +203,7 @@ package org.flowplayer.controller {
}
return true;
}
-
+
protected function onEvent(eventType:ClipEventType, params:Array = null):void {
log.debug("calling onEvent(" + eventType.name + ") on media controller ");
getMediaController().onEvent(eventType, params);
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/PlayTimeTracker.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/PlayTimeTracker.as
similarity index 94%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/PlayTimeTracker.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/PlayTimeTracker.as
index 78341ebd3ff4..d89085e1b34f 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/PlayTimeTracker.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/PlayTimeTracker.as
@@ -1,21 +1,21 @@
package org.flowplayer.controller {
import org.flowplayer.model.ClipType;
import org.flowplayer.model.ClipEvent;
- import org.flowplayer.model.ClipEventType;
- import org.flowplayer.model.Cuepoint;
- import org.flowplayer.util.Log;
-
- import flash.events.TimerEvent;
- import flash.utils.Timer;
- import flash.events.EventDispatcher;
-
- import org.flowplayer.model.Clip;import flash.utils.getTimer;
-
+ import org.flowplayer.model.ClipEventType;
+ import org.flowplayer.model.Cuepoint;
+ import org.flowplayer.util.Log;
+
+ import flash.events.TimerEvent;
+ import flash.utils.Timer;
+ import flash.events.EventDispatcher;
+
+ import org.flowplayer.model.Clip;import flash.utils.getTimer;
+
/**
* PlayTimeTracker is responsible of tracking the playhead time. It checks
* if the clip's whole duration has been played and notifies listeners when
* this happens. It's also responsible of firing cuepoints.
- *
+ *
* @author Anssi
*/
internal class PlayTimeTracker extends EventDispatcher {
@@ -35,7 +35,7 @@ package org.flowplayer.controller {
_clip = clip;
_controller = controller;
}
-
+
public function start():void {
if (_progressTimer && _progressTimer.running)
stop();
@@ -45,7 +45,7 @@ package org.flowplayer.controller {
log.debug("started at time " + time);
_progressTimer.start();
_onLastSecondDispatched = false;
-
+
_endDetectTimer = new Timer(100);
}
@@ -64,7 +64,7 @@ package org.flowplayer.controller {
public function get time():Number {
if (! _progressTimer) return 0;
-
+
var timeNow:Number = getTimer();
var _timePassed:Number = _storedTime + (timeNow - _startTime)/1000;
@@ -75,7 +75,7 @@ package org.flowplayer.controller {
}
return _controller.time;
}
-
+
if (! _progressTimer.running) return _storedTime;
return _timePassed;
}
@@ -86,7 +86,7 @@ package org.flowplayer.controller {
return;
}
checkAndFireCuepoints();
-
+
if (_clip.live) return;
var timePassed:Number = time;
if (! _clip.duration) {
@@ -98,15 +98,15 @@ package org.flowplayer.controller {
}
return;
}
-
+
checkCompletelyPlayed(_clip);
-
+
if (! _onLastSecondDispatched && timePassed >= _clip.duration - 1) {
_onLastSecondDispatched = true;
_clip.dispatch(ClipEventType.LAST_SECOND);
}
}
-
+
private function checkCompletelyPlayed(clip:Clip):void {
// _clip.endLimit is used by the AdSense plugin for some workarounds
if (durationReached) {
@@ -126,7 +126,7 @@ package org.flowplayer.controller {
}
private function startEndTimer(clip:Clip):void {
-
+
bindEndListeners();
_endDetectTimer.addEventListener(TimerEvent.TIMER,
function(event:TimerEvent):void {
@@ -139,19 +139,19 @@ package org.flowplayer.controller {
_lastTimeDetected = time;
}
);
-
+
log.debug("starting end detect timer");
_endDetectTimer.start();
-
+
}
-
+
private function completelyPlayed():void {
if(_endDetectTimer.running) {
unbindEndListeners();
_endDetectTimer.reset();
_endDetectTimer = null;
}
-
+
stop();
log.info(this + " completely played, dispatching complete");
log.info("clip.durationFromMetadata " + _clip.durationFromMetadata);
@@ -163,10 +163,10 @@ package org.flowplayer.controller {
var streamTime:Number = _controller.time;
var timeRounded:Number = Math.round(streamTime*10) * 100;
// log.debug("checkAndFireCuepoints, rounded stream time is " + timeRounded);
-
+
// also get the points from previous rounds, just to make sure we are not skipping any
var points:Array = collectCuepoints(_clip, timeRounded);
-
+
if (! points || points.length == 0) {
return;
}
@@ -182,7 +182,7 @@ package org.flowplayer.controller {
}
}
}
-
+
private function collectCuepoints(clip:Clip, timeRounded:Number):Array {
var result:Array = new Array();
for (var i:Number = 5; i >= 0; i--) {
@@ -196,32 +196,32 @@ package org.flowplayer.controller {
if (lastFireTime == -1) return false;
return getTimer() - cue.lastFireTime < 2000;
}
-
+
private function stopTimer(event:ClipEvent):void {
log.debug("state is paused, endTimer stopped");
_clip.unbind(stopTimer);
_endDetectTimer.reset();
_clip.onResume(restartEndTimer);
}
-
+
private function killTimer(event:ClipEvent):void {
log.debug("buffer is empty, clip has reached his end");
_clip.unbind(killTimer);
_endDetectTimer.reset();
completelyPlayed();
}
-
+
private function restartEndTimer(event:ClipEvent):void {
_clip.unbind(restartEndTimer);
log.debug("restarting timer");
startEndTimer(_clip);
}
-
+
private function bindEndListeners():void {
_clip.onPause(stopTimer);
_clip.onBufferEmpty(killTimer);
}
-
+
private function unbindEndListeners():void {
_clip.unbind(stopTimer);
_clip.unbind(killTimer);
@@ -230,6 +230,6 @@ package org.flowplayer.controller {
// public function get durationReached():Boolean {
// return _clip.duration > 0 && time >= _clip.duration;
// }
-
+
}
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/PlayingState.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/PlayingState.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/PlayingState.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/PlayingState.as
index a503985a7bb6..97dcb06eb569 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/PlayingState.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/PlayingState.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ProviderTypes.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ProviderTypes.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ProviderTypes.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ProviderTypes.as
index 313a7b580dda..6c5a2f8be447 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ProviderTypes.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ProviderTypes.as
@@ -1,7 +1,7 @@
package org.flowplayer.controller {
public class ProviderTypes {
-
+
public static const PSEUDO:String = "pseudo";
public static const RTMP:String = "rtmp";
public static const HTTP:String = "http";
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ResourceLoader.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ResourceLoader.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ResourceLoader.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ResourceLoader.as
index 4f6c498bc7bf..4ccf7c97e76d 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ResourceLoader.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ResourceLoader.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of FlowPlayer.
@@ -25,20 +25,20 @@ package org.flowplayer.controller {
* be resolved relative to the embedding HTML page or to the player SWF.
* The urls are resolved relative to the player SWF when the player is
* in "embedded mode" (embedded outside of the hosting site).
- *
+ *
* @author api
*/
public interface ResourceLoader {
function addTextResourceUrl(url:String):void;
-
+
function addBinaryResourceUrl(url:String):void;
-
+
/**
* Clears the urls previously added.
*/
function clear():void;
-
+
function set completeListener(listener:Function):void;
function set errorHandler(errorHandler:ErrorHandler):void;
@@ -47,8 +47,8 @@ package org.flowplayer.controller {
* Loads the specified url or from urls previously added.
*/
function load(url:String = null, completeListener:Function = null, isTextResource:Boolean = false):void;
-
-
+
+
function getContent(url:String = null):Object;
function get loadComplete():Boolean;
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ResourceLoaderImpl.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ResourceLoaderImpl.as
similarity index 97%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ResourceLoaderImpl.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ResourceLoaderImpl.as
index 65c5ed517aca..4f2b64fa2dad 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/ResourceLoaderImpl.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/ResourceLoaderImpl.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -20,8 +20,8 @@ package org.flowplayer.controller {
import flash.system.LoaderContext;
import org.flowplayer.model.PlayerError;
- import org.flowplayer.util.URLUtil;
-
+ import org.flowplayer.util.URLUtil;
+
import flash.display.Loader;
import flash.events.Event;
import flash.events.EventDispatcher;
@@ -29,9 +29,9 @@ package org.flowplayer.controller {
import flash.events.SecurityErrorEvent;
import flash.net.URLLoader;
import flash.net.URLRequest;
-
+
import org.flowplayer.util.Log;
- import org.flowplayer.view.ErrorHandler;
+ import org.flowplayer.view.ErrorHandler;
/**
* @author api
@@ -63,7 +63,7 @@ package org.flowplayer.controller {
}
public function set completeListener(listener:Function):void {
- _completeListener = listener;
+ _completeListener = listener;
}
/**
@@ -92,7 +92,7 @@ package org.flowplayer.controller {
}
startLoading();
}
-
+
public function getContent(url:String = null):Object {
try {
var loader:Object = _loaders[url ? url : _urls[0]];
@@ -147,7 +147,7 @@ package org.flowplayer.controller {
}
}
}
-
+
private function onIOError(event:IOErrorEvent):void {
log.error("IOError: " + event.text);
handleError("Unable to load resources: " + event.text);
@@ -157,21 +157,21 @@ package org.flowplayer.controller {
log.error("SecurityError: " + event.text);
handleError("cannot access the resource file (try loosening Flash security settings): " + event.text);
}
-
+
protected function handleError(errorMessage:String, e:Error = null):void {
if (_errorHandler) {
_errorHandler.handleError(PlayerError.RESOURCE_LOAD_FAILED, errorMessage + (e ? ": " + e.message : ""));
}
}
-
+
/**
* Sets the error handler. All load errors will be handled with the specified
* handler.
- */
+ */
public function set errorHandler(errorHandler:ErrorHandler):void {
_errorHandler = errorHandler;
}
-
+
public function clear():void {
_urls = new Array();
_loaders = new Array();
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/StreamProvider.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/StreamProvider.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/StreamProvider.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/StreamProvider.as
index 3025fa774600..2aebcd83d44a 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/StreamProvider.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/StreamProvider.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/StreamProviderController.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/StreamProviderController.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/StreamProviderController.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/StreamProviderController.as
index 23a67e42ee37..0fefb8963044 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/StreamProviderController.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/StreamProviderController.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/TimeProvider.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/TimeProvider.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/TimeProvider.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/TimeProvider.as
index d98af0235152..53bd8c302331 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/TimeProvider.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/TimeProvider.as
@@ -1,4 +1,4 @@
-/*
+/*
* Author: Anssi Piirainen, <api@iki.fi>
*
* Copyright (c) 2009-2011 Flowplayer Oy
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/VolumeController.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/VolumeController.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/VolumeController.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/VolumeController.as
index 484c28e0419d..e70cc2d60ba6 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/VolumeController.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/VolumeController.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -21,13 +21,13 @@ package org.flowplayer.controller {
import org.flowplayer.model.PlayerEvent;
import org.flowplayer.util.Log;
import org.flowplayer.view.PlayerEventDispatcher;
-
+
import flash.events.TimerEvent;
import flash.media.SoundChannel;
import flash.media.SoundTransform;
import flash.net.NetStream;
- import flash.utils.Timer;
-
+ import flash.utils.Timer;
+
use namespace flow_internal;
/**
@@ -56,14 +56,14 @@ package org.flowplayer.controller {
_netStream = netStream;
setTransform(_muted ? new SoundTransform(0) : _soundTransform);
}
-
+
private function setTransform(transform:SoundTransform):void {
if (_netStream) {
_netStream.soundTransform = transform;
}
if (_soundChannel) {
_soundChannel.soundTransform = transform;
- }
+ }
}
private function doMute(persistMuteSetting:Boolean):void {
@@ -119,7 +119,7 @@ package org.flowplayer.controller {
private function onTimerDelayComplete(event:TimerEvent):void {
storeVolume();
}
-
+
private function storeVolume(muted:Boolean = false):void {
log.info("persisting volume level");
_storeDelayTimer.stop();
@@ -127,27 +127,27 @@ package org.flowplayer.controller {
_storedVolume.muted = muted;
_storedVolume.persist();
}
-
+
private function restoreVolume():void {
_storedVolume = LocalSOVolumeStorage.create();
-
+
_soundTransform.volume = _storedVolume.volume;
if (_storedVolume.muted)
doMute(false);
}
-
+
private function dispatchBeforeEvent(event:PlayerEvent):Boolean {
return _playerEventDispatcher.dispatchBeforeEvent(event);
}
-
+
private function dispatchEvent(event:PlayerEvent):void {
_playerEventDispatcher.dispatchEvent(event);
}
-
+
public function get muted():Boolean {
return _muted;
}
-
+
public function set muted(muted:Boolean):void {
if (muted) {
doMute(true);
@@ -155,7 +155,7 @@ package org.flowplayer.controller {
unMute();
}
}
-
+
public function set soundChannel(channel:SoundChannel):void {
_soundChannel = channel;
setTransform(_muted ? new SoundTransform(0) : _soundTransform);
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/VolumeStorage.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/VolumeStorage.as
similarity index 97%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/VolumeStorage.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/VolumeStorage.as
index 9f0e0bf9904a..2322c4273501 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/VolumeStorage.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/VolumeStorage.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of FlowPlayer.
@@ -23,16 +23,16 @@ package org.flowplayer.controller {
* @author api
*/
internal interface VolumeStorage {
-
+
function set volume(value:Number):void;
-
+
function get volume():Number;
-
+
function set muted(value:Boolean):void;
-
+
function get muted():Boolean;
-
+
function persist():void;
-
+
}
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/WaitingState.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/WaitingState.as
similarity index 97%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/WaitingState.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/WaitingState.as
index 511b89b3bbf5..f00b26acc1e3 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/controller/WaitingState.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/controller/WaitingState.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -19,13 +19,13 @@
package org.flowplayer.controller {
import org.flowplayer.model.Clip;
import org.flowplayer.model.ClipEventType;
-
+
import flash.utils.Dictionary;
-
+
import org.flowplayer.controller.PlayListController;
import org.flowplayer.model.ClipEvent;
import org.flowplayer.model.Playlist;
- import org.flowplayer.model.State;
+ import org.flowplayer.model.State;
/**
* @author api
@@ -35,7 +35,7 @@ import org.flowplayer.model.ClipEventType;
public function WaitingState(stateCode:State, playList:Playlist, playListController:PlayListController, providers:Dictionary) {
super(stateCode, playList, playListController, providers);
}
-
+
internal override function play():void {
log.debug("play()");
if (! playListReady) return;
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/flow_internal.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/flow_internal.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/flow_internal.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/flow_internal.as
index c029782ca6c5..191e6dd157bb 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/flow_internal.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/flow_internal.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -19,5 +19,5 @@
package org.flowplayer {
public namespace flow_internal = "http://flowplayer.org/core/internal";
-
+
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/AbstractConstraint.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/AbstractConstraint.as
similarity index 92%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/AbstractConstraint.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/AbstractConstraint.as
index ea46c31df455..a834b819f763 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/AbstractConstraint.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/AbstractConstraint.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -16,20 +16,20 @@
* along with Flowplayer. If not, see <http://www.gnu.org/licenses/>.
*/
package org.flowplayer.layout {
- import org.flowplayer.util.Arrange;
-
- import flash.display.StageDisplayState;
+ import org.flowplayer.util.Arrange;
+
+ import flash.display.StageDisplayState;
import flash.display.DisplayObject;
import flash.display.Stage;
import flash.events.EventDispatcher;
import flash.geom.Rectangle;
-
- import org.flowplayer.layout.Layout;
+
+ import org.flowplayer.layout.Layout;
internal class AbstractConstraint extends EventDispatcher {
private var layout:Layout;
- private var margins:Array;
+ private var margins:Array;
private var view:DisplayObject;
public function AbstractConstraint(view:DisplayObject, layout:Layout, margins:Array) {
@@ -44,13 +44,13 @@ package org.flowplayer.layout {
public function setMarginConstraint(margin:Number, constraint:Constraint):void {
margins[margin] = constraint;
}
-
+
public function removeMarginConstraint(constraint:Constraint):void {
for (var i : Number = 0; i < margins.length; i++) {
if (margins[i] == constraint)
margins[i] = null;
}
- }
+ }
public function getConstrainedView():DisplayObject {
return view;
@@ -63,11 +63,11 @@ package org.flowplayer.layout {
protected function getContainer():DisplayObject {
return layout.getContainer();
}
-
+
protected function getContainerWidth():Number {
return getContainer() is Stage ? Arrange.getStageWidth(getContainer() as Stage) : getContainer().width;
}
-
+
protected function getContainerHeight():Number {
return getContainer() is Stage ? Arrange.getStageHeight(getContainer() as Stage) : getContainer().height;
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/AbstractLayout.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/AbstractLayout.as
similarity index 96%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/AbstractLayout.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/AbstractLayout.as
index cfaceb70c7d3..07e675bb7f3d 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/AbstractLayout.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/AbstractLayout.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -17,8 +17,8 @@
*/
package org.flowplayer.layout {
- import org.flowplayer.model.DisplayProperties;
-
+ import org.flowplayer.model.DisplayProperties;
+
import flash.display.DisplayObject;
import flash.display.DisplayObjectContainer;
import flash.display.Stage;
@@ -26,8 +26,8 @@ package org.flowplayer.layout {
import flash.events.EventDispatcher;
import flash.geom.Rectangle;
import flash.utils.Dictionary;
-
- import org.flowplayer.util.Log;
+
+ import org.flowplayer.util.Log;
/**
* @author anssi
@@ -38,17 +38,17 @@ package org.flowplayer.layout {
private var _container:DisplayObjectContainer;
private var _constraints:Dictionary = new Dictionary();
private var _listeners:Dictionary = new Dictionary();
-
+
public function AbstractLayout(container:DisplayObjectContainer) {
this._container = container;
if (container is Stage)
container.addEventListener(Event.RESIZE, onContainerResize);
}
-
+
private function onContainerResize(event:Event):void {
draw();
}
-
+
public function draw(disp:DisplayObject = null):void {
log.info("redrawing layout");
if (disp) {
@@ -60,7 +60,7 @@ package org.flowplayer.layout {
dispatchEvent(new LayoutEvent(LayoutEvent.RESIZE, this));
}
}
-
+
public function addConstraint(constraint:Constraint, listenerFunc:Function = null):void {
_constraints[constraint.getConstrainedView()] = constraint;
@@ -69,11 +69,11 @@ package org.flowplayer.layout {
this.addEventListener(LayoutEvent.RESIZE, listenerFunc);
}
}
-
+
public function getConstraint(view:DisplayObject):Constraint {
return _constraints[view];
}
-
+
public function removeView(view:DisplayObject):void {
if (_listeners[view]) {
this.removeEventListener(LayoutEvent.RESIZE, _listeners[view]);
@@ -85,24 +85,24 @@ package org.flowplayer.layout {
public function getContainer():DisplayObject {
return _container;
}
-
+
public function getBounds(view:Object):Rectangle {
var constraint:Constraint = _constraints[view];
if (! constraint) return null;
return constraint.getBounds();
}
-
+
protected function get constraints():Dictionary {
return _constraints;
}
-
+
protected function get listeners():Dictionary {
return _listeners;
}
-
+
public function addView(view:DisplayObject, listener:Function, properties:DisplayProperties):void {
}
-
+
public function update(view:DisplayObject, properties:DisplayProperties):Rectangle {
return null;
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/Constraint.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/Constraint.as
similarity index 92%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/Constraint.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/Constraint.as
index ce806ad0f911..59335c530e39 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/Constraint.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/Constraint.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -16,20 +16,20 @@
* along with Flowplayer. If not, see <http://www.gnu.org/licenses/>.
*/
package org.flowplayer.layout {
- import flash.display.DisplayObject;
- import flash.geom.Rectangle;
-
+ import flash.display.DisplayObject;
+ import flash.geom.Rectangle;
+
public interface Constraint {
-
+
function getConstrainedView():DisplayObject;
function getBounds():Rectangle;
-
+
function getMarginConstraints():Array;
-
+
function setMarginConstraint(margin:Number, constraint:Constraint):void;
-
+
function removeMarginConstraint(constraint:Constraint):void;
-
+
}
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/Dimensions.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/Dimensions.as
similarity index 96%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/Dimensions.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/Dimensions.as
index d55e3bc91f8e..d95a7e960ef8 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/Dimensions.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/Dimensions.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of Flowplayer.
@@ -19,29 +19,29 @@
package org.flowplayer.layout {
import flash.display.DisplayObject;
-
+
import org.flowplayer.model.Cloneable;
- import org.flowplayer.util.Arrange;
+ import org.flowplayer.util.Arrange;
/**
* @author api
*/
public class Dimensions implements Cloneable {
-
+
private var _width:Length = new Length();
private var _height:Length = new Length();
-
+
public function clone():Cloneable {
var clone:Dimensions = new Dimensions();
clone._width = _width.clone() as Length;
clone._height = _height.clone() as Length;
return clone;
}
-
+
public function get width():Length {
return _width;
}
-
+
public function set widthValue(width:Object):void {
if (width is Length) {
_width = width as Length;
@@ -49,11 +49,11 @@ package org.flowplayer.layout {
_width.value = width;
}
}
-
+
public function get height():Length {
return _height;
}
-
+
public function set heightValue(height:Object):void {
if (height is Length) {
_height = height as Length;
@@ -61,23 +61,23 @@ package org.flowplayer.layout {
_height.value = height;
}
}
-
+
public function fillValues(container:DisplayObject):void {
if (_width.px >= 0)
_width.pct = _width.px / Arrange.getWidth(container) * 100;
else if (_width.pct >= 0)
_width.px = width.pct/100 * Arrange.getWidth(container);
-
+
if (_height.px >= 0)
_height.pct = _height.px / Arrange.getHeight(container) * 100;
else if (_height.pct >= 0)
_height.px = height.pct/100 * Arrange.getHeight(container);
}
-
+
public function toString():String {
return "(" + _width + ") x (" + _height + ")";
}
-
+
public function hasValue(property:String):Boolean {
if (property == "width") return _width.hasValue();
if (property == "height") return _height.hasValue();
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/DrawWrapper.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/DrawWrapper.as
similarity index 92%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/DrawWrapper.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/DrawWrapper.as
index ba9346599568..9a813e5cd8d5 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/DrawWrapper.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/DrawWrapper.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -17,11 +17,11 @@
*/
package org.flowplayer.layout {
- import org.flowplayer.view.AbstractSprite;
- import org.flowplayer.util.Log;
-
+ import org.flowplayer.view.AbstractSprite;
+ import org.flowplayer.util.Log;
+
import flash.display.DisplayObject;
- import flash.geom.Rectangle;
+ import flash.geom.Rectangle;
/**
* @author api
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/FixedContraint.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/FixedContraint.as
similarity index 95%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/FixedContraint.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/FixedContraint.as
index 76215e43e948..5f98f4378838 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/FixedContraint.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/FixedContraint.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -19,8 +19,8 @@
package org.flowplayer.layout {
import flash.display.DisplayObject;
import flash.geom.Rectangle;
-
- import org.flowplayer.layout.Constraint;
+
+ import org.flowplayer.layout.Constraint;
/**
* @author anssi
@@ -32,7 +32,7 @@ package org.flowplayer.layout {
public function FixedContraint(length:Number) {
this.length = length;
}
-
+
public function getBounds():Rectangle {
return new Rectangle(0, 0, length, length);
}
@@ -40,14 +40,14 @@ package org.flowplayer.layout {
public function getConstrainedView():DisplayObject {
return null;
}
-
+
public function getMarginConstraints():Array {
return null;
}
-
+
public function setMarginConstraint(margin:Number, constraint:Constraint):void {
}
-
+
public function removeMarginConstraint(constraint:Constraint):void {
}
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/Layout.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/Layout.as
similarity index 92%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/Layout.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/Layout.as
index 55c6a88dcade..c4ee8360253c 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/Layout.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/Layout.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -16,21 +16,21 @@
* along with Flowplayer. If not, see <http://www.gnu.org/licenses/>.
*/
package org.flowplayer.layout {
- import org.flowplayer.model.DisplayProperties;
-
+ import org.flowplayer.model.DisplayProperties;
+
import flash.display.DisplayObject;
- import flash.geom.Rectangle;
+ import flash.geom.Rectangle;
public interface Layout {
-
+
function addView(view:DisplayObject, listener:Function, properties:DisplayProperties):void;
function update(view:DisplayObject, properties:DisplayProperties):Rectangle;
-
+
function removeView(view:DisplayObject):void;
-
+
function getContainer():DisplayObject;
-
+
function getBounds(view:Object):Rectangle;
function draw(disp:DisplayObject = null):void;
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/LayoutEvent.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/LayoutEvent.as
similarity index 96%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/LayoutEvent.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/LayoutEvent.as
index e26b175404a5..76b636b1a46b 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/LayoutEvent.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/LayoutEvent.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -17,16 +17,16 @@
*/
package org.flowplayer.layout {
- import flash.events.Event;
+ import flash.events.Event;
/**
* @author anssi
*/
public class LayoutEvent extends Event {
-
+
public static const RESIZE:String = "resize";
public var layout:Layout;
-
+
public function LayoutEvent(type:String, layout:Layout, bubbles:Boolean = false, cancelable:Boolean = true) {
super(type, bubbles, cancelable);
this.layout = layout;
@@ -35,7 +35,7 @@ package org.flowplayer.layout {
public override function clone():Event {
return new LayoutEvent(type, layout, bubbles, cancelable);
}
-
+
public override function toString():String {
return formatToString("ResizeEvent", "type", "layout", "bubbles", "cancelable", "eventPhase");
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/Length.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/Length.as
similarity index 96%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/Length.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/Length.as
index 2d8eaee1ccaa..750441ccdce4 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/Length.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/Length.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -17,9 +17,9 @@
*/
package org.flowplayer.layout {
- import org.flowplayer.util.Log;
+ import org.flowplayer.util.Log;
import org.flowplayer.model.Cloneable;
- import org.flowplayer.util.NumberUtil;
+ import org.flowplayer.util.NumberUtil;
/**
* @author api
@@ -44,16 +44,16 @@ package org.flowplayer.layout {
clone._px = _px;
return clone;
}
-
+
public function set value(value:Object):void {
setValue(value);
}
-
+
public function clear():void {
_px = NaN;
_pct = NaN;
}
-
+
public function setValue(valueObject:Object):void {
if (valueObject && valueObject is String) {
var valStr:String = valueObject as String;
@@ -64,7 +64,7 @@ package org.flowplayer.layout {
_pct = NaN;
}
}
-
+
public function plus(other:Length, toPxFunc:Function, toPctFunc:Function):Length {
log.debug(this + " plus() " + other);
var result:Length = new Length();
@@ -91,29 +91,29 @@ package org.flowplayer.layout {
public function get px():Number {
return _px;
}
-
+
public function set px(px:Number):void {
_px = px;
}
-
+
public function get pct():Number {
return _pct;
}
-
+
public function set pct(pct:Number):void {
_pct = pct;
}
-
+
public function asObject():Object {
if (_px >= 0) return _px;
if (_pct >= 0) return _pct + "%";
return undefined;
}
-
+
public function toString():String {
return "[Dimension] " + _px + "px -- " + _pct + "%";
}
-
+
public function toPx(containerLength:Number):Number {
if (_pct >= 0) return containerLength * _pct / 100;
if (_px >= 0) return _px;
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/LengthMath.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/LengthMath.as
similarity index 97%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/LengthMath.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/LengthMath.as
index 18c197e1bb18..55117c1adddc 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/LengthMath.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/LengthMath.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of Flowplayer.
@@ -18,31 +18,31 @@
*/
package org.flowplayer.layout {
- import org.flowplayer.util.Log;
- import org.flowplayer.util.Arrange;
-
+ import org.flowplayer.util.Log;
+ import org.flowplayer.util.Arrange;
+
import flash.display.DisplayObject;
-
+
import org.flowplayer.model.DisplayProperties;
-
- import com.adobe.utils.StringUtil;
+
+ import com.adobe.utils.StringUtil;
/**
* @author api
*/
public class LengthMath {
private static const log:Log = new Log("org.flowplayer.layout::LengthMath");
-
+
public static function sum(props:DisplayProperties, valuesToAdd:Object, container:DisplayObject):DisplayProperties {
var containerWidth:Number = Arrange.getWidth(container);
var containerHeight:Number = Arrange.getHeight(container);
-
+
addValue(props, valuesToAdd, "alpha");
addValue(props, valuesToAdd, "opacity");
addValue(props, valuesToAdd, "display");
addValue(props, valuesToAdd, "visible");
addValue(props, valuesToAdd, "zIndex");
-
+
addDimension("width", props, valuesToAdd, dimToPx(containerWidth), dimToPct(containerWidth));
addDimension("height", props, valuesToAdd, dimToPx(containerHeight), dimToPct(containerHeight));
log.debug("sum(): result dimensions " + props.dimensions);
@@ -57,7 +57,7 @@ package org.flowplayer.layout {
props.position.toBottom(containerHeight, height);
addPosition("bottom", props, valuesToAdd, height, posToPx(height, containerHeight), posToPct(height, containerHeight));
}
-
+
var width:Number = props.dimensions.width.toPx(containerWidth);
if (hasValue(valuesToAdd, "left")) {
log.debug("adding to left");
@@ -89,7 +89,7 @@ package org.flowplayer.layout {
to[dimProp] = width;
}
}
-
+
private static function addPosition(posProp:String, to:DisplayProperties, valuesToAdd:Object, height:Number, toPxFunc:Function, toPctFunc:Function):void {
var top:Object = valuesToAdd[posProp];
if (incremental(top)) {
@@ -103,7 +103,7 @@ package org.flowplayer.layout {
to[posProp] = top;
}
}
-
+
private static function posToPct(dim:Number, containerDim:Number):Function {
return function(px:Number):Number {
return ((px + dim/2) / containerDim) * 100;
@@ -134,7 +134,7 @@ package org.flowplayer.layout {
log.debug("incremental? " + width + ", " + result);
return result;
}
-
+
private static function hasValue(valueObj:Object, prop:String):Boolean {
return containsValue(valueObj[prop]);
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/MarginConstraint.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/MarginConstraint.as
similarity index 95%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/MarginConstraint.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/MarginConstraint.as
index 33e5c678a51e..1242166fcef1 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/MarginConstraint.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/MarginConstraint.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -17,14 +17,14 @@
*/
package org.flowplayer.layout {
- import org.flowplayer.util.Log;
- import org.flowplayer.layout.Constraint;
-
+ import org.flowplayer.util.Log;
+ import org.flowplayer.layout.Constraint;
+
import flash.display.DisplayObject;
import flash.geom.Rectangle;
-
+
import org.flowplayer.layout.AbstractConstraint;
- import org.flowplayer.layout.Layout;
+ import org.flowplayer.layout.Layout;
/**
* @author anssi
@@ -38,19 +38,19 @@ package org.flowplayer.layout {
super(view, layout, margins);
_dimensions = dimensions;
}
-
+
public function getBounds():Rectangle {
return new Rectangle(getLeftMargin(), getTopMargin(), getWidth(), getHeight());
}
-
+
private function getWidth():Number {
return _dimensions.width.toPx(getContainerWidth()) || getContainerWidth() - getLeftMargin() - getRightMargin();
}
-
+
private function getHeight():Number {
return _dimensions.height.toPx(getContainerHeight()) || getContainerHeight() - getTopMargin() - getBottomMargin();
}
-
+
protected function getTopMargin():Number {
return getMargin(0, 2, "height", getContainerHeight());
}
@@ -58,11 +58,11 @@ package org.flowplayer.layout {
protected function getRightMargin():Number {
return getMargin(1, 3, "width", getContainerWidth());
}
-
+
protected function getBottomMargin():Number {
return getMargin(2, 0, "height", getContainerHeight());
}
-
+
protected function getLeftMargin():Number {
return getMargin(3, 1, "width", getContainerWidth());
}
@@ -73,12 +73,12 @@ package org.flowplayer.layout {
if (! constraint) {
// if we have the opposite constraint, that will rule now
var oppositeConstraint:Constraint = getMarginConstraints()[otherMargin];
-
+
var length:Number = _dimensions[dimensionProp].toPx(containerLength);
if (!oppositeConstraint)
throw new Error(getConstrainedView() + ": not enough info to place object on Panel. Need top|bottom and left|right display properties.");
-
-
+
+
var result:Number = oppositeConstraint ? containerLength - length - oppositeConstraint.getBounds()[dimensionProp] : 0;
// log.debug(getConstrainedView() + ": " + dimensionProp + ": " + length + ": getMargin(), margin " +margin+ " using opposite constraint " + otherMargin + " is " + result);
return result;
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/MarginLayout.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/MarginLayout.as
similarity index 97%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/MarginLayout.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/MarginLayout.as
index 1815d6fb0110..3d2ade8051ee 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/MarginLayout.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/MarginLayout.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -17,17 +17,17 @@
*/
package org.flowplayer.layout {
- import org.flowplayer.model.DisplayProperties;
-
+ import org.flowplayer.model.DisplayProperties;
+
import flash.display.DisplayObject;
import flash.display.DisplayObjectContainer;
import flash.display.Stage;
import flash.geom.Rectangle;
-
+
import org.flowplayer.layout.AbstractLayout;
import org.flowplayer.layout.Constraint;
import org.flowplayer.layout.Layout;
- import org.flowplayer.util.Log;
+ import org.flowplayer.util.Log;
/**
* @author anssi
@@ -48,7 +48,7 @@ package org.flowplayer.layout {
// log.info("added view " +view+ " to panel " + constraint.getBounds());
draw(view);
}
-
+
public override function update(view:DisplayObject, properties:DisplayProperties):Rectangle {
// log.debug("update, margins " + margins);
var constraint:MarginConstraint = new MarginConstraint(view, this, null, properties.dimensions);
@@ -67,7 +67,7 @@ package org.flowplayer.layout {
}
}
}
-
+
private function getMarginConstraint(view:DisplayObject, i:Number, properties:DisplayProperties):Constraint {
var position:Position = properties.position;
if (i == 0) {
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/Position.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/Position.as
similarity index 94%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/Position.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/Position.as
index 08687e10e528..dd1d1afda396 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/Position.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/Position.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -17,11 +17,11 @@
*/
package org.flowplayer.layout {
- import org.flowplayer.util.Log;
- import org.flowplayer.util.Arrange;
-
+ import org.flowplayer.util.Log;
+ import org.flowplayer.util.Arrange;
+
import flash.display.DisplayObject;
-
+
/**
* @author api
*/
@@ -31,20 +31,20 @@ package org.flowplayer.layout {
private var _right:Length = new Length();
private var _bottom:Length = new Length();
private var _left:Length = new Length();
-
+
public function set topValue(top:Object):void {
setValue("_top", top);
}
-
+
public function get top():Length {
return _top;
}
-
+
private function setValue(property:String, value:Object):void {
if (value is Length) {
this[property] = value;
log.debug(property + " set to " + value);
- } else {
+ } else {
Length(this[property]).value = value;
}
Length(this[getOtherProperty(property)]).clear();
@@ -57,7 +57,7 @@ package org.flowplayer.layout {
if (property == "_right") return "_left";
throw new Error("Trying to set unknown property " + property);
}
-
+
public function set rightValue(value:Object):void {
setValue("_right", value);
}
@@ -69,30 +69,30 @@ package org.flowplayer.layout {
public function set bottomValue(value:Object):void {
setValue("_bottom", value);
}
-
+
public function get bottom():Length {
return _bottom;
}
-
+
public function set leftValue(value:Object):void {
setValue("_left", value);
}
-
+
public function get left():Length {
return _left;
}
-
+
public function set values(value:Array):void {
setValue("_top", value[0]);
setValue("_right", value[1]);
setValue("_bottom", value[2]);
setValue("_left", value[3]);
}
-
+
public function get values():Array {
return [ _top.asObject(), _right.asObject(), _bottom.asObject(), _left.asObject() ];
}
-
+
public function clone():Position {
var clone:Position = new Position();
clone._top = _top.clone() as Length;
@@ -101,11 +101,11 @@ package org.flowplayer.layout {
clone._left = _left.clone() as Length;
return clone;
}
-
+
public function toString():String {
return "[Margins] left: " + _left + ", righ " + _right + ", top " + _top + ", bottom " + _bottom;
}
-
+
public function hasValue(property:String):Boolean {
if (property == "top") return _top.hasValue();
if (property == "right") return _right.hasValue();
@@ -120,7 +120,7 @@ package org.flowplayer.layout {
_left.pct = 100 - _right.pct;
}
if (_right.px > 0) {
- _left.px = containerWidth - width - _right.px;
+ _left.px = containerWidth - width - _right.px;
}
_right.clear();
}
@@ -131,7 +131,7 @@ package org.flowplayer.layout {
_right.pct = 100 - _left.pct;
}
if (_left.px > 0) {
- _right.px = containerWidth - width - _left.px;
+ _right.px = containerWidth - width - _left.px;
}
_left.clear();
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/RelativeConstraint.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/RelativeConstraint.as
similarity index 96%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/RelativeConstraint.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/RelativeConstraint.as
index ddab067f2fe1..c6b88cc749c6 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/layout/RelativeConstraint.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/layout/RelativeConstraint.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -17,14 +17,14 @@
*/
package org.flowplayer.layout {
- import org.flowplayer.util.Arrange;
-
+ import org.flowplayer.util.Arrange;
+
import flash.display.DisplayObject;
import flash.display.Stage;
import flash.geom.Rectangle;
-
+
import org.flowplayer.layout.Constraint;
- import org.flowplayer.util.Log;
+ import org.flowplayer.util.Log;
/**
* @author api
@@ -49,13 +49,13 @@ package org.flowplayer.layout {
public function getConstrainedView():DisplayObject {
return null;
}
-
+
public function getBounds():Rectangle {
var viewLength:Number = getViewLength();
var length:Number = getReferenceLength() * _marginPercentage/100 - viewLength/2;
return new Rectangle(0, 0, length, length);
}
-
+
private function getReferenceLength():Number {
return _viewProperty == "width" ? Arrange.getWidth(_reference) : Arrange.getHeight(_reference);
}
@@ -73,10 +73,10 @@ package org.flowplayer.layout {
public function getMarginConstraints():Array {
return null;
}
-
+
public function setMarginConstraint(margin:Number, constraint:Constraint):void {
}
-
+
public function removeMarginConstraint(constraint:Constraint):void {
}
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/AbstractEvent.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/AbstractEvent.as
similarity index 97%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/AbstractEvent.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/AbstractEvent.as
index cbf1e43fec12..b5df82ea7f20 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/AbstractEvent.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/AbstractEvent.as
@@ -1,22 +1,22 @@
package org.flowplayer.model {
import flash.events.Event;
import flash.external.ExternalInterface;
-
+
import flash.utils.getQualifiedClassName;
import mx.utils.object_proxy;
import org.flowplayer.flow_internal;
import org.flowplayer.util.Log;
import org.flowplayer.util.ObjectConverter;
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
use namespace flow_internal;
/**
@@ -61,28 +61,28 @@ import org.flowplayer.util.ObjectConverter;
public override function toString():String {
return formatToString("AbstractEvent", "type", "target", "info", "info2", "info3", "info4", "info5");
}
-
+
public function get info():Object {
return _info;
}
-
+
override public function get target():Object {
if (_target) return _target;
return super.target;
}
-
+
public function set target(target:Object):void {
_target = target;
}
-
+
public function get eventType():EventType {
return _eventType;
}
-
+
override public function stopPropagation():void {
_propagationStopped = true;
}
-
+
override public function stopImmediatePropagation():void {
_propagationStopped = true;
}
@@ -110,12 +110,12 @@ import org.flowplayer.util.ObjectConverter;
"flowplayer.fireEvent",
playerId || ExternalInterface.objectID, getExternalName(eventType.name, beforePhase), convert(externalEventArgument), convert(externalEventArgument2), externalEventArgument3, externalEventArgument4, externalEventArgument5);
} catch (e:Error) {
- log.error("Error in fireExternal() " + e);
+ log.error("Error in fireExternal() " + e);
}
if (returnVal + "" == "false") return false;
return true;
}
-
+
private function convert(objToConvert:Object):Object {
if (_eventType.custom) return objToConvert;
return new ObjectConverter(objToConvert).convert();
@@ -135,11 +135,11 @@ import org.flowplayer.util.ObjectConverter;
protected function get externalEventArgument():Object {
return target;
}
-
+
protected function get externalEventArgument2():Object {
return _info;
}
-
+
protected function get externalEventArgument3():Object {
return _info2;
}
@@ -155,7 +155,7 @@ import org.flowplayer.util.ObjectConverter;
override public function isDefaultPrevented():Boolean {
return _isDefaultPrevented;
}
-
+
override public function preventDefault():void {
_isDefaultPrevented = true;
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Callable.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Callable.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Callable.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Callable.as
index 6b0087c73ba0..3cef8cd94564 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Callable.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Callable.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -22,11 +22,11 @@ package org.flowplayer.model {
* @author api
*/
public interface Callable {
-
+
function addMethod(method:PluginMethod):void;
-
+
function getMethod(externalName:String):PluginMethod;
-
+
/**
* Invokes a method that has a return value.
* @param args arguments in an Array, if a callback is supported by the method
@@ -34,6 +34,6 @@ package org.flowplayer.model {
* @return the value returned by the invoked method
*/
function invokeMethod(externalName:String, args:Array = null):Object;
-
+
}
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Canvas.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Canvas.as
similarity index 100%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Canvas.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Canvas.as
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Clip.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Clip.as
similarity index 97%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Clip.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Clip.as
index 171275c9ba7c..a58cc2637dd6 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Clip.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Clip.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -68,7 +68,7 @@ package org.flowplayer.model {
private var _extension:ExtendableHelper = new ExtendableHelper();
private var _fadeInSpeed:int;
private var _fadeOutSpeed:int;
- private var _live:Boolean;
+ private var _live:Boolean;
private var _linkUrl:String;
private var _linkWindow:String;
private var _image:Boolean;
@@ -151,7 +151,7 @@ package org.flowplayer.model {
children.push(_postroll);
}
for (var i:int = 0; i < children.length; i++) {
- var clip:Clip = Clip(children[i]);
+ var clip:Clip = Clip(children[i]);
clip.setParentPlaylist(playlist);
clip.setEventListeners(playlist);
}
@@ -214,7 +214,7 @@ package org.flowplayer.model {
}
// do not add if this same cuepoint *instance* is already there
if ((_cuepoints[cue.time] as Array).indexOf(cue) >= 0) return;
-
+
(_cuepoints[cue.time] as Array).push(cue);
} else {
log.info("storing negative cuepoint " + (this == commonClip ? "to common clip" : ""));
@@ -227,7 +227,7 @@ package org.flowplayer.model {
// }
}
}
-
+
private function removeCuepoint(cue:Cuepoint):void {
var points:Array = _cuepoints[cue.time];
if (! points) return;
@@ -276,9 +276,9 @@ package org.flowplayer.model {
// convertToPositive(cue);
// });
// }
-
+
private function convertToPositive(cue:Cuepoint, dur:Number):Cuepoint {
- var positive:Cuepoint = cue.clone() as Cuepoint;
+ var positive:Cuepoint = cue.clone() as Cuepoint;
positive.time = Math.round((dur * 1000 - Math.abs(Cuepoint(cue).time))/100) * 100;
return positive;
}
@@ -424,7 +424,7 @@ package org.flowplayer.model {
public function get extension():String {
return ClipType.getExtension(_url);
}
-
+
[Value(name="type")]
public function get typeStr():String {
return type ? type.type : ClipType.VIDEO.type;
@@ -433,7 +433,7 @@ package org.flowplayer.model {
public function setType(type:String):void {
this._type = ClipType.resolveType(type);
}
-
+
public function set type(type:ClipType):void {
_type = type;
}
@@ -442,11 +442,11 @@ package org.flowplayer.model {
public function get start():Number {
return _start;
}
-
+
public function set start(start:Number):void {
this._start = start;
}
-
+
public function set duration(value:Number):void {
this._duration = value;
log.info("clip duration set to " + value);
@@ -483,7 +483,7 @@ package org.flowplayer.model {
}
return duration as Number;
}
-
+
public function set durationFromMetadata(value:Number):void {
if (_metaData is Boolean && ! _metaData) {
return;
@@ -498,12 +498,12 @@ package org.flowplayer.model {
public function get metaData():Object {
return _metaData;
}
-
+
public function set metaData(metaData:Object):void {
log.debug("received metadata", metaData);
this._metaData = metaData;
}
-
+
[Value]
public function get autoPlay():Boolean {
if (isPreroll) return _parent._autoPlay;
@@ -511,20 +511,20 @@ package org.flowplayer.model {
if (isPostroll) return true;
return _autoPlay;
}
-
+
public function set autoPlay(autoPlay:Boolean):void {
this._autoPlay = autoPlay;
}
-
+
[Value]
public function get autoBuffering():Boolean {
return _autoBuffering;
}
-
+
public function set autoBuffering(autoBuffering:Boolean):void {
- this._autoBuffering = autoBuffering;
+ this._autoBuffering = autoBuffering;
}
-
+
public function setContent(content:DisplayObject):void {
if (_content && _content is Video && ! content) {
log.debug("clearing video content");
@@ -532,7 +532,7 @@ package org.flowplayer.model {
}
this._content = content;
}
-
+
public function getContent():DisplayObject {
return _content;
}
@@ -540,17 +540,17 @@ package org.flowplayer.model {
public function setScaling(scaling:String):void {
this.scaling = MediaSize.forName(scaling);
}
-
+
public function set scaling(scaling:MediaSize):void {
this._scaling = scaling;
-
+
log.debug("scaling : " + scaling + ", disptching update");
if (_playlist) {
_playlist.dispatch(ClipEventType.UPDATE);
}
}
-
+
public function get scaling():MediaSize {
return this._scaling;
}
@@ -568,7 +568,7 @@ package org.flowplayer.model {
public function set originalWidth(width:int):void {
this._originalWidth = width;
}
-
+
public function get originalWidth():int {
if (type == ClipType.VIDEO) {
if (_metaData && _metaData.width >= 0) {
@@ -586,7 +586,7 @@ package org.flowplayer.model {
public function set originalHeight(height:int):void {
this._originalHeight = height;
}
-
+
public function get originalHeight():int {
if (type == ClipType.VIDEO) {
if (_metaData && _metaData.height >= 0) {
@@ -608,12 +608,12 @@ package org.flowplayer.model {
}
_content.width = width;
}
-
+
[Value]
public function get width():int {
return getWidth();
}
-
+
private function getWidth():int {
if (! _content) {
return 0;
@@ -628,12 +628,12 @@ package org.flowplayer.model {
}
_content.height = height;
}
-
+
[Value]
public function get height():int {
return getHeight();
}
-
+
private function getHeight():int {
if (! _content) {
// log.warn("Getting height from a clip that does not have content loaded yet, returning zero");
@@ -641,12 +641,12 @@ package org.flowplayer.model {
}
return _content.height;
}
-
+
[Value]
public function get bufferLength():int {
return _bufferLength;
}
-
+
public function set bufferLength(bufferLength:int):void {
_bufferLength = bufferLength;
}
@@ -663,11 +663,11 @@ package org.flowplayer.model {
public function get played():Boolean {
return _played;
}
-
+
public function set played(played:Boolean):void {
_played = played;
}
-
+
[Value]
public function get provider():String {
if (type == ClipType.AUDIO && _provider == "http") return "audio";
@@ -679,11 +679,11 @@ package org.flowplayer.model {
public function get configuredProviderName():String {
return _provider;
}
-
+
public function set provider(provider:String):void {
_provider = provider;
}
-
+
[Value]
public function get cuepoints():Array {
var cues:Array = new Array();
@@ -695,20 +695,20 @@ package org.flowplayer.model {
}
return cues;
}
-
+
public function set accelerated(accelerated:Boolean):void {
_accelerated = accelerated;
}
-
+
[Value]
public function get accelerated():Boolean {
return _accelerated;
}
-
+
public function get useHWScaling():Boolean {
return _accelerated && ! VersionUtil.hasStageVideo();
}
-
+
public function get useStageVideo():Boolean {
return _accelerated && VersionUtil.hasStageVideo();
}
@@ -717,7 +717,7 @@ package org.flowplayer.model {
return false;
}
- // common clip listens to events from the normal clips and redispatches
+ // common clip listens to events from the normal clips and redispatches
public function onClipEvent(event:ClipEvent):void {
log.info("received onClipEvent, I am commmon clip: " + (this == _playlist.commonClip));
doDispatchEvent(event, true);
@@ -729,30 +729,30 @@ package org.flowplayer.model {
doDispatchBeforeEvent(event, true);
log.debug(this + ": dispatched before event with target " + event.target);
}
-
+
private function get commonClip():Clip {
if (! _playlist) return null;
return _playlist.commonClip;
}
-
+
public function get customProperties():Object {
return _extension.props;
}
-
+
public function set customProperties(props:Object):void {
_extension.props = props;
_extension.deleteProp("cuepoints");
_extension.deleteProp("playlist");
}
-
+
public function get smoothing():Boolean {
return _smoothing;
}
-
+
public function set smoothing(smoothing:Boolean):void {
_smoothing = smoothing;
}
-
+
public function getCustomProperty(name:String):Object {
return _extension.getProp(name);
}
@@ -761,57 +761,57 @@ package org.flowplayer.model {
if (name == "playlist") return;
_extension.setProp(name, value);
}
-
- [Value]
+
+ [Value]
public function get fadeInSpeed():int {
return _fadeInSpeed;
}
-
+
public function set fadeInSpeed(fadeInSpeed:int):void {
_fadeInSpeed = fadeInSpeed;
}
-
- [Value]
+
+ [Value]
public function get fadeOutSpeed():int {
return _fadeOutSpeed;
}
-
+
public function set fadeOutSpeed(fadeOutSpeed:int):void {
_fadeOutSpeed = fadeOutSpeed;
}
-
- [Value]
+
+ [Value]
public function get live():Boolean {
return _live;
}
-
+
public function set live(live:Boolean):void {
_live = live;
}
-
- [Value]
+
+ [Value]
public function get linkUrl():String {
return _linkUrl;
}
-
+
public function set linkUrl(linkUrl:String):void {
if(URLUtil.isValid(linkUrl))
_linkUrl = linkUrl;
}
-
- [Value]
+
+ [Value]
public function get linkWindow():String {
return _linkWindow;
}
-
+
public function set linkWindow(linkWindow:String):void {
_linkWindow = linkWindow;
}
-
+
protected function get cuepointsInNegative():Array {
return _cuepointsInNegative;
}
-
+
/**
* Use the previous clip in the playlist as an image for this audio clip?
* This is only for audio clips.
@@ -820,28 +820,28 @@ package org.flowplayer.model {
public function get image():Boolean {
return _image;
}
-
+
public function set image(image:Boolean):void {
_image = image;
}
-
+
public function get autoPlayNext():Boolean {
return _autoPlayNext;
}
-
+
public function set autoPlayNext(autoPlayNext:Boolean):void {
_autoPlayNext = autoPlayNext;
}
-
+
[Value]
public function get cuepointMultiplier():Number {
return _cuepointMultiplier;
}
-
+
public function set cuepointMultiplier(cuepointMultiplier:Number):void {
_cuepointMultiplier = cuepointMultiplier;
}
-
+
public function dispatchNetStreamEvent(name:String, infoObject:Object):void {
dispatch(ClipEventType.NETSTREAM_EVENT, name, infoObject);
}
@@ -986,13 +986,13 @@ package org.flowplayer.model {
public function set startDispatched(value:Boolean):void {
_startDispatched = value;
}
-
+
public function get currentTime():Number {
- return _currentTime;
+ return _currentTime;
}
-
+
public function set currentTime(time:Number):void {
- _currentTime = (_currentTime ==0 ? time + _start : time);
+ _currentTime = (_currentTime ==0 ? time + _start : time);
}
[Value]
@@ -1003,14 +1003,14 @@ package org.flowplayer.model {
public function set endLimit(value:Number):void {
_endLimit = value;
}
-
+
public function set urlEncoding(value:Boolean):void {
- _encoding = value;
+ _encoding = value;
}
-
+
[Value]
public function get urlEncoding():Boolean {
- return _encoding;
+ return _encoding;
}
public function deleteCustomProperty(name:String):void {
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipError.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipError.as
similarity index 93%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipError.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipError.as
index 4ef8fa768b19..bd939b09c0b9 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipError.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipError.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of FlowPlayer.
@@ -19,15 +19,15 @@
package org.flowplayer.model {
import org.flowplayer.model.ErrorCode;
-
+
/**
* Clip error codes.
*/
public class ClipError extends ErrorCode {
-
- public static const STREAM_NOT_FOUND:ClipError = new ClipError(ClipEventType.ERROR, 200, "Stream not found");
- public static const STREAM_LOAD_FAILED:ClipError = new ClipError(ClipEventType.ERROR, 201, "Unable to load stream or clip file");
- public static const PROVIDER_NOT_LOADED:ClipError = new ClipError(ClipEventType.ERROR, 202, "The provider specified in this clip is not loaded");
+
+ public static const STREAM_NOT_FOUND:ClipError = new ClipError(ClipEventType.ERROR, 200, "Stream not found");
+ public static const STREAM_LOAD_FAILED:ClipError = new ClipError(ClipEventType.ERROR, 201, "Unable to load stream or clip file");
+ public static const PROVIDER_NOT_LOADED:ClipError = new ClipError(ClipEventType.ERROR, 202, "The provider specified in this clip is not loaded");
public function ClipError(eventType:EventType, code:int, message:String) {
super(eventType, code, message);
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipEvent.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipEvent.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipEvent.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipEvent.as
index 3ac0b48f0081..d4055db0d632 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipEvent.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipEvent.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -36,7 +36,7 @@ package org.flowplayer.model {
public override function toString():String {
return formatToString("ClipEvent", "type", "info");
}
-
+
protected override function get externalEventArgument():Object {
if (eventType == ClipEventType.PLAYLIST_REPLACE) {
return (target as ClipEventSupport).clips;
@@ -49,17 +49,17 @@ package org.flowplayer.model {
}
return target;
}
-
+
protected override function get externalEventArgument2():Object {
if (eventType == ClipEventType.CUEPOINT) {
return Cuepoint(info).callbackId;
- }
+ }
if ([ClipEventType.START, ClipEventType.UPDATE, ClipEventType.METADATA, ClipEventType.METADATA_CHANGED, ClipEventType.RESUME, ClipEventType.BEGIN].indexOf(eventType) >= 0) {
return target;
}
return super.externalEventArgument2;
}
-
+
protected override function get externalEventArgument3():Object {
if (eventType == ClipEventType.CLIP_ADD ) {
return null;
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipEventDispatcher.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipEventDispatcher.as
similarity index 97%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipEventDispatcher.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipEventDispatcher.as
index 919a52372eb5..288c21a4d082 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipEventDispatcher.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipEventDispatcher.as
@@ -1,27 +1,27 @@
package org.flowplayer.model {
import flash.utils.Dictionary;
-
+
import org.flowplayer.flow_internal;
import org.flowplayer.model.ClipEvent;
- import org.flowplayer.model.EventDispatcher;
+ import org.flowplayer.model.EventDispatcher;
use namespace flow_internal;
-
+
/**
* ClipEventDispatcher is used to attach listeners for ClipEvents and for dispatching ClipEvents.
- *
+ *
* @see ClipEvent
*/
public class ClipEventDispatcher extends EventDispatcher {
-
+
public function dispatch(eventType:ClipEventType, info:Object = null, info2:Object = null, info3:Object = null):void {
- doDispatchEvent(new ClipEvent(eventType, info, info2, info3), false);
+ doDispatchEvent(new ClipEvent(eventType, info, info2, info3), false);
}
public function dispatchError(error:ClipError, info:Object = null):void {
doDispatchErrorEvent(new ClipEvent(error.eventType, error, info), false);
}
-
+
public function dispatchEvent(event:ClipEvent):void {
doDispatchEvent(event, false);
}
@@ -29,7 +29,7 @@ package org.flowplayer.model {
public function dispatchBeforeEvent(event:AbstractEvent):Boolean {
return doDispatchBeforeEvent(event, false);
}
-
+
public function onUpdate(listener:Function, clipFilter:Function = null, addToFront:Boolean = false):void {
setListener(ClipEventType.UPDATE, listener, clipFilter, false, addToFront);
}
@@ -41,17 +41,17 @@ package org.flowplayer.model {
public function onAll(listener:Function, clipFilter:Function = null):void {
setListener(null, listener, clipFilter);
}
-
+
public function onConnect(listener:Function, clipFilter:Function = null, addToFront:Boolean = false):void {
setListener(ClipEventType.CONNECT, listener, clipFilter, false, addToFront);
}
/**
* Adds a listener for the start event.
- *
+ *
* @param listener the listener to add
* @param clipFilter a clip filter function, the listener is only added if the filter function returns true for a clip
- * @param addToFront if <code>true</code> the listener is added to the front of the listener list so that it will get notified before the listeners that had been added before this one
+ * @param addToFront if <code>true</code> the listener is added to the front of the listener list so that it will get notified before the listeners that had been added before this one
*/
public function onStart(listener:Function, clipFilter:Function = null, addToFront:Boolean = false):void {
setListener(ClipEventType.START, listener, clipFilter, false, addToFront);
@@ -100,7 +100,7 @@ package org.flowplayer.model {
public function onFinish(listener:Function, clipFilter:Function = null, addToFront:Boolean = false):void {
setListener(ClipEventType.FINISH, listener, clipFilter, false, addToFront);
}
-
+
public function onBeforeFinish(listener:Function, clipFilter:Function = null, addToFront:Boolean = false):void {
setListener(ClipEventType.FINISH, listener, clipFilter, true, addToFront);
}
@@ -152,7 +152,7 @@ package org.flowplayer.model {
public function onClipAdd(listener:Function, addToFront:Boolean = false):void {
setListener(ClipEventType.CLIP_ADD, listener, null, false, addToFront);
}
-
+
public function onResized(listener:Function, addToFront:Boolean = false):void {
setListener(ClipEventType.CLIP_RESIZED, listener, null, false, addToFront);
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipEventSupport.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipEventSupport.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipEventSupport.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipEventSupport.as
index 0349557b1a2c..ff9461df44cb 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipEventSupport.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipEventSupport.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -17,7 +17,7 @@
*/
package org.flowplayer.model {
- import org.flowplayer.flow_internal;
+ import org.flowplayer.flow_internal;
use namespace flow_internal;
/**
* @author api
@@ -30,7 +30,7 @@ package org.flowplayer.model {
_commonClip = commonClip;
_clips = clips;
}
-
+
flow_internal function setClips(clips:Array):void {
_clips = clips;
}
@@ -44,7 +44,7 @@ package org.flowplayer.model {
return ! Clip(item).isInStream;
});
}
-
+
public static function typeFilter(type:ClipType):Function {
return function(clip:Clip):Boolean { return clip.type == type; };
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipEventType.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipEventType.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipEventType.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipEventType.as
index 2439b1c6eacc..52f88b7ce075 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipEventType.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipEventType.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -18,11 +18,11 @@
package org.flowplayer.model {
import flash.utils.Dictionary;
-
+
import org.flowplayer.flow_internal;
public class ClipEventType extends EventType {
-
+
public static const CONNECT:ClipEventType = new ClipEventType("onConnect");
public static const BEGIN:ClipEventType = new ClipEventType("onBegin");
public static const METADATA:ClipEventType = new ClipEventType("onMetaData");
@@ -64,11 +64,11 @@ import org.flowplayer.flow_internal;
_cancellable[STOP.name] = STOP;
_cancellable[FINISH.name] = FINISH;
}
-
+
override public function get isCancellable():Boolean {
return _cancellable[this.name];
}
-
+
public static function get cancellable():Dictionary {
return _cancellable;
}
@@ -95,7 +95,7 @@ import org.flowplayer.flow_internal;
public function toString():String {
return "[ClipEventType] '" + name + "'";
}
-
+
public function get playlistIsEventTarget():Boolean {
return this == PLAYLIST_REPLACE || this == CLIP_ADD;
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipType.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipType.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipType.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipType.as
index e3b3fdb6d573..7776d1e91dae 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipType.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/ClipType.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -31,7 +31,7 @@ package org.flowplayer.model {
public static const AUDIO:ClipType = new ClipType("audio");
public static const IMAGE:ClipType = new ClipType("image");
public static const API:ClipType = new ClipType("api:");
-
+
private static var MIME_TYPE_MAPPING:Object = {
'application/x-fcs': VIDEO,
'application/x-shockwave-flash': IMAGE,
@@ -66,7 +66,7 @@ package org.flowplayer.model {
throw new Error("Cannot create ad-hoc ClipType instances");
this._type = type;
}
-
+
public function get type():String {
return _type;
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Cloneable.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Cloneable.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Cloneable.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Cloneable.as
index 4a7944d7dd10..5ba28c7b6d8c 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Cloneable.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Cloneable.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Cuepoint.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Cuepoint.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Cuepoint.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Cuepoint.as
index e33425acfaa1..0083efe4a9ed 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Cuepoint.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Cuepoint.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -60,25 +60,25 @@ import flash.utils.Dictionary;
public function get time():int {
return _time;
}
-
+
public function set time(time:int):void {
_time = time;
}
-
+
public function toString():String {
return "[Cuepoint] time " + _time;
}
-
+
public function get callbackId():String {
return _callbackId;
}
-
+
public final function clone():Cloneable {
var clone:Cuepoint = new Cuepoint(_time, callbackId);
onClone(clone);
return clone;
}
-
+
protected function onClone(clone:Cuepoint):void {
}
@@ -86,7 +86,7 @@ import flash.utils.Dictionary;
public function get lastFireTime():int {
return _lastFireTime;
}
-
+
public function set lastFireTime(lastFireTime:int):void {
_lastFireTime = lastFireTime;
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/DisplayPluginModel.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/DisplayPluginModel.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/DisplayPluginModel.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/DisplayPluginModel.as
index a1be569605e9..ee0183a95afe 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/DisplayPluginModel.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/DisplayPluginModel.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -19,7 +19,7 @@
package org.flowplayer.model {
import org.flowplayer.model.PluginModel;
import org.flowplayer.model.DisplayProperties;
-
+
/**
* @author api
*/
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/DisplayPluginModelImpl.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/DisplayPluginModelImpl.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/DisplayPluginModelImpl.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/DisplayPluginModelImpl.as
index 22ce80f6d779..00f393445522 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/DisplayPluginModelImpl.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/DisplayPluginModelImpl.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -20,7 +20,7 @@ package org.flowplayer.model {
import flash.display.DisplayObject;
import org.flowplayer.model.Cloneable;
-
+
/**
* @author api
*/
@@ -37,23 +37,23 @@ package org.flowplayer.model {
public function addMethod(method:PluginMethod):void {
_methods.push(method);
}
-
+
public function getMethod(externalName:String):PluginMethod {
return PluginMethodHelper.getMethod(_methods, externalName);
}
-
+
public function invokeMethod(externalName:String, args:Array = null):Object {
return PluginMethodHelper.invokePlugin(this, getDisplayObject(), externalName, args);
}
-
+
public function get config():Object {
return _config;
}
-
+
public function set config(config:Object):void {
_config = config;
}
-
+
public function set visible(visible:Boolean):void {
super.display = visible ? "block" : "none";
}
@@ -83,7 +83,7 @@ package org.flowplayer.model {
public function get methodNames():Array {
return PluginMethodHelper.methodNames(_methods);
}
-
+
public function get pluginObject():Object {
return getDisplayObject();
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/DisplayProperties.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/DisplayProperties.as
similarity index 94%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/DisplayProperties.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/DisplayProperties.as
index 1a0b6174f180..7c00e6e9b262 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/DisplayProperties.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/DisplayProperties.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -18,64 +18,64 @@
package org.flowplayer.model {
import flash.display.DisplayObject;
-
+
import org.flowplayer.layout.Dimensions;
import org.flowplayer.layout.Position;
- import org.flowplayer.model.Cloneable;
+ import org.flowplayer.model.Cloneable;
/**
* @author anssi
*/
public interface DisplayProperties extends Identifiable, Cloneable {
-
+
/**
* Gets the associated DisplayObject. This is not implemented
* as an accessor since we don't want the display object to
* be serialized through ExternalInterface.
*/
function getDisplayObject():DisplayObject;
-
+
function setDisplayObject(displayObject:DisplayObject):void;
function set width(value:Object):void;
-
+
function get widthPx():Number;
-
+
function get widthPct():Number;
-
+
function set height(value:Object):void;
-
+
function get heightPx():Number;
-
+
function get heightPct():Number;
-
+
function get dimensions():Dimensions;
-
+
function set alpha(value:Number):void;
-
+
function get alpha():Number;
-
+
function set opacity(value:Number):void;
-
+
function get opacity():Number;
-
+
function set zIndex(value:Number):void;
-
+
function get zIndex():Number;
-
+
function get display():String;
-
+
function set display(value:String):void;
-
+
function get visible():Boolean;
function set top(top:Object):void;
-
+
function set right(value:Object):void;
-
+
function set bottom(value:Object):void;
-
+
function set left(value:Object):void;
-
+
function get position():Position;
}
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/DisplayPropertiesImpl.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/DisplayPropertiesImpl.as
similarity index 97%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/DisplayPropertiesImpl.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/DisplayPropertiesImpl.as
index 97db38e02d07..cda10c08e6c8 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/DisplayPropertiesImpl.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/DisplayPropertiesImpl.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -18,10 +18,10 @@
package org.flowplayer.model {
import flash.display.DisplayObject;
-
+
import org.flowplayer.layout.Dimensions;
import org.flowplayer.layout.Position;
- import org.flowplayer.model.Cloneable;
+ import org.flowplayer.model.Cloneable;
/**
* @author anssi
@@ -69,7 +69,7 @@ package org.flowplayer.model {
public static function fullSize(name:String):DisplayPropertiesImpl {
var props:DisplayPropertiesImpl = new DisplayPropertiesImpl();
props.name = name;
- props.left = "50%";
+ props.left = "50%";
props.top = "50%";
props.width = "100%";
props.height = "100%";
@@ -79,7 +79,7 @@ package org.flowplayer.model {
public function getDisplayObject():DisplayObject {
return _displayObject;
}
-
+
public function setDisplayObject(displayObject:DisplayObject):void {
_displayObject = displayObject;
}
@@ -87,23 +87,23 @@ package org.flowplayer.model {
public function set width(value:Object):void {
_dimensions.widthValue = value;
}
-
+
public function get widthPx():Number {
return _dimensions.width.px;
}
-
+
public function get widthPct():Number {
return _dimensions.width.pct;
}
-
+
public function set height(value:Object):void {
_dimensions.heightValue = value;
}
-
+
public function get heightPx():Number {
return _dimensions.height.px;
}
-
+
public function get heightPct():Number {
return _dimensions.height.pct;
}
@@ -111,29 +111,29 @@ package org.flowplayer.model {
public function set alpha(value:Number):void {
_alpha = value;
}
-
+
public function get alpha():Number {
return _alpha;
}
-
+
public function set zIndex(value:Number):void {
_zIndex = value;
}
-
+
[Value]
public function get zIndex():Number {
return _zIndex;
}
-
+
[Value]
public function get display():String {
return _display;
}
-
+
public function set display(value:String):void {
_display = value;
}
-
+
public function get visible():Boolean {
return _display == "block";
}
@@ -141,12 +141,12 @@ package org.flowplayer.model {
public function toString():String {
return "[DisplayPropertiesImpl] '" + _name + "'";
}
-
+
[Value]
override public function get name():String {
return _name;
}
-
+
public function set name(name:String):void {
_name = name;
}
@@ -158,41 +158,41 @@ package org.flowplayer.model {
public function set top(top:Object):void {
_position.topValue = top;
}
-
+
public function set right(value:Object):void {
_position.rightValue = value;
}
-
+
public function set bottom(value:Object):void {
_position.bottomValue = value;
}
-
+
public function set left(value:Object):void {
_position.leftValue = value;
}
-
+
public function hasValue(property:String):Boolean {
return _position.hasValue(property) || _dimensions.hasValue(property);
}
-
+
public function set opacity(value:Number):void {
alpha = value;
}
-
+
[Value]
public function get opacity():Number {
return alpha;
}
-
+
public function get dimensions():Dimensions {
return _dimensions;
}
-
+
[Value(name="width")]
public function get widthObj():Object {
return _dimensions.width.asObject();
}
-
+
[Value(name="height")]
public function get heightStr():Object {
return _dimensions.height.asObject();
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/DynamicCuepoint.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/DynamicCuepoint.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/DynamicCuepoint.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/DynamicCuepoint.as
index e1875369abe6..063ba61016d6 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/DynamicCuepoint.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/DynamicCuepoint.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of FlowPlayer.
@@ -19,7 +19,7 @@
package org.flowplayer.model {
import org.flowplayer.model.Cuepoint;
-
+
/**
* @author api
*/
@@ -27,7 +27,7 @@ package org.flowplayer.model {
public function DynamicCuepoint(time:int, callbackId:String) {
super(time, callbackId);
}
-
+
override protected function onClone(clone:Cuepoint):void {
// copy dynamic properties
for (var prop:String in this) {
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/ErrorCode.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/ErrorCode.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/ErrorCode.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/ErrorCode.as
index 88e4394fac8b..08d2feb6737f 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/ErrorCode.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/ErrorCode.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of FlowPlayer.
@@ -18,10 +18,10 @@
*/
package org.flowplayer.model {
-
+
public class ErrorCode {
-
+
private var _eventType:EventType;
private var _code:int;
private var _message:String;
@@ -31,15 +31,15 @@ package org.flowplayer.model {
_code = code;
_message = message;
}
-
+
public function get eventType():EventType {
return _eventType;
}
-
+
public function get message():String {
return _message;
}
-
+
public function get code():int {
return _code;
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/EventDispatcher.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/EventDispatcher.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/EventDispatcher.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/EventDispatcher.as
index 9369f0c75166..82358dbd1718 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/EventDispatcher.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/EventDispatcher.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of Flowplayer.
@@ -19,9 +19,9 @@
package org.flowplayer.model {
import flash.utils.Dictionary;
-
+
import org.flowplayer.flow_internal;
- import org.flowplayer.util.Log;
+ import org.flowplayer.util.Log;
use namespace flow_internal;
/**
@@ -35,7 +35,7 @@ package org.flowplayer.model {
/**
* Unbinds the specified listener.
- *
+ *
* @param listener the listener to unbind
* @param event the type of the event from which the listener is removed, if <code>null</code> it's removed from all event types
* @param beforePhase if <code>true</code> the listener is removed from the before phase, otherwise it's removed from the normal event phase
@@ -56,17 +56,17 @@ package org.flowplayer.model {
addAllEventsListener(beforePhase ? cancellableEvents : allEvents, new EventListener(listener, clipFilter), beforePhase, addToFront);
}
}
-
+
protected function get cancellableEvents():Dictionary {
throw new Error("cancellableEvents should be overridden the subclass");
return null;
}
-
+
protected function get allEvents():Dictionary {
throw new Error("allEvents should be overridden the subclass");
return null;
}
-
+
private function removeAllEventsListener(listener:Function, beforePhase:Boolean):void {
for each (var type:Object in (beforePhase ? cancellableEvents : allEvents)) {
removeListener(type as EventType, listener, beforePhase);
@@ -157,19 +157,19 @@ package org.flowplayer.model {
if (listener == null) {
log.error("found null listener");
}
-
+
listener.notify(event);
-
+
notified.push(listener);
if (event.isPropagationStopped()) {
return;
}
}
}
- return;
+ return;
}
-
+
private function addListener(event:EventType, listener:EventListener, beforePhase:Boolean, addToFront:Boolean = false):void {
log.debug(this + ": adding listener for event " + event + (beforePhase ? " to before phase" : ""));
var listenerDict:Dictionary = beforePhase ? _beforeListeners : _listeners;
@@ -192,7 +192,7 @@ package org.flowplayer.model {
}
private function doRemoveListener(listenerDict:Dictionary, event:EventType, listener:Function):void {
- var listeners:Array = listenerDict[event];
+ var listeners:Array = listenerDict[event];
if (! listeners) return;
for (var i : Number = 0; i < listeners.length; i++) {
var eventListener:EventListener = listeners[i];
@@ -201,7 +201,7 @@ package org.flowplayer.model {
}
}
}
-
+
private function hasListener(event:EventType, listener:EventListener, listenerDict:Dictionary):Boolean {
var listeners:Array = listenerDict[event];
if (! listeners) return false;
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/EventListener.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/EventListener.as
similarity index 94%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/EventListener.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/EventListener.as
index b7e3a48465aa..ae3e4d5279be 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/EventListener.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/EventListener.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of Flowplayer.
@@ -18,14 +18,14 @@
*/
package org.flowplayer.model {
- import org.flowplayer.util.Assert;
- import org.flowplayer.util.Log;
-
+ import org.flowplayer.util.Assert;
+ import org.flowplayer.util.Log;
+
/**
* @author api
*/
internal class EventListener {
-
+
private var log:Log = new Log(this);
private var _listener:Function;
private var _clipFilter:Function;
@@ -33,8 +33,8 @@ package org.flowplayer.model {
public function EventListener(listener:Function, clipFilter:Function) {
_listener = listener;
_clipFilter = clipFilter;
- }
-
+ }
+
public function notify(event:AbstractEvent):Boolean {
Assert.notNull(event.target, "event target cannot be null");
if (_clipFilter != null) {
@@ -48,7 +48,7 @@ package org.flowplayer.model {
_listener(event);
return true;
}
-
+
public function get listener():Function {
return _listener;
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/EventType.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/EventType.as
similarity index 92%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/EventType.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/EventType.as
index 375987aaa415..965f1e18c23b 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/EventType.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/EventType.as
@@ -1,6 +1,6 @@
package org.flowplayer.model {
- import flash.utils.Dictionary;
-
+ import flash.utils.Dictionary;
+
/**
* @author anssi
*/
@@ -17,11 +17,11 @@ package org.flowplayer.model {
throw new Error("isCancellable() not overridden");
return false;
}
-
+
public function get name():String {
return _name;
}
-
+
public function get custom():Boolean {
return _custom;
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Extendable.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Extendable.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Extendable.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Extendable.as
index 7078b620729d..974f2861d26b 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Extendable.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Extendable.as
@@ -1,4 +1,4 @@
-/*
+/*
* Author: Anssi Piirainen, <api@iki.fi>
*
* Copyright (c) 2011 Flowplayer Oy
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/ExtendableHelper.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/ExtendableHelper.as
similarity index 100%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/ExtendableHelper.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/ExtendableHelper.as
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/FontProvider.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/FontProvider.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/FontProvider.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/FontProvider.as
index 193f588de722..bdd42a719302 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/FontProvider.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/FontProvider.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of Flowplayer.
@@ -25,8 +25,8 @@ package org.flowplayer.model {
* on player's Panel, for example.
*/
public interface FontProvider {
-
+
function get fontFamily():String;
-
+
}
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Identifiable.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Identifiable.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Identifiable.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Identifiable.as
index c345825468b4..575e70c3b16f 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Identifiable.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Identifiable.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -22,9 +22,9 @@ package org.flowplayer.model {
* @author api
*/
public interface Identifiable {
-
+
function get name():String;
-
+
function set name(name:String):void;
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Loadable.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Loadable.as
similarity index 97%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Loadable.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Loadable.as
index 332c1e152f32..45ea6466def4 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Loadable.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Loadable.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of Flowplayer.
@@ -21,15 +21,15 @@ package org.flowplayer.model {
import flash.utils.getDefinitionByName;
import org.flowplayer.config.Config;
-
+
import flash.display.DisplayObject;
-
- import org.flowplayer.util.PropertyBinder;
+
+ import org.flowplayer.util.PropertyBinder;
/**
* @author api
*/
public class Loadable extends PluginEventDispatcher {
-
+
private var _name:String;
private var _url:String;
private var _type:String;
@@ -43,7 +43,7 @@ package org.flowplayer.model {
_playerConfig = playerConfig;
_url = url;
}
-
+
public function createDisplayPlugin(disp:DisplayObject):DisplayPluginModel {
if (!_plugin) {
_plugin = _playerConfig.getPlugin(disp, _name, _config);
@@ -76,27 +76,27 @@ package org.flowplayer.model {
public function get url():String {
return _url;
}
-
+
public function set url(url:String):void {
_url = url;
}
-
+
public function get config():Object {
return _config;
}
-
+
public function set config(config:Object):void {
_config = config;
}
-
+
override public function get name():String {
return _name;
}
-
+
public function toString():String {
return "[Loadable] '" + _name + "', builtIn " + isBuiltIn;
}
-
+
public function get plugin():PluginModel {
return _plugin;
}
@@ -112,7 +112,7 @@ package org.flowplayer.model {
public function get type():String {
return _type;
}
-
+
public function set type(type:String):void {
_type = type;
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Logo.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Logo.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Logo.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Logo.as
index 43edf762abd2..df2f77aaa8e2 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Logo.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Logo.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -26,13 +26,13 @@ package org.flowplayer.model {
* @author api
*/
public class Logo extends DisplayPluginModelImpl {
-
+
private var _fullscreenOnly:Boolean = true;
private var _fadeSpeed:Number;
private var _displayTime:int = 0;
private var _linkUrl:String;
private var _linkWindow:String;
-
+
public function Logo(disp:DisplayObject, name:String):void {
super(disp, name, false);
name = "logo";
@@ -59,7 +59,7 @@ package org.flowplayer.model {
public function get fullscreenOnly():Boolean {
return _fullscreenOnly;
}
-
+
public function set fullscreenOnly(fullscreenOnly:Boolean):void {
_fullscreenOnly = fullscreenOnly;
}
@@ -67,35 +67,35 @@ package org.flowplayer.model {
public function get fadeSpeed():Number {
return _fadeSpeed;
}
-
+
public function set fadeSpeed(fadeSpeed:Number):void {
_fadeSpeed = fadeSpeed;
}
-
+
[Value]
public function get displayTime():int {
return _displayTime;
}
-
+
public function set displayTime(displayTime:int):void {
_displayTime = displayTime;
}
-
+
[Value]
public function get linkUrl():String {
return _linkUrl;
}
-
+
public function set linkUrl(linkUrl:String):void {
if(URLUtil.isValid(linkUrl))
_linkUrl = linkUrl;
}
-
+
[Value]
public function get linkWindow():String {
return _linkWindow;
}
-
+
public function set linkWindow(linkWindow:String):void {
_linkWindow = linkWindow;
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/MediaSize.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/MediaSize.as
similarity index 96%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/MediaSize.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/MediaSize.as
index c354dbbb30cc..0b9742fc08c0 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/MediaSize.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/MediaSize.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -17,13 +17,13 @@
*/
package org.flowplayer.model {
- import flash.utils.Dictionary;
+ import flash.utils.Dictionary;
/**
* @author api
*/
public class MediaSize {
-
+
public static const FITTED_PRESERVING_ASPECT_RATIO:MediaSize = new MediaSize("fit");
public static const HALF_FROM_ORIGINAL:MediaSize = new MediaSize("half");
public static const ORIGINAL:MediaSize = new MediaSize("orig");
@@ -40,7 +40,7 @@ package org.flowplayer.model {
}
private static var enumCreated:Boolean;
- { enumCreated = true;
+ { enumCreated = true;
}
private var _value:String;
@@ -50,15 +50,15 @@ package org.flowplayer.model {
throw new Error("Cannot create ad-hoc MediaSize instances");
this._value = value;
}
-
+
public static function forName(name:String):MediaSize {
return ALL_VALUES[name];
}
-
+
public function toString():String {
return "[MediaSize] '" + _value + "'";
}
-
+
public function get value():String {
return _value;
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/NullClip.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/NullClip.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/NullClip.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/NullClip.as
index f8be40b0fa00..a489d72f5217 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/NullClip.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/NullClip.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PlayButtonOverlay.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PlayButtonOverlay.as
similarity index 96%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PlayButtonOverlay.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PlayButtonOverlay.as
index f75e97e3d992..054b5e086e5a 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PlayButtonOverlay.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PlayButtonOverlay.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -17,7 +17,7 @@
*/
package org.flowplayer.model {
- import org.flowplayer.model.DisplayPropertiesImpl;
+ import org.flowplayer.model.DisplayPropertiesImpl;
/**
* @author api
@@ -61,44 +61,44 @@ package org.flowplayer.model {
public function get fadeSpeed():int {
return _fadeSpeed;
}
-
+
public function set fadeSpeed(fadeSpeed:int):void {
_fadeSpeed = fadeSpeed;
}
-
+
[Value]
public function get rotateSpeed():int {
if (_rotateSpeed > 100) return 100;
return _rotateSpeed;
}
-
+
public function set rotateSpeed(rotateSpeed:int):void {
_rotateSpeed = rotateSpeed;
}
-
+
[Value]
public function get label():String {
return _label;
}
-
+
public function set label(label:String):void {
_label = label;
}
-
+
[Value]
public function get replayLabel():String {
return _replayLabel;
}
-
+
public function set replayLabel(replayLabel:String):void {
_replayLabel = replayLabel;
}
-
+
[Value]
public function get buffering():Boolean {
return _buffering;
}
-
+
public function set buffering(buffering:Boolean):void {
_buffering = buffering;
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PlayerError.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PlayerError.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PlayerError.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PlayerError.as
index 599541966e63..588c5accb40b 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PlayerError.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PlayerError.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of FlowPlayer.
@@ -19,12 +19,12 @@
package org.flowplayer.model {
import org.flowplayer.model.ErrorCode;
-
+
/**
* @author api
*/
public class PlayerError extends ErrorCode {
-
+
public static const INIT_FAILED:PlayerError = new PlayerError(PlayerEventType.ERROR, 300, "Player initialization failed");
public static const PLUGIN_LOAD_FAILED:PlayerError = new PlayerError(PlayerEventType.ERROR, 301, "Unable to load plugin");
public static const PLUGIN_INVOKE_FAILED:PlayerError = new PlayerError(PlayerEventType.ERROR, 302, "Error when invoking plugin external method");
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PlayerEvent.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PlayerEvent.as
similarity index 97%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PlayerEvent.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PlayerEvent.as
index ecc0e735154b..51467d511615 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PlayerEvent.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PlayerEvent.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -17,7 +17,7 @@
*/
package org.flowplayer.model {
- import flash.events.Event;
+ import flash.events.Event;
/**
* Event related to the whole player.
@@ -28,11 +28,11 @@ package org.flowplayer.model {
public function PlayerEvent(eventType:EventType, info:Object = null, info2:Object = null, info3:Object = null) {
super(eventType, info, info2, info3);
}
-
+
public static function load(eventObject:Object = null):PlayerEvent {
return new PlayerEvent(PlayerEventType.LOAD, eventObject);
}
-
+
public static function keyPress(eventObject:Object = null):PlayerEvent {
return new PlayerEvent(PlayerEventType.KEYPRESS, eventObject);
}
@@ -72,19 +72,19 @@ package org.flowplayer.model {
public override function toString():String {
return formatToString("PlayerEvent", "type", "info");
}
-
+
protected override function get externalEventArgument():Object {
return info;
}
-
+
protected override function get externalEventArgument2():Object {
return info2;
}
-
+
protected override function get externalEventArgument3():Object {
return info3;
}
-
+
protected override function get externalEventArgument4():Object {
return null;
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PlayerEventType.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PlayerEventType.as
similarity index 97%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PlayerEventType.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PlayerEventType.as
index 7d1f0eedd6e4..0d314cf1d450 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PlayerEventType.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PlayerEventType.as
@@ -1,7 +1,7 @@
package org.flowplayer.model {
import flash.utils.Dictionary;
-
- import org.flowplayer.model.EventType;
+
+ import org.flowplayer.model.EventType;
/**
* @author anssi
*/
@@ -9,7 +9,7 @@ package org.flowplayer.model {
public static const LOAD:PlayerEventType = new PlayerEventType("onLoad");
public static const UNLOAD:PlayerEventType = new PlayerEventType("onUnload");
public static const KEYPRESS:PlayerEventType = new PlayerEventType("onKeyPress");
-
+
public static const MUTE:PlayerEventType = new PlayerEventType("onMute");
public static const UNMUTE:PlayerEventType = new PlayerEventType("onUnmute");
public static const VOLUME:PlayerEventType = new PlayerEventType("onVolume");
@@ -27,7 +27,7 @@ package org.flowplayer.model {
_cancellable[UNMUTE.name] = UNMUTE;
_cancellable[VOLUME.name] = VOLUME;
_cancellable[FULLSCREEN.name] = FULLSCREEN;
- }
+ }
public function PlayerEventType(name:String) {
super(name);
@@ -40,7 +40,7 @@ package org.flowplayer.model {
override public function get isCancellable():Boolean {
return _cancellable[this.name];
}
-
+
public static function get cancellable():Dictionary {
return _cancellable;
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Playlist.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Playlist.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Playlist.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Playlist.as
index 2b416620685b..c74e7efd5357 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Playlist.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Playlist.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -37,10 +37,10 @@ package org.flowplayer.model {
super(commonClip);
_commonClip = commonClip;
_commonClip.setParentPlaylist(this);
- initialize();
+ initialize();
}
-
- private function initialize(newClips:Array = null):void {
+
+ private function initialize(newClips:Array = null):void {
_clips = new Array();
_inStreamClip = null;
if (newClips) {
@@ -75,7 +75,7 @@ package org.flowplayer.model {
}
super.setClips(_clips);
}
-
+
private function doReplace(newClips:Array, silent:Boolean = false):void {
var oldClips:Array = _clips.concat([]);
initialize(newClips);
@@ -86,7 +86,7 @@ package org.flowplayer.model {
flow_internal function dispatchPlaylistReplace(oldClips:Array = null):void {
log.debug("dispatchPlaylistReplace");
- var oldClipsEventHelper:ClipEventSupport = new ClipEventSupport(_commonClip, oldClips || []);
+ var oldClipsEventHelper:ClipEventSupport = new ClipEventSupport(_commonClip, oldClips || []);
doDispatchEvent(new ClipEvent(ClipEventType.PLAYLIST_REPLACE, oldClipsEventHelper), true); }
@@ -174,7 +174,7 @@ package org.flowplayer.model {
clip.onBeforeAll(_commonClip.onBeforeClipEvent);
}
}
-
+
/**
* Gets the clip with the specified index.
* @param index of the clip to retrieve, if -1 returns the common clip
@@ -188,14 +188,14 @@ package org.flowplayer.model {
public function get length():Number {
return clips.length;
}
-
+
public function hasNext(skipPreAndPostRolls:Boolean = true):Boolean {
if (skipPreAndPostRolls) {
return current.index < length - 1;
}
return _currentPos < _clips.length - 1;
}
-
+
public function hasPrevious(skipPreAndPostRolls:Boolean = true):Boolean {
return (skipPreAndPostRolls ? current.index : _currentPos) > 0;
}
@@ -220,15 +220,15 @@ package org.flowplayer.model {
if (clip && _inStreamClip) throw new Error("Already playing an instream clip");
_inStreamClip = clip;
}
-
+
public function set current(clip:Clip):void {
toIndex(indexOf(clip));
}
-
+
public function get currentIndex():Number {
return current.index;
}
-
+
public function next(skipPreAndPostRolls:Boolean = true):Clip {
if (skipPreAndPostRolls) {
log.debug("skipping pre and post rolls");
@@ -247,12 +247,12 @@ package org.flowplayer.model {
if (_currentPos == _clips.length - 1) return null;
return _clips[_currentPos + 1];
}
-
+
public function get previousClip():Clip {
if (_currentPos == 0) return null;
return _clips[_currentPos - 1];
}
-
+
public function previous(skipPreAndPostRolls:Boolean = true):Clip {
if (skipPreAndPostRolls) {
log.debug("skipping pre and post rolls");
@@ -279,21 +279,21 @@ package org.flowplayer.model {
private function positionOf(index:Number):Number {
var parentClips:Array = clips;
var clip:Clip = parentClips[index];
- return clip ? _clips.indexOf(clip.preroll || clip) : 0;
+ return clip ? _clips.indexOf(clip.preroll || clip) : 0;
}
-
+
public function indexOf(clip:Clip):Number {
return clips.indexOf(clip);
}
public function toString():String {
- return "[playList] length " + _clips.length + ", clips " + _clips;
+ return "[playList] length " + _clips.length + ", clips " + _clips;
}
-
+
public function get commonClip():Clip {
return _commonClip;
}
-
+
/**
* Does this playlist have a clip with the specified type?
*/
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Plugin.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Plugin.as
similarity index 96%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Plugin.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Plugin.as
index 534c4afdd5de..7199aad11bd2 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Plugin.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Plugin.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of Flowplayer.
@@ -18,21 +18,21 @@
*/
package org.flowplayer.model {
- import org.flowplayer.view.Flowplayer;
-
+ import org.flowplayer.view.Flowplayer;
+
/**
- * Plugin lifecycle interface that can be optionally implemented by plugins.
+ * Plugin lifecycle interface that can be optionally implemented by plugins.
* This interface provides plugins with:
* <ul>
* <li>The ability to interact with Flowplaeyr API.</li>
* <li>Optain the configuration specified for the plugin in the player's configuration.</li>
* <li>The plugin can provide a default configuration object.</li>
* </ul>
- *
+ *
* Lifecycle methods are invokek in following order: 1) onConfig(), 2) onLoad(), 3) getDefaultConfig().
*/
public interface Plugin {
-
+
/**
* Provides plugins their configuration properties.
* This happens when the plugin SWF has been loaded but
@@ -60,6 +60,6 @@ package org.flowplayer.model {
* @return default configuration object, <code>null</code> if no defaults are available
*/
function getDefaultConfig():Object;
-
+
}
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginError.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginError.as
similarity index 95%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginError.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginError.as
index 85244ab00ac8..70ade743ddb9 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginError.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginError.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of FlowPlayer.
@@ -18,14 +18,14 @@
*/
package org.flowplayer.model {
-
+
/**
* Plugin error codes.
*/
public class PluginError extends ErrorCode {
-
+
public static const INIT_FAILED:PluginError = new PluginError(100, "Plugin initialization failed");
- public static const ERROR:PluginError = new PluginError(200, "Error occurred in a plugin");
+ public static const ERROR:PluginError = new PluginError(200, "Error occurred in a plugin");
public function PluginError(code:int, message:String) {
super(PluginEventType.ERROR, code, message);
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginEvent.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginEvent.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginEvent.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginEvent.as
index 932a8a32910a..ef072bb3e6c9 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginEvent.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginEvent.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -17,10 +17,10 @@
*/
package org.flowplayer.model {
- import flash.events.Event;
+ import flash.events.Event;
import org.flowplayer.flow_internal;
import flash.external.ExternalInterface;
-
+
use namespace flow_internal;
/**
* @author anssi
@@ -34,7 +34,7 @@ package org.flowplayer.model {
super(eventType, pluginName, info, info2, info3);
_id = id;
}
-
+
override flow_internal function fireErrorExternal(playerId:String):void {
try {
ExternalInterface.call(
@@ -56,7 +56,7 @@ package org.flowplayer.model {
public override function toString():String {
return formatToString("PluginEvent", "id", "info", "info2", "info3", "info4", "info5");
}
-
+
/**
* Gets the event Id.
*/
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginEventDispatcher.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginEventDispatcher.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginEventDispatcher.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginEventDispatcher.as
index 293128ec5baf..e650b9f0bd39 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginEventDispatcher.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginEventDispatcher.as
@@ -1,15 +1,15 @@
package org.flowplayer.model {
import flash.utils.Dictionary;
-
+
import org.flowplayer.flow_internal;
- import org.flowplayer.model.EventDispatcher;
+ import org.flowplayer.model.EventDispatcher;
use namespace flow_internal;
/**
* @author anssi
*/
public class PluginEventDispatcher extends EventDispatcher {
-
+
/**
* Dispatches a plugin event.
* @param eventType the type of the event to dispatch
@@ -74,7 +74,7 @@ package org.flowplayer.model {
public function onError(listener:Function):void {
setListener(PluginEventType.ERROR, listener);
}
-
+
override protected function get cancellableEvents():Dictionary {
return PluginEventType.cancellable;
}
@@ -82,7 +82,7 @@ package org.flowplayer.model {
override protected function get allEvents():Dictionary {
return PluginEventType.all;
}
-
+
public function get name():String {
return null;
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginEventType.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginEventType.as
similarity index 90%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginEventType.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginEventType.as
index b9a1e5919783..eb3261745ca4 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginEventType.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginEventType.as
@@ -1,16 +1,16 @@
package org.flowplayer.model {
import flash.utils.Dictionary;
-
- import org.flowplayer.model.EventType;
+
+ import org.flowplayer.model.EventType;
/**
* @author anssi
*/
public class PluginEventType extends EventType {
-
- public static const PLUGIN_EVENT:PluginEventType = new PluginEventType("onPluginEvent");
- public static const LOAD:PluginEventType = new PluginEventType("onLoad");
- public static const ERROR:PluginEventType = new PluginEventType("onError");
+
+ public static const PLUGIN_EVENT:PluginEventType = new PluginEventType("onPluginEvent");
+ public static const LOAD:PluginEventType = new PluginEventType("onLoad");
+ public static const ERROR:PluginEventType = new PluginEventType("onError");
private static var _allValues:Dictionary;
private static var _cancellable:Dictionary = new Dictionary();
@@ -25,11 +25,11 @@ package org.flowplayer.model {
}
_allValues[name] = this;
}
-
+
override public function get isCancellable():Boolean {
return _cancellable[this.name];
}
-
+
public static function get cancellable():Dictionary {
return _cancellable;
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginFactory.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginFactory.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginFactory.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginFactory.as
index 96340319f5aa..9d74ed8619fa 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginFactory.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginFactory.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of Flowplayer.
@@ -25,7 +25,7 @@ package org.flowplayer.model {
* The SWF main class is required to extend DisplayObject or any of it's subclasses and therefore
* it is not suitable for non-visual plugins that just implement logic. Providers are an example of
* non-visual plugins.
- *
+ *
* The SWF main class can implement this interface.
*/
public interface PluginFactory {
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginMethod.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginMethod.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginMethod.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginMethod.as
index d62d55244c38..3dce36038c2b 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginMethod.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginMethod.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -28,7 +28,7 @@ package org.flowplayer.model {
private var _isSetter:Boolean;
private var _hasReturnValue:Boolean;
private var _convertResult:Boolean;
-
+
public static function method(externalName:String, pluginFunctionName:String, hasReturnValue:Boolean, convertResult:Boolean):PluginMethod {
return new PluginMethod(externalName, pluginFunctionName, false, false, hasReturnValue, convertResult);
}
@@ -39,7 +39,7 @@ package org.flowplayer.model {
public static function getter(externalName:String, pluginFunctionName:String, convertResult:Boolean):PluginMethod {
return new PluginMethod(externalName, pluginFunctionName, true, false, true, convertResult);
- }
+ }
public function PluginMethod(externalName:String, pluginFunctionName:String, isGetter:Boolean = false,
isSetter:Boolean = false, hasReturnValue:Boolean = false, convertResult:Boolean = false) {
@@ -57,23 +57,23 @@ package org.flowplayer.model {
public function get externalName():String {
return _externalName;
}
-
+
public function get internalName():String {
return _internalName;
}
-
+
public function get isGetter():Boolean {
return _isGetter;
}
-
+
public function get isSetter():Boolean {
return _isSetter;
}
-
+
public function get hasReturnValue():Boolean {
return _hasReturnValue;
}
-
+
public function set hasReturnValue(hasReturnValue:Boolean):void {
_hasReturnValue = hasReturnValue;
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginMethodHelper.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginMethodHelper.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginMethodHelper.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginMethodHelper.as
index e8f1d7efb154..6344e60f8d7e 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginMethodHelper.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginMethodHelper.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -36,7 +36,7 @@ package org.flowplayer.model {
}
return null;
}
-
+
public static function invokePlugin(callable:Callable, plugin:Object, methodName:String, args:Array):Object {
var method:PluginMethod = callable.getMethod(methodName);
if (! method) {
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginModel.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginModel.as
similarity index 96%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginModel.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginModel.as
index 3b861fecac73..2084232be7f7 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginModel.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginModel.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -18,7 +18,7 @@
package org.flowplayer.model {
import org.flowplayer.model.Callable;
- import org.flowplayer.model.Cloneable;
+ import org.flowplayer.model.Cloneable;
/**
* @author api
@@ -34,11 +34,11 @@ package org.flowplayer.model {
function set isBuiltIn(value:Boolean):void;
function dispatchOnLoad():void;
-
+
function dispatchError(code:PluginError, info:Object = null):void;
-
+
function dispatch(eventType:PluginEventType, eventId:Object = null, info:Object = null, info2:Object = null, info3:Object = null):void;
-
+
function dispatchEvent(event:PluginEvent):void;
function dispatchBeforeEvent(eventType:PluginEventType, eventId:Object = null, info:Object = null, info2:Object = null, info3:Object = null):Boolean;
@@ -50,15 +50,15 @@ package org.flowplayer.model {
function onLoad(listener:Function):void;
function onError(listener:Function):void;
-
+
function unbind(listener:Function, event:EventType = null, beforePhase:Boolean = false):void;
function get config():Object;
-
+
function set config(config:Object):void;
-
+
function get pluginObject():Object;
-
+
function set pluginObject(pluginObject:Object):void;
}
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginModelImpl.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginModelImpl.as
similarity index 97%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginModelImpl.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginModelImpl.as
index b717b6738e78..468d9cf91916 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginModelImpl.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/PluginModelImpl.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of FlowPlayer.
@@ -19,7 +19,7 @@
package org.flowplayer.model {
import org.flowplayer.model.PluginEventDispatcher;
- import org.flowplayer.model.PluginModel;
+ import org.flowplayer.model.PluginModel;
/**
* @author api
@@ -44,54 +44,54 @@ package org.flowplayer.model {
clone.methods = _methods;
return clone;
}
-
+
public function get pluginObject():Object {
return _pluginObject;
}
-
+
public function set pluginObject(pluginObject:Object):void {
_pluginObject = pluginObject;
}
-
+
[Value]
override public function get name():String {
return _name;
}
-
+
public function set name(name:String):void {
_name = name;
}
-
+
[Value]
public function get config():Object {
return _config;
}
-
+
public function set config(config:Object):void {
_config = config;
}
-
+
public function addMethod(method:PluginMethod):void {
_methods.push(method);
}
-
+
public function getMethod(externalName:String):PluginMethod {
return PluginMethodHelper.getMethod(_methods, externalName);
}
-
+
public function invokeMethod(externalName:String, args:Array = null):Object {
return PluginMethodHelper.invokePlugin(this, _pluginObject, externalName, args);
}
-
+
[Value(name="methods")]
public function get methodNames():Array {
return PluginMethodHelper.methodNames(_methods);
}
-
+
public function set methods(methods:Array):void {
_methods = methods;
}
-
+
public function toString():String {
return "[PluginModelImpl] '" + name + "'";
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/ProviderModel.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/ProviderModel.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/ProviderModel.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/ProviderModel.as
index 5853889266fc..8ad0c224ded3 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/ProviderModel.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/ProviderModel.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/State.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/State.as
similarity index 97%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/State.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/State.as
index 83ffad50781f..444db0fc84f2 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/State.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/State.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -26,7 +26,7 @@ package org.flowplayer.model {
public static const ENDED:State = new State(5, "Ended");
private static var enumCreated:Boolean;
- { enumCreated = true;
+ { enumCreated = true;
}
private var _name:String;
private var _code:Number;
@@ -37,11 +37,11 @@ package org.flowplayer.model {
_code = code;
_name = name;
}
-
+
public function toString():String {
return "State: " + _code + ", '" + _name + "'";
}
-
+
public function get code():Number {
return _code;
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Status.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Status.as
similarity index 95%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Status.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Status.as
index 2c787791550d..14467ed9c17f 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/Status.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/Status.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -50,50 +50,50 @@ package org.flowplayer.model {
*/
public function get ended():Boolean {
return (_clip.type == ClipType.IMAGE && _clip.duration == 0) || (_clip.played && (_clip.duration - _time <= 1));
- }
-
+ }
+
public function get clip():Clip {
return _clip;
}
-
- [Value]
+
+ [Value]
public function get time():Number {
return _time;
}
-
- [Value]
+
+ [Value]
public function get bufferStart():Number {
return _bufferStart;
}
-
- [Value]
+
+ [Value]
public function get bufferEnd():Number {
return _bufferEnd;
}
-
+
public function get bytesTotal():Number {
return _bytesTotal;
}
-
+
public function toString():String {
return "[PlayStatus] time " + _time + ", buffer: [" + _bufferStart + ", " + _bufferEnd + "]";
}
-
+
public function get allowRandomSeek():Boolean {
return _allowRandomSeek;
}
-
- [Value]
+
+ [Value]
public function get muted():Boolean {
return _muted;
}
-
- [Value]
+
+ [Value]
public function get volume():Number {
return _volume;
}
-
- [Value]
+
+ [Value]
public function get state():int {
return _state.code;
}
@@ -101,7 +101,7 @@ package org.flowplayer.model {
public function getState():State {
return _state;
}
-
+
public function set clip(clip:Clip):void {
_clip = clip;
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/TimedPlaylist.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/TimedPlaylist.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/TimedPlaylist.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/TimedPlaylist.as
index 7bf60ff9f209..890b02619b57 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/model/TimedPlaylist.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/model/TimedPlaylist.as
@@ -22,7 +22,7 @@ import flash.utils.Dictionary;
import org.flowplayer.util.Assert;
internal class TimedPlaylist {
-
+
private var _clips:Array;
private var _clipsByTime:Dictionary;
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/Arrange.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/Arrange.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/Arrange.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/Arrange.as
index 5b6cc171c082..d75f784361ed 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/Arrange.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/Arrange.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -44,7 +44,7 @@ package org.flowplayer.util {
if (areaHeight > 0)
disp.y = int((areaHeight / 2) - (disp.height / 2));
}
-
+
/**
* Resize the specified display object to have the same size as the other specified display object.
* @param disp the object to resize
@@ -69,16 +69,16 @@ package org.flowplayer.util {
public static function describeBounds(disp:DisplayObject):String {
return "x: " + disp.x + ", y: " + disp.y + ", width: " + disp.width + ", height: " + disp.height;
}
-
+
/**
- * Gets the position of the specified display object relative to another object.
- * The position is measured from one specified edge of the container object to the center
+ * Gets the position of the specified display object relative to another object.
+ * The position is measured from one specified edge of the container object to the center
* of the queried object. The result can be used in CSS style percentage positioning - to
* position the specified display object inside the container.
- *
+ *
* @param disp the display object whose position is queried
* @param container the display object relative to which the position is calculated
- * @param edge the edge from which the position is calculated from: 0 means that the
+ * @param edge the edge from which the position is calculated from: 0 means that the
* position is measured from the top, 1 from right, 2 from bottom, and 3 from left
*/
public static function positionPercentage(disp:DisplayObject, container:DisplayObject, edge:int):int {
@@ -92,7 +92,7 @@ package org.flowplayer.util {
}
return 0;
}
-
+
public static function getWidth(disp:DisplayObject):Number {
if (disp is Stage) {
return getStageWidth(disp as Stage);
@@ -100,7 +100,7 @@ package org.flowplayer.util {
return disp.width;
}
}
-
+
public static function getHeight(disp:DisplayObject):Number {
if (disp is Stage) {
return getStageHeight(disp as Stage);
@@ -112,11 +112,11 @@ package org.flowplayer.util {
public static function getStageWidth(stage:Stage):Number {
return getStageDimension(stage, "width");
}
-
+
public static function getStageHeight(stage:Stage):Number {
return getStageDimension(stage, "height");
}
-
+
protected static function getStageDimension(stage:Stage, dimensionName:String):Number {
if (stage.displayState == StageDisplayState.FULL_SCREEN) {
return dimensionName == "height" ? stage.stageHeight : stage.stageWidth;
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/ArrayUtil.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/ArrayUtil.as
similarity index 96%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/ArrayUtil.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/ArrayUtil.as
index 1c3ee436af52..dce4cd90327d 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/ArrayUtil.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/ArrayUtil.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -17,8 +17,8 @@
*/
package org.flowplayer.util {
- import org.flowplayer.flow_internal;
-
+ import org.flowplayer.flow_internal;
+
/**
* @author anssi
*/
@@ -31,7 +31,7 @@ package org.flowplayer.util {
}
return result;
}
-
+
public static function concat(result:Array, addIfAvailable:Array):Array {
if (addIfAvailable) {
return result.concat(addIfAvailable);
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/Assert.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/Assert.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/Assert.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/Assert.as
index 8d70d218e368..9f45139ee33c 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/Assert.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/Assert.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -19,7 +19,7 @@
package org.flowplayer.util {
public class Assert {
-
+
public static function notNull(obj:Object, message:String = "object cannot be null"):void {
if (obj == null)
throw new Error(message);
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/GraphicsUtil.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/GraphicsUtil.as
similarity index 96%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/GraphicsUtil.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/GraphicsUtil.as
index fdbf6d73de41..ddb20f8d5a04 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/GraphicsUtil.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/GraphicsUtil.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -17,7 +17,7 @@
*/
package org.flowplayer.util {
- import flash.display.DisplayObject;
+ import flash.display.DisplayObject;
import flash.display.DisplayObjectContainer;
import flash.display.GradientType;
import flash.display.Graphics;
@@ -29,16 +29,16 @@ package org.flowplayer.util {
* @author api
*/
public class GraphicsUtil {
-
+
public static function beginGradientFill(graphics:Graphics, width:Number, height:Number, color1:Number, color2:Number, alpha:Number = 1):void {
var colors:Array = [color1, color2, color1];
var matrix:Matrix = new Matrix();
matrix.createGradientBox(width, height, Math.PI/2);
-
- graphics.beginGradientFill(GradientType.LINEAR, colors,
+
+ graphics.beginGradientFill(GradientType.LINEAR, colors,
[alpha, alpha, alpha], [0, 127, 255], matrix);
}
-
+
public static function beginLinearGradientFill(graphics:Graphics, width:Number, height:Number, colors:Array, alphas:Array, x:int, y:int):void {
var matrix:Matrix = new Matrix();
matrix.createGradientBox(width, height, Math.PI/2, x, y);
@@ -47,10 +47,10 @@ package org.flowplayer.util {
for (var i:Number = 0; i < colors.length; i++) {
ratios.push(i*gap);
}
-
+
graphics.beginGradientFill(GradientType.LINEAR, colors, alphas, ratios, matrix);
}
-
+
public static function drawRoundRectangle(graphics:Graphics, x:Number, y:Number, width:Number, height:Number, borderRadius:Number):void {
if (borderRadius > 0) {
graphics.drawRoundRect(x, y, width, height, borderRadius, borderRadius);
@@ -64,14 +64,14 @@ package org.flowplayer.util {
var gradientHolder:Shape = new Shape();
gradientHolder.name = "_gradient";
parent.addChildAt(gradientHolder, index);
-
+
gradientHolder.graphics.clear();
beginFill(gradientHolder.graphics, gradientAlphas, parent.width, (height != 0 ? height : parent.height), x, y);
GraphicsUtil.drawRoundRectangle(gradientHolder.graphics, x, y, parent.width, (height != 0 ? height : parent.height), borderRadius);
gradientHolder.graphics.endFill();
}
-
+
public static function removeGradient(parent:DisplayObjectContainer):void {
var gradientHolder:DisplayObject = parent.getChildByName("_gradient");
if (gradientHolder) {
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/Log.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/Log.as
similarity index 96%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/Log.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/Log.as
index c3c5da7730ed..4ba7a00c5712 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/Log.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/Log.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -18,7 +18,7 @@
package org.flowplayer.util {
import org.osflash.thunderbolt.Logger;
- import flash.utils.getQualifiedClassName;
+ import flash.utils.getQualifiedClassName;
/**
* @author anssi
@@ -30,7 +30,7 @@ package org.flowplayer.util {
private static const LEVEL_INFO:int = 2;
private static const LEVEL_ERROR:int = 3;
private static const LEVEL_SUPPRESS:int = 4;
-
+
private static var _level:int = LEVEL_ERROR;
private static var _filter:String = "*";
private static var _instances:Array = new Array();
@@ -44,17 +44,17 @@ package org.flowplayer.util {
_instances.push(this);
enable();
}
-
+
private function enable():void {
_enabled = checkFilterEnables(_owner);
}
-
+
private function checkFilterEnables(owner:String):Boolean {
if (_filter == "*") return true;
var className:String;
var parts:Array = owner.split(".");
var last:String = parts[parts.length - 1];
- var classDelimPos:int = last.indexOf("::");
+ var classDelimPos:int = last.indexOf("::");
if (classDelimPos > 0) {
className = last.substr(classDelimPos + 2);
parts[parts.length -1] = last.substr(0, classDelimPos);
@@ -80,7 +80,7 @@ package org.flowplayer.util {
}
public static function set level(level:String):void {
- if (level == "debug")
+ if (level == "debug")
_level = LEVEL_DEBUG;
else if (level == "warn")
_level = LEVEL_WARN;
@@ -91,35 +91,35 @@ package org.flowplayer.util {
else
_level = LEVEL_ERROR;
}
-
+
public static function set filter(filterValue:String):void {
_filter = filterValue;
- }
-
+ }
+
public function debug(msg:String = null, ...rest):void {
if (!_enabled) return;
if (_level <= LEVEL_DEBUG)
write(Logger.debug, msg, "DEBUG", rest);
}
-
+
public function error(msg:String = null, ...rest):void {
if (!_enabled) return;
if (_level <= LEVEL_ERROR)
write(Logger.error, msg, "ERROR", rest);
}
-
+
public function info(msg:String = null, ...rest):void {
if (!_enabled) return;
if (_level <= LEVEL_INFO)
write(Logger.info, msg, "INFO", rest);
}
-
+
public function warn(msg:String = null, ...rest):void {
if (!_enabled) return;
if (_level <= LEVEL_WARN)
write(Logger.warn, msg, "WARN", rest);
}
-
+
private function write(writeFunc:Function, msg:String, levelStr:String, rest:Array):void {
if (traceEnabled) {
doTrace(msg, levelStr, rest);
@@ -138,15 +138,15 @@ package org.flowplayer.util {
private function doTrace(msg:String, levelStr:String, rest:Array):void {
trace(_owner + ":: " + levelStr + ": " + msg);
}
-
+
public function get enabled():Boolean {
return _enabled;
}
-
+
public function set enabled(enabled:Boolean):void {
_enabled = enabled;
}
-
+
public function debugStackTrace(msg:String = null):void{
if (!_enabled) return;
if (_level <= LEVEL_DEBUG)
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/LogConfiguration.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/LogConfiguration.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/LogConfiguration.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/LogConfiguration.as
index 20b6281ae477..f70dc443d0df 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/LogConfiguration.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/LogConfiguration.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -24,19 +24,19 @@ package org.flowplayer.util {
private var _level:String = "error";
private var _filter:String = "*";
private var _trace:Boolean = false;
-
+
public function get level():String {
return _level;
}
-
+
public function set level(level:String):void {
_level = level;
}
-
+
public function get filter():String {
return _filter;
}
-
+
public function set filter(filter:String):void {
_filter = filter;
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/NumberUtil.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/NumberUtil.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/NumberUtil.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/NumberUtil.as
index abcb5bd40d10..cff7a801fe29 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/NumberUtil.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/NumberUtil.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -22,18 +22,18 @@ package org.flowplayer.util {
* @author anssi
*/
public class NumberUtil {
-
+
public static function decodeNonNumbers(number:Number, toValue:Number = 0):Number {
if (isNaN(number)) return toValue;
return number;
- }
-
+ }
+
public static function decodePercentage(percentageStr:String):Number {
var result:Number = evaluate("pct", percentageStr);
if (! isNaN(result)) return result;
return evaluate("%", percentageStr);
}
-
+
public static function decodePixels(pixelsStr:String):Number {
if (pixelsStr.indexOf("px") < 0) {
pixelsStr += "px";
@@ -51,8 +51,8 @@ package org.flowplayer.util {
private static function evaluate(sequence:String, valStr:String):Number {
if (valStr.indexOf(sequence) <= 0) return NaN;
- return Number(valStr.substring(0, valStr.indexOf(sequence)));
+ return Number(valStr.substring(0, valStr.indexOf(sequence)));
}
-
+
}
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/ObjectConverter.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/ObjectConverter.as
similarity index 97%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/ObjectConverter.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/ObjectConverter.as
index 33c791e8b558..a8252d0b60f5 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/ObjectConverter.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/ObjectConverter.as
@@ -11,7 +11,7 @@ package org.flowplayer.util {
public function ObjectConverter(value:*) {
_input = value;
}
-
+
public function convert():Object {
return process(_input);
}
@@ -26,7 +26,7 @@ package org.flowplayer.util {
}
return target;
}
-
+
private function process(value:*):Object {
if (value is String) {
return value;
@@ -41,20 +41,20 @@ package org.flowplayer.util {
}
return value;
}
-
+
private function convertArray(a:Array):Array {
var arr:Array = new Array();
for (var i:int = 0; i < a.length; i++) {
- arr.push(process(a[i]));
+ arr.push(process(a[i]));
}
return arr;
}
-
+
private function convertObject(o:Object):Object {
var obj:Object = new Object();
var classInfo:XML = describeType(o);
log.debug("classInfo : " + classInfo.@name.toString());
-
+
if (classInfo.@name.toString() == "Object") {
copyProps(o, obj);
} else { // o is a class instance
@@ -72,13 +72,13 @@ package org.flowplayer.util {
}
return obj;
}
-
+
public function convertKey():String {
var reg:RegExp = /-/g;
return _input.replace(reg, '_');
}
-
+
}
-
+
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/PropertyBinder.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/PropertyBinder.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/PropertyBinder.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/PropertyBinder.as
index 0cd80a14eb58..4e67769b5556 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/PropertyBinder.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/PropertyBinder.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -19,14 +19,14 @@
package org.flowplayer.util {
import flash.utils.describeType;
import flash.utils.getQualifiedClassName;
-
- import org.flowplayer.util.Log;
+
+ import org.flowplayer.util.Log;
/**
* PropertyBinder is used to populate object's properties by copying values
* from other objects. The target object should be an instance of a class that contains
* accessor or setter functions for the properties that are found in the source.
- *
+ *
* @author api
*/
public class PropertyBinder {
@@ -47,7 +47,7 @@ package org.flowplayer.util {
_extraProps = extraProps;
_objectDesc = describeType(_object);
}
-
+
public function copyProperties(source:Object, overwrite:Boolean = true):Object {
if (! source) return _object;
log.debug("copyProperties, overwrite = " + overwrite + (_extraProps ? ", extraprops will be set to " + _extraProps : ""));
@@ -101,7 +101,7 @@ package org.flowplayer.util {
if (type == "Number") return Number(value);
return value;
}
-
+
private function hasValue(obj:Object, prop:String):Boolean {
if (objHasValue(obj, prop)) {
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/StyleSheetUtil.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/StyleSheetUtil.as
similarity index 96%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/StyleSheetUtil.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/StyleSheetUtil.as
index 9811be348046..e78b13494323 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/StyleSheetUtil.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/StyleSheetUtil.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -17,13 +17,13 @@
*/
package org.flowplayer.util {
-
+
import com.adobe.utils.StringUtil;
/**
* @author api
*/
public class StyleSheetUtil {
-
+
public static function colorValue(color:Object, defVal:Number = 0xffffff):Number {
if (! color) return defVal;
if (color is Number) return color as Number;
@@ -42,7 +42,7 @@ package org.flowplayer.util {
var input:String = stripSpaces(color as String);
var start:int = input.indexOf("(") + 1;
input = input.substr(start, input.indexOf(")") - start);
- var rgb:Array = input.split(",");
+ var rgb:Array = input.split(",");
return rgb[0] << 16 ^ rgb[1] << 8 ^ rgb[2];
}
}
@@ -84,7 +84,7 @@ package org.flowplayer.util {
}
return result;
}
-
+
public static function borderWidth(prefix:String, style:Object, defVal:Number = 1):Number
{
if (! hasProperty(prefix, style) ) return defVal;
@@ -93,18 +93,18 @@ package org.flowplayer.util {
}
return NumberUtil.decodePixels(parseShorthand(prefix, style)[0]);
}
-
+
/**
* Border color value of the root style.
*/
public static function borderColor(prefix:String, style:Object, defVal:Number = 0xffffff):uint {
- if (hasProperty(prefix + "Color", style))
+ if (hasProperty(prefix + "Color", style))
return colorValue(style[prefix + "Color"]);
-
+
if (hasProperty(prefix, style)) {
return StyleSheetUtil.colorValue(parseShorthand(prefix, style)[2]);
}
-
+
return defVal;
}
@@ -113,19 +113,19 @@ package org.flowplayer.util {
* @return
*/
public static function borderAlpha(prefix:String, style:Object, defVal:Number = 1):Number {
- if (hasProperty(prefix + "Color", style))
+ if (hasProperty(prefix + "Color", style))
return colorAlpha(style[prefix + "Color"]);
-
+
if (hasProperty(prefix, style)) {
return StyleSheetUtil.colorAlpha(parseShorthand(prefix, style)[2]);
}
-
+
return defVal;
}
-
+
public static function parseShorthand(property:String, style:Object):Array {
var str:String = style[property];
-
+
// if we are between (), remove spaces
if ( str.indexOf('(') != -1 )
{
@@ -138,10 +138,10 @@ package org.flowplayer.util {
return str.split(" ");
}
-
+
public static function hasProperty(prop:String, style:Object):Boolean {
return style && style[prop] != undefined;
}
-
+
}
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/TextUtil.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/TextUtil.as
similarity index 97%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/TextUtil.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/TextUtil.as
index 206753e603e4..b52444bfd484 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/TextUtil.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/TextUtil.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -22,7 +22,7 @@ package org.flowplayer.util {
import flash.text.AntiAliasType;
import flash.text.Font;
import flash.text.TextField;
- import flash.text.TextFormat;
+ import flash.text.TextFormat;
/**
* @author api
*/
@@ -42,7 +42,7 @@ package org.flowplayer.util {
if (Capabilities.os.indexOf("Windows") == 0) {
format.font = getFont(["Lucida Grande", "Lucida Sans Unicode", "Bitstream Vera", "Verdana", "Arial", "_sans", "_serif"]);
format.font = "_sans";
- } else {
+ } else {
format.font = "Lucida Grande, Lucida Sans Unicode, Bitstream Vera, Verdana, Arial, _sans, _serif";
field.antiAliasType = AntiAliasType.ADVANCED;
}
@@ -53,7 +53,7 @@ package org.flowplayer.util {
field.defaultTextFormat = format;
return field;
}
-
+
private static function getFont(fontList:Array):String {
var available:Array = Font.enumerateFonts(true);
for (var i:Number = 0; i < fontList.length; i++) {
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/TimeUtil.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/TimeUtil.as
similarity index 100%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/TimeUtil.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/TimeUtil.as
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/URLUtil.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/URLUtil.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/URLUtil.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/URLUtil.as
index 13f7542f6e78..8b0599075d48 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/URLUtil.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/URLUtil.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -30,11 +30,11 @@ package org.flowplayer.util {
private static var _log:Log = new Log("org.flowplayer.util::URLUtil");
private static var _loaderInfo:LoaderInfo;
-
+
public static function completeURL(baseURL:String, fileName:String):String {
return addBaseURL(baseURL || pageLocation || playerBaseUrl, fileName);
}
-
+
public static function isValid(URL:String):Boolean {
//#53 update url filter to accomodate for pretty urls with semi colons.
var regex:RegExp = /^http(s)?:\/\/((\d+\.\d+\.\d+\.\d+)|(([\w-]+\.)+([a-z,A-Z][\w-]*)))(:[1-9][0-9]*)?(\/(?:%+@&=)|([\w-.\/:;%+@&=]+[\w-.\/?:;%+@&=]*)?)?(#(.*))?$/i;
@@ -43,7 +43,7 @@ package org.flowplayer.util {
public static function addBaseURL(baseURL:String, fileName:String):String {
if (fileName == null) return null;
-
+
if (isCompleteURLWithProtocol(fileName)) return fileName;
if (baseURL == '' || baseURL == null || baseURL == 'null') {
@@ -72,7 +72,7 @@ package org.flowplayer.util {
if (! fileName) return false;
return fileName.indexOf("://") > 0;
}
-
+
private static function detectPageUrl(functionName:String):String {
_log.debug("detectPageUrl() " + functionName);
@@ -129,7 +129,7 @@ package org.flowplayer.util {
return protocols.indexOf(protocol) >= 0;
//return (url.indexOf("rtmp://") == 0);
}
-
+
public static function get playerBaseUrl():String {
var url:String = _loaderInfo.url;
var firstSwf:Number = url.indexOf(".swf");
@@ -137,7 +137,7 @@ package org.flowplayer.util {
var lastSlashBeforeSwf:Number = url.lastIndexOf("/");
return url.substring(0, lastSlashBeforeSwf);
}
-
+
public static function localDomain(url:String):Boolean {
if (url.indexOf("http://localhost/") == 0) return true;
if (url.indexOf("file://") == 0) return true;
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/VersionUtil.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/VersionUtil.as
similarity index 96%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/VersionUtil.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/VersionUtil.as
index 243876fdb2cb..4df000a423c6 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/util/VersionUtil.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/util/VersionUtil.as
@@ -1,53 +1,53 @@
package org.flowplayer.util {
import flash.system.Capabilities;
-
+
public class VersionUtil {
-
+
public static function majorVersion():Number {
return getVersion().majorVersion;
}
-
+
public static function minorVersion():Number {
return getVersion().minorVersion;
}
-
+
public static function platform():String {
return getVersion().platform;
}
-
+
public static function buildNumber():Number {
return getVersion().buildNumber;
}
-
+
public static function getVersion():Object {
var versionNumber:String = Capabilities.version;
var versionArray:Array = versionNumber.split(",");
-
+
var versionObj:Object = {};
-
+
var platformAndVersion:Array = versionArray[0].split(" ");
-
+
versionObj.platform = platformAndVersion[0];
versionObj.majorVersion = parseInt(platformAndVersion[1]);
versionObj.minorVersion = parseInt(versionArray[1]);
versionObj.buildNumber = parseInt(versionArray[2]);
-
+
return versionObj;
}
-
+
public static function isFlash10():Boolean {
return VersionUtil.majorVersion() == 10;
}
-
+
public static function isFlash9():Boolean {
return VersionUtil.majorVersion() == 9;
}
-
+
public static function hasStageVideo():Boolean {
return (VersionUtil.majorVersion() == 10 && VersionUtil.minorVersion() >= 2) ||
VersionUtil.majorVersion() > 10;
}
-
+
}
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/AbstractSprite.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/AbstractSprite.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/AbstractSprite.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/AbstractSprite.as
index 5b3064bf6bc8..3f6bfb8e80f6 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/AbstractSprite.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/AbstractSprite.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -19,7 +19,7 @@
package org.flowplayer.view {
import flash.display.Sprite;
import flash.geom.Rectangle;
-
+
import org.flowplayer.layout.LayoutEvent;
import org.flowplayer.util.Log;
@@ -29,28 +29,28 @@ package org.flowplayer.view {
public class AbstractSprite extends Sprite {
protected var log:Log = new Log(this);
-
+
/**
* The managed width value.
*/
protected var _width:Number = 0;
-
+
/**
* The managed height value.
*/
protected var _height:Number = 0;
-
+
public function setSize(width:Number, height:Number):void {
_width = width;
_height = height;
onResize();
}
-
+
public override function get width():Number {
if (scaleX != 1) return _width * scaleX;
return _width || super.width;
}
-
+
public override function set width(value:Number):void {
setSize(value, height);
}
@@ -59,7 +59,7 @@ package org.flowplayer.view {
if (scaleY != 1) return _height * scaleY;
return _height || super.height;
}
-
+
public override function set height(value:Number):void {
setSize(width, value);
}
@@ -74,11 +74,11 @@ package org.flowplayer.view {
protected function get managedWidth():Number {
return _width;
}
-
+
protected function get managedHeight():Number {
return _height;
}
-
+
protected function onResize():void {
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/Animation.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/Animation.as
similarity index 97%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/Animation.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/Animation.as
index 6a185556c734..75af77282477 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/Animation.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/Animation.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -18,14 +18,14 @@
package org.flowplayer.view {
import flash.display.DisplayObject;
-
+
import org.flowplayer.util.Log;
- import org.goasap.items.LinearGo;
+ import org.goasap.items.LinearGo;
/**
* @author api
*/
public class Animation extends LinearGo {
-
+
protected var log:Log = new Log(this);
private var _target:DisplayObject;
private var _targetValue:Number;
@@ -40,7 +40,7 @@ package org.flowplayer.view {
_tweenProperty = tweenProperty;
useRounding = true;
}
-
+
public function cancel():Boolean {
_canceled = true;
return stop();
@@ -66,24 +66,24 @@ package org.flowplayer.view {
// Position is a 0-1 multiplier run by LinearGo.
var newValue:Number = _startValue + (_targetValue - _startValue) * _position;
_target[_tweenProperty] = _tweenProperty == "alpha" ? newValue : correctValue(newValue);
-
+
if (_target[_tweenProperty] == _targetValue) {
log.debug("completed for target "+ target + ", property " + _tweenProperty + ", target value was " + _targetValue);
}
}
-
+
public override function toString():String {
return "[Animation] of property '" + _tweenProperty + "', start " + _startValue + ", target " + _targetValue;
}
-
+
protected function get target():DisplayObject {
return _target;
}
-
+
public function get canceled():Boolean {
return _canceled;
}
-
+
public function get tweenProperty():String {
return _tweenProperty;
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/AnimationEngine.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/AnimationEngine.as
similarity index 96%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/AnimationEngine.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/AnimationEngine.as
index ab40a1de539f..ec3c1ffc7ef7 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/AnimationEngine.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/AnimationEngine.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -27,16 +27,16 @@ package org.flowplayer.view {
import org.goasap.events.GoEvent;
import org.goasap.interfaces.IPlayable;
import org.goasap.utils.PlayableGroup;
-
+
import flash.display.DisplayObject;
import flash.geom.Rectangle;
- import flash.utils.Dictionary;
-
+ import flash.utils.Dictionary;
+
use namespace flow_internal;
-
+
/**
- * AnimationAngine is used to animate DisplayProperties.
- *
+ * AnimationAngine is used to animate DisplayProperties.
+ *
*/
public class AnimationEngine {
@@ -50,10 +50,10 @@ package org.flowplayer.view {
_panel = panel;
_pluginRegistry = pluginRegistry;
}
-
+
/**
- * Animates a DisplayObject according to supplied properties.
- *
+ * Animates a DisplayObject according to supplied properties.
+ *
* If the supplied display object is a plugin, the properties can contain relative values and percentage values.
* A relative value specifies a new position relative
* to the plugin's current position. For example:
@@ -77,7 +77,7 @@ package org.flowplayer.view {
* <p>
* All changes made to the plugin's display propertites are stored into the PluginRegistry
* </p>
- *
+ *
* @param pluginName the name of the plugin to animate, the plugin is looked up from the PluginRegistry using this name
* @param props an object containing display properties
* @param durationMillis the duration it takes for the animation to complete
@@ -93,8 +93,8 @@ package org.flowplayer.view {
} else {
log.debug("animating non-plugin displayObject " + disp);
}
-
-
+
+
if (isPlugin) {
var newProps:DisplayProperties = props is DisplayProperties ? props as DisplayProperties : LengthMath.sum(currentProps, props, _panel.stage);
log.debug("current dimensions " + currentProps.dimensions);
@@ -119,7 +119,7 @@ package org.flowplayer.view {
startTweens(disp, alpha(props), props.width, props.height, props.x, props.y, durationMillis, endCallback, updateCallback);
return newProps;
}
-
+
private function alpha(props:Object):Number {
if (props.hasOwnProperty("alpha")) return props["alpha"];
if (props.hasOwnProperty("opacity")) return props["opacity"];
@@ -132,7 +132,7 @@ package org.flowplayer.view {
* @param propertyName the property to animate
* @param target property target value
* @durationMillis the duration of the animation
- * @easeFunc the easing function to use, the default is mx.effects.easing.Quadratic.easeOut
+ * @easeFunc the easing function to use, the default is mx.effects.easing.Quadratic.easeOut
*/
public function animateProperty(view:DisplayObject, propertyName:String, target:Number, durationMillis:int = 500, completeCallback:Function = null, updateCallback:Function = null, easeFunc:Function = null):void {
var props:Object = new Object();
@@ -255,7 +255,7 @@ package org.flowplayer.view {
log.debug("animateAlpha(): will add/remove from panel");
// this is a plugin, add/remove it from a panel
if (target == 0) {
- playable.addEventListener(GoEvent.COMPLETE,
+ playable.addEventListener(GoEvent.COMPLETE,
function(event:GoEvent):void {
if (!_canceledByPlayable[playable] && view.parent) {
log.info("removing " + view + " from panel");
@@ -270,7 +270,7 @@ package org.flowplayer.view {
} else {
log.info("animateAlpha, view is not added/removed from panel: " + view);
}
-
+
var tween:Animation = start(view, playable, completeCallback) as Animation;
if (tween) {
// do not change the display: 'none'/'block' property here!! Changing alpha should not affect 'display'.
@@ -295,16 +295,16 @@ package org.flowplayer.view {
_panel.draw(view);
}
}
-
+
private function startTweens(view:DisplayObject, alpha: Number, width:Number, height:Number, x:Number, y:Number, durationMillis:int, completeCallback:Function, updateCallback:Function, easeFunc:Function = null):Array {
var tweens:Array = new Array();
-
+
var alphaTween:Animation = createTween("alpha", view, alpha, durationMillis);
if (alphaTween) {
- cancel(view, alphaTween);
+ cancel(view, alphaTween);
addTween(tweens, alphaTween);
}
-
+
addTween(tweens, createTween("width", view, width, durationMillis, easeFunc));
addTween(tweens, createTween("height", view, height, durationMillis, easeFunc));
addTween(tweens, createTween("x", view, x, durationMillis, easeFunc));
@@ -330,16 +330,16 @@ package org.flowplayer.view {
private function start(view:DisplayObject, playable:IPlayable, completeCallback:Function = null, updateCallback:Function = null):IPlayable {
if (playable == null) return null;
logRunningAnimations("start", view);
-
- _runningPlayablesByView[view] = playable;
+
+ _runningPlayablesByView[view] = playable;
log.debug("start() staring animation for view " + view);
- playable.addEventListener(GoEvent.COMPLETE,
+ playable.addEventListener(GoEvent.COMPLETE,
function(event:GoEvent):void {
onComplete(view, playable, completeCallback);
});
if (updateCallback != null) {
- playable.addEventListener(GoEvent.UPDATE,
+ playable.addEventListener(GoEvent.UPDATE,
function(event:GoEvent):void {
updateCallback(view);
});
@@ -348,7 +348,7 @@ package org.flowplayer.view {
playable.start();
return playable;
}
-
+
private function onComplete(view:DisplayObject, playable:IPlayable, callback:Function = null):void {
log.debug("onComplete, view " + view);
delete _canceledByPlayable[playable];
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/BuiltInAssetHelper.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/BuiltInAssetHelper.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/BuiltInAssetHelper.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/BuiltInAssetHelper.as
index 4ef84e53c93b..df1e523f7d9c 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/BuiltInAssetHelper.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/BuiltInAssetHelper.as
@@ -1,4 +1,4 @@
-/*
+/*
* Author: Anssi Piirainen, <api@iki.fi>
*
* Copyright (c) 2010 Flowplayer Oy
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/ClipResizer.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/ClipResizer.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/ClipResizer.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/ClipResizer.as
index 397ca7ff6a82..551717ff625a 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/ClipResizer.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/ClipResizer.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -26,7 +26,7 @@ package org.flowplayer.view {
import org.flowplayer.model.ClipEvent;
import org.flowplayer.model.ClipEventSupport;
import org.flowplayer.model.Playlist;
- import org.flowplayer.util.Log;
+ import org.flowplayer.util.Log;
/**
* @author api
@@ -62,11 +62,11 @@ package org.flowplayer.view {
}
resizeClip(_playlist.current);
}
-
+
public function resizeClip(clip:Clip, force:Boolean = false):void {
resizeClipTo(clip, clip.scaling, force);
}
-
+
public function resizeClipTo(clip:Clip, mediaSize:MediaSize, force:Boolean = false):void {
log.debug("resizeClipTo, clip " + clip);
if ( _resizerTimer ) {
@@ -74,13 +74,13 @@ package org.flowplayer.view {
_resizerTimer.reset();
_resizerTimer = null;
}
-
+
var resizer:MediaResizer = resizers[clip];
if (! resizer) {
log.warn("no resizer defined for " + clip);
return;
}
-
+
var resizingFunc:Function = function(event:TimerEvent = null):void {
if ( event && ! resizer.hasOrigSize() && Timer(event.target).currentCount < Timer(event.target).repeatCount ) {
@@ -92,7 +92,7 @@ package org.flowplayer.view {
screen.resized(clip);
}
};
-
+
if ( resizer.hasOrigSize() ) {
log.debug("we have a size, resizing now !");
resizingFunc();
@@ -102,7 +102,7 @@ package org.flowplayer.view {
_resizerTimer = new Timer(500, 5);
_resizerTimer.addEventListener(TimerEvent.TIMER, resizingFunc);
_resizerTimer.start();
-
+
}
}
@@ -110,7 +110,7 @@ package org.flowplayer.view {
log.error(errorMsg);
throw new Error(errorMsg);
}
-
+
private function onResize(event:ClipEvent = null):void {
log.debug("received event " + event.target);
var clip:Clip = Clip(event.target);
@@ -120,18 +120,18 @@ package org.flowplayer.view {
}
resizeClip(clip);
}
-
+
private function addListeners(eventSupport:ClipEventSupport):void {
eventSupport.onStart(onResize);
eventSupport.onBufferFull(onResize);
eventSupport.onPlaylistReplace(onPlaylistChange);
eventSupport.onClipAdd(onPlaylistChange);
}
-
+
private function onPlaylistChange(event:ClipEvent):void {
log.info("Received onPlaylistChanged");
createResizers(ClipEventSupport(event.target).clips.concat(ClipEventSupport(event.target).childClips));
}
-
+
}
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/ErrorHandler.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/ErrorHandler.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/ErrorHandler.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/ErrorHandler.as
index cd3667936e87..ebe9efa6cb0c 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/ErrorHandler.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/ErrorHandler.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -20,10 +20,10 @@ package org.flowplayer.view {
import org.flowplayer.model.ErrorCode;
public interface ErrorHandler {
-
+
function showError(message:String):void;
-
+
function handleError(error:ErrorCode, info:Object = null, throwError:Boolean = true):void;
-
+
}
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/FlowStyleSheet.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/FlowStyleSheet.as
similarity index 97%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/FlowStyleSheet.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/FlowStyleSheet.as
index 9464735537da..4a9b6e8048be 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/FlowStyleSheet.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/FlowStyleSheet.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -17,23 +17,23 @@
*/
package org.flowplayer.view {
- import org.flowplayer.layout.Length;
- import org.flowplayer.util.GraphicsUtil;
- import org.flowplayer.util.NumberUtil;
-
+ import org.flowplayer.layout.Length;
+ import org.flowplayer.util.GraphicsUtil;
+ import org.flowplayer.util.NumberUtil;
+
import flash.text.StyleSheet;
-
+
import org.flowplayer.util.Log;
import org.flowplayer.util.StyleSheetUtil;
import org.flowplayer.view.FlowStyleSheet;
-
- import com.adobe.utils.StringUtil;
+
+ import com.adobe.utils.StringUtil;
/**
* An extension of the Flash's StyleSheet class. It adds a possibility to
* specify a border and a background image. The style properties of the
* border and backgound image are exposed by the methods of this class.
- *
+ *
* @author api
*/
public class FlowStyleSheet {
@@ -56,7 +56,7 @@ package org.flowplayer.view {
parseCSS(cssText);
}
}
-
+
public static function isRootStyleProperty(prop:String):Boolean {
return ROOT_STYLE_PROPS.indexOf(prop) >= 0;
}
@@ -88,7 +88,7 @@ package org.flowplayer.view {
public function setStyle(styleName:String, styleObj:Object):void {
_styleSheet.setStyle(styleName, styleObj);
}
-
+
/**
* Sets the style with the specified name.
*/
@@ -101,7 +101,7 @@ package org.flowplayer.view {
public function addToRootStyle(style:Object):void {
addStyleRules(_styleName, style);
}
-
+
/**
* Adds the specified style properties to the specified style.
*/
@@ -120,7 +120,7 @@ package org.flowplayer.view {
public function get styleSheet():StyleSheet {
return _styleSheet;
}
-
+
/**
* The padding of the root style.
@@ -128,7 +128,7 @@ package org.flowplayer.view {
public function get padding():Array {
if (! StyleSheetUtil.hasProperty("padding", rootStyle)) return [5, 5, 5, 5];
var paddingStr:String = rootStyle["padding"];
-
+
if (paddingStr.indexOf(" ") > 0) {
var pads:Array = new Array();
var values:Array = paddingStr.split(" ");
@@ -149,7 +149,7 @@ package org.flowplayer.view {
return result;
}
}
-
+
/**
* Background color of the root style.
*/
@@ -176,7 +176,7 @@ package org.flowplayer.view {
}
return 1;
}
-
+
/**
* Background gradient of the root style.
*/
@@ -187,7 +187,7 @@ package org.flowplayer.view {
}
return rootStyle["backgroundGradient"];
}
-
+
public static function decodeGradient(value:String):Array {
if (value == "none") return null;
if (value == "high") return [1, 0.5, 0, 0.1, .3];
@@ -200,7 +200,7 @@ package org.flowplayer.view {
*/
public function get backgroundTransparent():Boolean {
if (! StyleSheetUtil.hasProperty("backgroundColor", rootStyle)) return false;
-
+
return rootStyle["backgroundColor"] == "transparent" || backgroundAlpha == 0;
}
@@ -210,7 +210,7 @@ package org.flowplayer.view {
public function get borderWidth():Number {
return StyleSheetUtil.borderWidth('border', rootStyle);
}
-
+
/**
* Border color value of the root style.
*/
@@ -225,7 +225,7 @@ package org.flowplayer.view {
public function get borderAlpha():Number {
return StyleSheetUtil.borderAlpha('border', rootStyle);
}
-
+
/**
* Border radius of the root style.
*/
@@ -233,7 +233,7 @@ package org.flowplayer.view {
if (! StyleSheetUtil.hasProperty("borderRadius", rootStyle)) return 5;
return NumberUtil.decodePixels(rootStyle["borderRadius"]);
}
-
+
/**
* Backround image of the rot style.
*/
@@ -250,7 +250,7 @@ package org.flowplayer.view {
}
return null;
}
-
+
/**
* Gets the link URL associated with this sprite.
* @return
@@ -284,7 +284,7 @@ package org.flowplayer.view {
if (props.length < 2) return null;
return new Length(props[props.length - 2]);
}
-
+
public function get backgroundImageY():Length {
if (! StyleSheetUtil.hasProperty("background", rootStyle)) return new Length(0);
var props:Array = StyleSheetUtil.parseShorthand("background", rootStyle);
@@ -306,14 +306,14 @@ package org.flowplayer.view {
}
public function get textDecoration():String {
- return rootStyle["textDecoration"];
+ return rootStyle["textDecoration"];
}
-
+
private function parseCSS(cssText:String):void {
_styleSheet.parseCSS(cssText);
rootStyle = _styleSheet.getStyle(_styleName);
}
-
+
private function parseColorValue(colorProperty:String):uint {
return StyleSheetUtil.colorValue(rootStyle[colorProperty]);
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/Flowplayer.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/Flowplayer.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/Flowplayer.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/Flowplayer.as
index 100621fb1c5f..a73540420fbd 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/Flowplayer.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/Flowplayer.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/FlowplayerBase.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/FlowplayerBase.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/FlowplayerBase.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/FlowplayerBase.as
index cf4382eb9286..0b66d5c76d04 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/FlowplayerBase.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/FlowplayerBase.as
@@ -81,23 +81,23 @@ package org.flowplayer.view {
private var _fullscreenManager:FullscreenManager;
private var _pluginLoader:PluginLoader;
private var _playerSWFBaseURL:String;
-
+
private var _keyHandler:KeyboardHandler;
-
+
public function FlowplayerBase(
- stage:Stage,
+ stage:Stage,
pluginRegistry:PluginRegistry,
- panel:Panel,
- animationEngine:AnimationEngine,
- errorHandler:ErrorHandler,
- config:Config,
+ panel:Panel,
+ animationEngine:AnimationEngine,
+ errorHandler:ErrorHandler,
+ config:Config,
playerSWFBaseURL:String) {
// dummy references to get stuff included in the lib
Assert.notNull(1);
URLUtil.isCompleteURLWithProtocol("foo");
-
+
var plug:Plugin;
var plugFac:PluginFactory;
var style:FlowStyleSheet;
@@ -130,9 +130,9 @@ package org.flowplayer.view {
internal function set fullscreenManager(value:FullscreenManager):void {
_fullscreenManager = value;
- _fullscreenManager.playerEventDispatcher = this;
+ _fullscreenManager.playerEventDispatcher = this;
}
-
+
/**
* Plays the current clip in playList or the specified clip.
* @param clip an optional clip to play. If specified it will replace the player's
@@ -161,10 +161,10 @@ package org.flowplayer.view {
addClip(clip, playlist.currentIndex);
_playListController.playInstream(clip);
}
-
+
public function switchStream(clip:Clip, netStreamPlayOptions:Object = null):void {
- log.debug("playSwitchStream(" + clip + ")");
- _playListController.switchStream(clip, netStreamPlayOptions);
+ log.debug("playSwitchStream(" + clip + ")");
+ _playListController.switchStream(clip, netStreamPlayOptions);
}
/**
@@ -184,7 +184,7 @@ package org.flowplayer.view {
_playListController.stopBuffering();
return this;
}
-
+
/**
* Pauses the current clip.
*/
@@ -193,7 +193,7 @@ package org.flowplayer.view {
_playListController.pause(silent);
return this;
}
-
+
/**
* Resumes playback of the current clip.
*/
@@ -202,7 +202,7 @@ package org.flowplayer.view {
_playListController.resume(silent);
return this;
}
-
+
/**
* Toggles between paused and resumed states.
* @return true if the player is playing after the call, false if it's paused
@@ -221,7 +221,7 @@ package org.flowplayer.view {
}
return false;
}
-
+
/**
* Is the player currently paused?
* @return true if the player is currently in the paused state
@@ -248,7 +248,7 @@ package org.flowplayer.view {
_playListController.stop();
return this;
}
-
+
/**
* Stops the player and closes the stream and connection.
* Does not dispatch any events.
@@ -259,7 +259,7 @@ package org.flowplayer.view {
_playListController.close(true);
return this;
}
-
+
/**
* Moves to next clip in playList.
*/
@@ -267,7 +267,7 @@ package org.flowplayer.view {
log.debug("next()");
return _playListController.next(false);
}
-
+
/**
* Moves to previous clip in playList.
*/
@@ -275,7 +275,7 @@ package org.flowplayer.view {
log.debug("previous()");
return _playListController.previous();
}
-
+
/**
* Toggles between the full-screen and normal display modeds.
*/
@@ -286,21 +286,21 @@ package org.flowplayer.view {
}
return _fullscreenManager.isFullscreen;
}
-
+
/**
* Is the volume muted?
*/
public function get muted():Boolean {
return _playListController.muted;
}
-
+
/**
* Sets the volume muted/unmuted.
*/
public function set muted(value:Boolean):void {
_playListController.muted = value;
}
-
+
/**
* Sets the volume to the specified level.
* @param volume the new volume value, must be between 0 and 100
@@ -308,7 +308,7 @@ package org.flowplayer.view {
public function set volume(volume:Number):void {
_playListController.volume = volume;
}
-
+
/**
* Gets the current volume level.
* @return the volume level percentage (0-100)
@@ -395,8 +395,8 @@ package org.flowplayer.view {
return true;
}
}
-
-
+
+
/**
* Gets the animation engine.
*/
@@ -419,7 +419,7 @@ package org.flowplayer.view {
_playListController.seekTo(seconds, silent);
return this;
}
-
+
/**
* Seeks to the specified point.
* @param the point in the timeline, between 0 and 100
@@ -457,7 +457,7 @@ package org.flowplayer.view {
public function get currentClip():Clip {
return playlist.current;
}
-
+
/**
* Shows the specified error message in the player area.
*/
@@ -492,7 +492,7 @@ package org.flowplayer.view {
public function get id():String {
return _config.playerId;
}
-
+
/**
* Loads the specified plugin.
* @param plugin the plugin to load
@@ -501,7 +501,7 @@ package org.flowplayer.view {
public function loadPlugin(pluginName:String, url:String, callback:Function):void {
loadPluginLoadable(new Loadable(pluginName, _config, url), callback);
}
-
+
public function loadPluginWithConfig(name:String, url:String, properties:Object = null, callback:Function = null):void
{
var loadable:Loadable = new Loadable(name, _config, url);
@@ -510,7 +510,7 @@ package org.flowplayer.view {
}
loadPluginLoadable(loadable, callback);
}
-
+
/**
* Creates a text field with default font. If the player configuration has a FontProvider
* plugin configured, we'll use that. Otherwise platform fonts are used, the platform font
@@ -550,14 +550,14 @@ package org.flowplayer.view {
} else if (loadable.plugin is ProviderModel){
_playListController.addProvider(loadable.plugin as ProviderModel);
}
-
+
if (callback != null && loadable.plugin != null ) {
- callback(loadable.plugin);
+ callback(loadable.plugin);
}
};
_pluginLoader.loadPlugin(loadable, loaderCallback);
}
-
+
private function get newPluginZIndex():Number {
var play:DisplayProperties = _pluginRegistry.getPlugin("play") as DisplayProperties;
if (! play) return 100;
@@ -570,14 +570,14 @@ package org.flowplayer.view {
public function get fonts():Array {
return _pluginRegistry.fonts;
}
-
+
/**
* Is the player in fullscreen mode?
*/
public function isFullscreen():Boolean {
return _fullscreenManager.isFullscreen;
}
-
+
/**
* Resets the screen and the controls to their orginal display properties
*/
@@ -589,7 +589,7 @@ package org.flowplayer.view {
resetPlugin(pluginNames[i], speed);
}
}
-
+
/**
* Configures logging.
*/
@@ -599,7 +599,7 @@ package org.flowplayer.view {
config.filter = filter;
Log.configure(config);
}
-
+
/**
* Flowplayer configuration.
*/
@@ -609,7 +609,7 @@ package org.flowplayer.view {
/**
* Creates a new resource loader.
- */
+ */
public function createLoader():ResourceLoader {
return new ResourceLoaderImpl(_config.playerId ? null : _playerSWFBaseURL, this);
}
@@ -678,7 +678,7 @@ package org.flowplayer.view {
public function get playButtonOverlay():DisplayProperties {
return DisplayProperties(_pluginRegistry.getPlugin("play")) as DisplayProperties;
}
-
+
private function addStreamAndConnectionCallbacks():void {
createCallbacks(_config.connectionCallbacks, addConnectionCallback, ClipEventType.CONNECTION_EVENT);
createCallbacks(_config.streamCallbacks, addStreamCallback, ClipEventType.NETSTREAM_EVENT);
@@ -748,15 +748,15 @@ package org.flowplayer.view {
public function isKeyboardShortcutsEnabled():Boolean {
return _keyHandler.isKeyboardShortcutsEnabled();
}
-
+
public function setKeyboardShortcutsEnabled(enabled:Boolean):void {
_keyHandler.setKeyboardShortcutsEnabled(enabled);
}
-
+
public function addKeyListener(keyCode:uint, func:Function):void {
_keyHandler.addKeyListener(keyCode, func);
}
-
+
public function removeKeyListener(keyCode:uint, func:Function):void {
_keyHandler.removeKeyListener(keyCode, func);
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/FlowplayerComponent.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/FlowplayerComponent.as
similarity index 100%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/FlowplayerComponent.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/FlowplayerComponent.as
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/FullscreenManager.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/FullscreenManager.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/FullscreenManager.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/FullscreenManager.as
index 569a8c2b19cd..c3a7eadcb0a4 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/FullscreenManager.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/FullscreenManager.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -33,7 +33,7 @@ package org.flowplayer.view {
import flash.display.Stage;
import flash.display.StageDisplayState;
import flash.events.FullScreenEvent;
- import flash.geom.Rectangle;
+ import flash.geom.Rectangle;
/**
* @author api
@@ -61,7 +61,7 @@ package org.flowplayer.view {
_screen.fullscreenManager = this;
_animations = animations;
}
-
+
private function getFullscreenProperties():DisplayProperties {
var model:DisplayPluginModel = _pluginRegistry.getPlugin("controls") as DisplayPluginModel;
if (! model) return DisplayPropertiesImpl.fullSize("screen");
@@ -79,7 +79,7 @@ package org.flowplayer.view {
}
return DisplayPropertiesImpl.fullSize("screen");
}
-
+
public function toggleFullscreen():void {
log.debug("toggleFullsreen");
if (isFullscreen) {
@@ -88,7 +88,7 @@ package org.flowplayer.view {
goFullscreen();
}
}
-
+
private function exitFullscreen():void {
log.info("exiting fullscreen");
_stage.displayState = StageDisplayState.NORMAL;
@@ -105,7 +105,7 @@ package org.flowplayer.view {
log.debug("currently in fulscreen? " + (_stage.displayState == StageDisplayState.FULL_SCREEN));
return _stage.displayState == StageDisplayState.FULL_SCREEN;
}
-
+
private function initializeHwScaling(clip:Clip):void {
if (! _stage.hasOwnProperty("fullScreenSourceRect")) {
log.info("hardware scaling not supported by this Flash version");
@@ -119,7 +119,7 @@ package org.flowplayer.view {
_stage.fullScreenSourceRect = null;
}
}
-
+
private function onFullScreen(event:FullScreenEvent):void {
// store the normal screen properties just prior to entering fullscreen so that the user's screen animations can be restored
if (event.fullScreen) {
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/ImageDisplay.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/ImageDisplay.as
similarity index 93%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/ImageDisplay.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/ImageDisplay.as
index b2e0e968e0ac..986e7dfc3f96 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/ImageDisplay.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/ImageDisplay.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -19,8 +19,8 @@
package org.flowplayer.view {
import org.flowplayer.model.Clip;
import org.flowplayer.view.MediaDisplay;
-
- import flash.display.DisplayObject;
+
+ import flash.display.DisplayObject;
/**
* @author api
@@ -42,13 +42,13 @@ package org.flowplayer.view {
image = clip.getContent();
addChild(image);
}
-
+
public function hasContent():Boolean {
return image != null;
}
-
+
override public function toString():String {
- return "[ImageDisplay] for clip " + _clip;
+ return "[ImageDisplay] for clip " + _clip;
}
}
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/ImageHolder.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/ImageHolder.as
similarity index 90%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/ImageHolder.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/ImageHolder.as
index e6babeba19fb..ae7475e5ca44 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/ImageHolder.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/ImageHolder.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -19,53 +19,53 @@
package org.flowplayer.view {
import flash.display.*;
import flash.events.*;
-
- import org.flowplayer.util.Log;
+
+ import org.flowplayer.util.Log;
/**
* @author api
*/
- public class ImageHolder extends Sprite {
+ public class ImageHolder extends Sprite {
private var _loader:Loader;
private var _mask:Sprite;
-
+
private var _width:int;
private var _height:int;
private var _originalWidth:int;
private var _originalHeight:int;
-
+
private var _widthRatio:Number;
private var _heightRatio:Number;
-
+
public function ImageHolder(loader:Loader) {
super();
-
+
_loader = loader;
-
+
_originalWidth = loader.contentLoaderInfo.width;
_originalHeight = loader.contentLoaderInfo.height;
-
+
_width = loader.width;
_height= loader.height;
-
+
_widthRatio = _width / _originalWidth;
_heightRatio= _height / _originalHeight;
-
+
//width = _originalWidth;
//height = _originalHeight
-
+
graphics.drawRect(0, 0, _originalWidth, _originalHeight);
addChild(_loader);
updateMask();
}
-
+
private function updateMask():void
{
if ( _mask != null && contains(_mask) )
removeChild(_mask);
-
+
_mask = new Sprite();
_mask.graphics.beginFill(0xFF0000);
_mask.graphics.drawRect(0, 0, _width, _height);
@@ -76,34 +76,34 @@ package org.flowplayer.view {
public override function get width():Number {
return _width || super.width;
}
-
+
public override function set width(value:Number):void {
_width = value;
_loader.width = value * _widthRatio;
updateMask();
}
-
+
public override function get height():Number {
return _height || super.height;
}
-
+
public override function set height(value:Number):void {
_height = value;
_loader.height = value * _heightRatio;
updateMask();
}
-
+
public function get originalWidth():int {
return _originalWidth;
}
-
+
public function get originalHeight():int {
return _originalHeight;
}
-
+
public static function hasOffscreenContent(loader:Loader):Boolean
{
- return loader.width != loader.contentLoaderInfo.width || loader.height != loader.contentLoaderInfo.height;
+ return loader.width != loader.contentLoaderInfo.width || loader.height != loader.contentLoaderInfo.height;
}
}
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/KeyboardHandler.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/KeyboardHandler.as
similarity index 93%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/KeyboardHandler.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/KeyboardHandler.as
index aa359a0ed2a5..769b946bd616 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/KeyboardHandler.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/KeyboardHandler.as
@@ -1,4 +1,4 @@
-/*
+/*
* Author: Anssi Piirainen, <api@iki.fi>
*
* Copyright (c) 2009-2011 Flowplayer Oy
@@ -21,13 +21,13 @@ package org.flowplayer.view {
import org.flowplayer.util.Log;
public class KeyboardHandler {
-
+
private var log:Log = new Log(this);
private var _player:Flowplayer;
private var _keyboardShortcutsEnabled:Boolean;
-
+
private var _handlers:Dictionary = new Dictionary();
-
+
public function set player(p:Flowplayer):void
{
_player = p;
@@ -35,7 +35,7 @@ package org.flowplayer.view {
public function KeyboardHandler(stage:Stage, enteringFullscreenCb:Function) {
_keyboardShortcutsEnabled = true;
-
+
addKeyListener(Keyboard.SPACE, function(event:KeyboardEvent):void {
_player.toggle();
});
@@ -63,7 +63,7 @@ package org.flowplayer.view {
addKeyListener(74, volumeDown);
addKeyListener(77, function(event:KeyboardEvent):void {
- _player.muted = ! _player.muted;
+ _player.muted = ! _player.muted;
});
/*
@@ -90,10 +90,10 @@ package org.flowplayer.view {
var jumpforward:Function = function(event:KeyboardEvent):void { if ( ! event.ctrlKey ) jumpseek(); };
var jumpbackward:Function = function(event:KeyboardEvent):void { if ( ! event.ctrlKey ) jumpseek(false); };
addKeyListener(Keyboard.RIGHT, jumpforward);
- addKeyListener(76, jumpforward);
- addKeyListener(Keyboard.LEFT, jumpbackward);
- addKeyListener(72, jumpbackward);
-
+ addKeyListener(76, jumpforward);
+ addKeyListener(Keyboard.LEFT, jumpbackward);
+ addKeyListener(72, jumpbackward);
+
stage.addEventListener(KeyboardEvent.KEY_DOWN,
function(event:KeyboardEvent):void {
@@ -104,7 +104,7 @@ package org.flowplayer.view {
_player.dispatchEvent(PlayerEvent.keyPress(event.keyCode));
if (_handlers[event.keyCode] != null) {
for ( var i:int = 0; i < _handlers[event.keyCode].length; i++)
- _handlers[event.keyCode][i](event);
+ _handlers[event.keyCode][i](event);
}
}
});
@@ -114,31 +114,31 @@ package org.flowplayer.view {
{
if ( _handlers[keyCode] == null )
_handlers[keyCode] = [];
-
+
_handlers[keyCode].push(func);
}
-
+
public function removeKeyListener(keyCode:uint, func:Function):void
{
if ( _handlers[keyCode] == null )
return;
-
+
if ( _handlers[keyCode].indexOf(func) == -1 )
return;
-
+
var handlers:Array = [];
for ( var i:int; i < _handlers[keyCode].length; i++ )
if ( _handlers[keyCode][i] != func )
handlers.push(_handlers[keyCode][i]);
-
+
_handlers[keyCode] = handlers;
}
-
+
public function isKeyboardShortcutsEnabled():Boolean
{
return _keyboardShortcutsEnabled;
}
-
+
public function setKeyboardShortcutsEnabled(enabled:Boolean):void
{
_keyboardShortcutsEnabled = enabled;
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/Launcher.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/Launcher.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/Launcher.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/Launcher.as
index a98c1cac449b..1f6809780694 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/Launcher.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/Launcher.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -54,7 +54,7 @@ package org.flowplayer.view {
import org.flowplayer.view.Screen;
import org.flowplayer.view.KeyboardHandler;
import org.osflash.thunderbolt.Logger;
-
+
import flash.display.DisplayObject;
import flash.display.DisplayObjectContainer;
import flash.display.Sprite;
@@ -75,7 +75,7 @@ package org.flowplayer.view {
CONFIG::FLASH_10_1 {
import flash.media.StageVideo;
}
- use namespace flow_internal;
+ use namespace flow_internal;
public class Launcher extends StyleableSprite implements ErrorHandler {
private var _panel:Panel;
@@ -127,7 +127,7 @@ package org.flowplayer.view {
Security.allowDomain(URLUtil.pageLocation);
}
- loader = createNewLoader();
+ loader = createNewLoader();
rootStyle = _config.canvas.style;
stage.addEventListener(Event.RESIZE, onStageResize);
@@ -142,28 +142,28 @@ package org.flowplayer.view {
log = new Log(this);
EventDispatcher.playerId = _config.playerId;
-
+
log.debug("security sandbox type: " + Security.sandboxType);
-
+
log.info(VersionInfo.versionInfo());
trace(VersionInfo.versionInfo());
log.debug("creating Panel");
createPanel();
_pluginRegistry = new PluginRegistry(_panel);
-
+
log.debug("Creating animation engine");
createAnimationEngine(_pluginRegistry);
-
+
log.debug("creating play button overlay");
createPlayButtonOverlay();
log.debug("creating Flowplayer API");
createFlowplayer();
-
+
// keyboard handler must be present for plugins.
//
-
+
loadPlaylistFeed();
}
@@ -181,11 +181,11 @@ package org.flowplayer.view {
if (_playButtonOverlay) {
PlayButtonOverlayView(_playButtonOverlay.getDisplayObject()).playlist = _config.getPlaylist();
}
-
+
log.debug("creating PlayListController");
_providers = _pluginLoader.providers;
var playListController:PlayListController = createPlayListController();
-
+
addPlayListListeners();
createFullscreenManager(playListController.playlist);
@@ -195,12 +195,12 @@ package org.flowplayer.view {
createLogoForCanvas();
resizeCanvasLogo();
}
-
+
log.debug("creating logo");
createLogo();
-
+
contextMenu = new ContextMenuBuilder(_config.playerId, _config.contextMenu).build();
-
+
log.debug("initializing ExternalInterface");
if (useExternalInterface()) {
_flowplayer.initExternalInterface();
@@ -220,17 +220,17 @@ package org.flowplayer.view {
log.debug("Adding visible plugins to panel");
addPluginsToPanel(_pluginRegistry);
-
+
log.debug("dispatching onLoad");
_flowplayer.dispatchEvent(PlayerEvent.load("player"));
-
+
log.debug("starting configured streams");
startStreams();
//#627 re-enabling screen mask for stage video.
createScreenMask();
- arrangeScreen();
-
+ arrangeScreen();
+
addListeners();
// _controlsModel.onPluginEvent(function(event:PluginEvent):void {
@@ -251,12 +251,12 @@ package org.flowplayer.view {
//#508 disabling the stagevideo screen mask, canvas is visible without it.
private function createScreenMask():void {
blendMode = BlendMode.LAYER;
-
+
_screenMask = new Sprite();
_screenMask.graphics.beginFill(0xff0000);
_screenMask.graphics.drawRect(0, 0, 1, 1);
_screenMask.blendMode = BlendMode.ERASE;
-
+
_screenMask.x = 0;
_screenMask.y = 0;
_screenMask.width = 100;
@@ -338,7 +338,7 @@ package org.flowplayer.view {
callAndHandleError(initPhase2, PlayerError.INIT_FAILED);
});
}
-
+
private function onPluginLoad(event:PluginEvent):void {
var plugin:PluginModel = event.target as PluginModel;
log.info("plugin " + plugin + " initialized");
@@ -355,7 +355,7 @@ package org.flowplayer.view {
handleError(PlayerError.PLUGIN_LOAD_FAILED, "load/init error on " + plugin);
}
}
-
+
private function checkPluginsInitialized():void {
var numPlugins:int = countPlugins();
if (++_pluginsInitialized == numPlugins) {
@@ -419,7 +419,7 @@ package org.flowplayer.view {
if (_error && _error.parent == this) {
removeChild(_error);
}
-
+
_error = TextUtil.createTextField(false);
_error.background = true;
_error.backgroundColor = 0;
@@ -432,10 +432,10 @@ package org.flowplayer.view {
_error.width = Arrange.parentWidth - 40;
Arrange.center(_error, Arrange.parentWidth, Arrange.parentHeight);
addChild(_error);
-
+
createErrorMessageHideTimer();
}
-
+
private function createErrorMessageHideTimer():void {
var errorHideTimer:Timer = new Timer(10000, 1);
errorHideTimer.addEventListener(TimerEvent.TIMER_COMPLETE, hideErrorMessage);
@@ -499,7 +499,7 @@ package org.flowplayer.view {
arrangeCanvasLogo();
}
}
-
+
private function addScreenToPanel():void {
// if controls visible and screen was not explicitly configured --> place screen on top of controls
var screen:DisplayProperties = _pluginRegistry.getPlugin("screen") as DisplayProperties;
@@ -507,8 +507,8 @@ package org.flowplayer.view {
screen.getDisplayObject().visible = false;
_panel.addView(screen.getDisplayObject(), null, screen);
}
-
- private function arrangeScreen(event:Event = null):void {
+
+ private function arrangeScreen(event:Event = null):void {
log.debug("arrangeScreen(), already arranged " + _screenArrangeCount);
if (_screenArrangeCount > 1) return;
if (! _pluginRegistry) return;
@@ -526,7 +526,7 @@ package org.flowplayer.view {
var heightPct:Number = 0;
if (screenTopOrBottomConfigured() && (screen.position.top.pct >= 0 || screen.position.bottom.pct >= 0)) {
- heightPct = 100 - Math.abs(50 - (screen.position.top.pct >= 0 ? screen.position.top.pct : screen.position.bottom.pct))*2;
+ heightPct = 100 - Math.abs(50 - (screen.position.top.pct >= 0 ? screen.position.top.pct : screen.position.bottom.pct))*2;
setScreenBottomAndHeight(screen, heightPct, controlsHeight);
} else {
heightPct = ((Arrange.parentHeight - occupiedHeight) / Arrange.parentHeight) * 100;
@@ -540,7 +540,7 @@ package org.flowplayer.view {
screen.getDisplayObject().visible = true;
_pluginRegistry.updateDisplayProperties(screen, true);
_panel.update(screen.getDisplayObject(), screen);
- _panel.draw(screen.getDisplayObject());
+ _panel.draw(screen.getDisplayObject());
_screenArrangeCount++;
}
@@ -558,7 +558,7 @@ package org.flowplayer.view {
} else {
log.debug("using configured top/bottom for screen");
}
-
+
var heightConfigured:Boolean = _config.getObject("screen") && _config.getObject("screen").hasOwnProperty("height");
if (! heightConfigured) {
log.debug("screen height not configured, setting it to value " + heightPct + "%");
@@ -585,24 +585,24 @@ package org.flowplayer.view {
}
private function createFlowplayer():void {
- _flowplayer = new Flowplayer(stage, _pluginRegistry, _panel,
+ _flowplayer = new Flowplayer(stage, _pluginRegistry, _panel,
_animationEngine, this, this, _config, URLUtil.playerBaseUrl);
_flowplayer.onBeforeFullscreen(onFullscreen);
// _flowplayer.onFullscreenExit(onFullscreen);
}
-
+
private function onFullscreen(event:PlayerEvent):void {
log.debug("entering fullscreen, disabling display clicks");
_screenArrangeCount = 100;
stage.removeEventListener(Event.RESIZE, arrangeScreen);
-
+
_enteringFullscreen = true;
var delay:Timer = new Timer(1000, 1);
delay.addEventListener(TimerEvent.TIMER_COMPLETE, onTimerComplete);
delay.start();
}
-
+
private function onTimerComplete(event:TimerEvent):void {
log.debug("fullscreen wait delay complete, display clicks are enabled again");
_enteringFullscreen = false;
@@ -663,7 +663,7 @@ package org.flowplayer.view {
}
return false;
}
-
+
private function createScreen():void {
_screen = new Screen(_config.getPlaylist(), _animationEngine, _playButtonOverlay, _pluginRegistry);
var screenModel:DisplayProperties = _config.getScreenProperties();
@@ -677,25 +677,25 @@ package org.flowplayer.view {
private function createPlayButtonOverlay():void {
_playButtonOverlay = _config.getPlayButtonOverlay();
if (! _playButtonOverlay) return;
-
+
_playButtonOverlay.onLoad(onPluginLoad);
_playButtonOverlay.onError(onPluginLoadError);
var overlay:PlayButtonOverlayView = new PlayButtonOverlayView(! playButtonOverlayWidthDefined(), _playButtonOverlay, _pluginRegistry);
initView(overlay, _playButtonOverlay, null, false);
}
-
+
private function playButtonOverlayWidthDefined():Boolean {
if (! _config.getObject("play")) return false;
return _config.getObject("play").hasOwnProperty("width");
}
-
+
private function get hasClip():Boolean {
var firstClip:Clip = _config.getPlaylist().current;
var hasClip:Boolean = ! firstClip.isNullClip && (firstClip.url || firstClip.provider != 'http');
- return hasClip;
+ return hasClip;
}
-
+
private function createLogo():void {
var logoView:LogoView = new LogoView(_panel, _flowplayer);
var logo:Logo = _config.getLogo(logoView) || new Logo(logoView, "logo");
@@ -716,7 +716,7 @@ package org.flowplayer.view {
ExternalInterfaceHelper.initializeInterface(props as Callable, view);
}
}
-
+
private function addListeners():void {
_clickTimer.addEventListener(TimerEvent.TIMER, onClickTimer);
@@ -729,7 +729,7 @@ package org.flowplayer.view {
}
addEventListener(MouseEvent.ROLL_OVER, onMouseOver);
addEventListener(MouseEvent.ROLL_OUT, onMouseOut);
-
+
// add some color so that the ROLL_OVER/ROLL_OUT events are always triggered
graphics.beginFill(0, 0);
graphics.drawRect(0, 0, Arrange.parentWidth, Arrange.parentHeight);
@@ -813,7 +813,7 @@ package org.flowplayer.view {
_panel = new Panel();
addChild(_panel);
}
-
+
private function startStreams():void {
var canStart:Boolean = true;
if (_flowplayer.state != State.WAITING) {
@@ -826,7 +826,7 @@ package org.flowplayer.view {
}
var playButton:PlayButtonOverlayView = _playButtonOverlay ? PlayButtonOverlayView(_playButtonOverlay.getDisplayObject()) : null;
-
+
if (canStart) {
if (_flowplayer.currentClip.autoPlay) {
log.debug("clip is autoPlay");
@@ -847,7 +847,7 @@ package org.flowplayer.view {
}
}
}
-
+
private function addPlayListListeners():void {
var playlist:Playlist = _config.getPlaylist();
playlist.onError(onClipError);
@@ -857,7 +857,7 @@ package org.flowplayer.view {
private function onBegin(event:ClipEvent):void {
this.buttonMode = Boolean(Clip(event.target).linkUrl);
}
-
+
private function onClipError(event:ClipEvent):void {
if (event.isDefaultPrevented()) return;
doHandleError(event.error.code + ", " + event.error.message + ", " + event.info2 + ", clip: '" + Clip(event.target) + "'");
@@ -929,24 +929,24 @@ package org.flowplayer.view {
swapChildren(bgImageHolder, _panel);
}
}
-
+
private function createLogoForCanvas():void {
if (_canvasLogo) return;
_copyrightNotice = LogoUtil.createCopyrightNotice(8);
addChild(_copyrightNotice);
-
+
_canvasLogo = new CanvasLogo();
_canvasLogo.width = 85;
_canvasLogo.scaleY = _canvasLogo.scaleX;
_canvasLogo.alpha = .4;
- _canvasLogo.addEventListener(MouseEvent.CLICK,
+ _canvasLogo.addEventListener(MouseEvent.CLICK,
function(event:MouseEvent):void { navigateToURL(new URLRequest("http://flowplayer.org"), "_self"); });
_canvasLogo.buttonMode = true;
log.debug("adding logo to display list");
addChild(_canvasLogo);
onStageResize();
}
-
+
private function createNewLoader():ResourceLoader {
return new ResourceLoaderImpl(_config.playerId ? null : URLUtil.playerBaseUrl, this);
}
@@ -955,7 +955,7 @@ package org.flowplayer.view {
createCustomClipEvents(_config.connectionCallbacks);
createCustomClipEvents(_config.streamCallbacks);
}
-
+
private function createCustomClipEvents(callbacks:Array):void {
if (! callbacks) return;
for (var i:int = 0; i < callbacks.length; i++) {
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/LogoUtil.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/LogoUtil.as
similarity index 96%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/LogoUtil.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/LogoUtil.as
index 2373674cadf1..8deaae91bb35 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/LogoUtil.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/LogoUtil.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of FlowPlayer.
@@ -19,14 +19,14 @@
package org.flowplayer.view {
import org.flowplayer.util.TextUtil;
-
- import flash.text.TextField;
-
+
+ import flash.text.TextField;
+
/**
* @author api
*/
internal class LogoUtil {
-
+
public static function createCopyrightNotice(fontSize:int):TextField {
var copyrightNotice:TextField = TextUtil.createTextField(false, null, fontSize, false);
var date:Date = new Date();
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/MediaDisplay.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/MediaDisplay.as
similarity index 95%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/MediaDisplay.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/MediaDisplay.as
index 91ae19c804ea..dfa01ae69e1b 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/MediaDisplay.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/MediaDisplay.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of FlowPlayer.
@@ -18,8 +18,8 @@
*/
package org.flowplayer.view {
- import org.flowplayer.model.Clip;
-
+ import org.flowplayer.model.Clip;
+
/**
* @author api
*/
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/MediaDisplayFactory.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/MediaDisplayFactory.as
similarity index 95%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/MediaDisplayFactory.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/MediaDisplayFactory.as
index 54a24bd128b3..2f5ddd2f6c81 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/MediaDisplayFactory.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/MediaDisplayFactory.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -18,20 +18,20 @@
package org.flowplayer.view {
import flash.display.DisplayObject;
-
+
import org.flowplayer.flow_internal;
import org.flowplayer.model.Clip;
import org.flowplayer.model.ClipType;
- import org.flowplayer.model.Playlist;
-
-
-
-
-
-
-
-
-
+ import org.flowplayer.model.Playlist;
+
+
+
+
+
+
+
+
+
use namespace flow_internal;
/**
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/MediaResizer.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/MediaResizer.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/MediaResizer.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/MediaResizer.as
index d3e48d1fa20d..7dfa902b1a48 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/MediaResizer.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/MediaResizer.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -19,7 +19,7 @@
package org.flowplayer.view {
import org.flowplayer.model.Clip;
import org.flowplayer.model.MediaSize;
- import org.flowplayer.util.Log;
+ import org.flowplayer.util.Log;
/**
* @author api
@@ -38,7 +38,7 @@ package org.flowplayer.view {
this._maxHeight = maxHeight;
_currentSizingOption = MediaSize.FITTED_PRESERVING_ASPECT_RATIO;
}
-
+
public function setMaxSize(width:int, height:int):void {
this._maxWidth = width;
this._maxHeight = height;
@@ -48,7 +48,7 @@ package org.flowplayer.view {
log.debug("resizeTo() " + sizingOption);
if (sizingOption == null)
sizingOption = _currentSizingOption;
-
+
var resized:Boolean = false;
if (sizingOption == MediaSize.FITTED_PRESERVING_ASPECT_RATIO) {
resized = resizeToFit();
@@ -93,7 +93,7 @@ package org.flowplayer.view {
public function scale(scalingFactor:Number):void {
resize(scalingFactor * origWidth, scalingFactor * origHeight);
}
-
+
private function resizeToOrig(force:Boolean = false):Boolean {
if (force) {
resize(origWidth, origHeight);
@@ -111,34 +111,34 @@ package org.flowplayer.view {
return false;
}
}
-
+
private function resizeToHalfAvailableSize():Boolean {
log.debug("resize to half");
scale((_maxWidth / 2) / origWidth);
return true;
}
-
+
private function resizeToMax():Boolean {
log.debug("resizing to max size (filling available space)");
resize(_maxWidth, _maxHeight);
return true;
}
-
+
private function resize(newWidth:int, newHeight:int):void {
log.debug("resizing to " + newWidth + "x" + newHeight);
_clip.width = newWidth;
- _clip.height = newHeight;
+ _clip.height = newHeight;
log.debug("resized to " + _clip.width + "x" + _clip.height);
}
-
+
public function get currentSize():MediaSize {
return _currentSizingOption;
}
-
+
public function hasOrigSize():Boolean {
return origHeight > 0 && origWidth > 0;
}
-
+
public function toString():String {
return "[MediaResizer] origWidth: " + origWidth + ", origHeight: " + origHeight + ", maxWidth: " + _maxWidth + ", maxHeight: " + _maxHeight;
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/Panel.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/Panel.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/Panel.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/Panel.as
index 6ec12d994167..828a8d2d8eaf 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/Panel.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/Panel.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -23,7 +23,7 @@ package org.flowplayer.view {
import flash.geom.Rectangle;
import flash.system.Capabilities;
import flash.utils.Dictionary;
-
+
import org.flowplayer.layout.DrawWrapper;
import org.flowplayer.layout.Layout;
import org.flowplayer.layout.MarginLayout;
@@ -77,17 +77,17 @@ package org.flowplayer.view {
else
listener = new DrawWrapper(view).draw;
view.alpha = properties.alpha;
-
+
properties.setDisplayObject(view);
addChildView(properties);
-
+
layout.addView(view, listener, properties);
}
override public function swapChildren(child1:DisplayObject, child2:DisplayObject):void {
log.warn("swapChildren on Panel called, overridden here and does nothing");
}
-
+
private function addChildView(properties:DisplayProperties):void {
log.info("addChildView() updating Z index of " + properties + ", target Z index is " + properties.zIndex + ", numChildren " + numChildren);
Assert.notNull(properties.getDisplayObject(), "displayObject cannot be null");
@@ -110,7 +110,7 @@ package org.flowplayer.view {
log.debug("addChildView() adding to top " + properties.getDisplayObject());
addChild(properties.getDisplayObject());
}
-
+
if(childProps.length == 0)
childProps.push(properties);
else
@@ -121,11 +121,11 @@ package org.flowplayer.view {
for (var j:int = 0; j < numChildren; j++)
log.debug("addChildView(), " + getChildAt(j) + " at " + j);
}
-
+
private function getPositionToAddByZIndex(zIndex:int):int {
-
+
for(var i:int = 0; i < childProps.length; ++i)
- if(childProps[i].zIndex >= zIndex) {
+ if(childProps[i].zIndex >= zIndex) {
return i;
break;
}
@@ -161,7 +161,7 @@ package org.flowplayer.view {
super.removeChild(view);
layout.removeView(view);
}
-
+
public override function removeChild(child:DisplayObject):DisplayObject {
removeView(child);
return child;
@@ -170,7 +170,7 @@ package org.flowplayer.view {
private function createLayout(event:Event):void {
layout = new MarginLayout(stage);
}
-
+
/**
* Redraw the panel.
* @param disp if specified only this display object is redrawn
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/PlayerEventDispatcher.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/PlayerEventDispatcher.as
similarity index 98%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/PlayerEventDispatcher.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/PlayerEventDispatcher.as
index 331ad203a78c..6c5e248c8b49 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/PlayerEventDispatcher.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/PlayerEventDispatcher.as
@@ -5,16 +5,16 @@ package org.flowplayer.view {
import org.flowplayer.model.PlayerError;
import org.flowplayer.model.PlayerEvent;
import org.flowplayer.model.PlayerEventType;
-
- import flash.utils.Dictionary;
-
+
+ import flash.utils.Dictionary;
+
use namespace flow_internal;
-
+
/**
* @author anssi
*/
public class PlayerEventDispatcher extends EventDispatcher {
-
+
/**
* Dispatches a player event of the specified type.
*/
@@ -28,7 +28,7 @@ package org.flowplayer.view {
public function dispatchEvent(event:PlayerEvent):void {
doDispatchEvent(event, true);
}
-
+
public function dispatchError(error:ErrorCode, info:Object = null):void {
doDispatchErrorEvent(new PlayerEvent(error.eventType, error, info), true);
}
@@ -78,7 +78,7 @@ package org.flowplayer.view {
log.debug("adding listener for fullscreen " + PlayerEventType.FULLSCREEN);
setListener(PlayerEventType.FULLSCREEN, listener);
}
-
+
/**
* Adds a fullscreen-exit event listener. The event is fired when the player exits from
* the fullscreen mode.
@@ -88,7 +88,7 @@ package org.flowplayer.view {
public function onFullscreenExit(listener:Function):void {
setListener(PlayerEventType.FULLSCREEN_EXIT, listener);
}
-
+
/**
* Adds a volume mute event listener. The event is fired when the volume is muted
* @param listener
@@ -97,7 +97,7 @@ package org.flowplayer.view {
public function onMute(listener:Function):void {
setListener(PlayerEventType.MUTE, listener);
}
-
+
/**
* Adds a volume un-mute event listener. The event is fired when the volume is unmuted
* @param listener
@@ -106,7 +106,7 @@ package org.flowplayer.view {
public function onUnmute(listener:Function):void {
setListener(PlayerEventType.UNMUTE, listener);
}
-
+
/**
* Adds a volume event listener. The event is fired when the volume level is changed.
* @param listener
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/PluginLoader.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/PluginLoader.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/PluginLoader.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/PluginLoader.as
index 2b8bfb013f40..46eca0049f0b 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/PluginLoader.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/PluginLoader.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Flowplayer Oy
*
* This file is part of Flowplayer.
@@ -23,10 +23,10 @@ import flash.system.Security;
import org.flowplayer.model.ErrorCode;
import org.flowplayer.model.Plugin;
- import org.flowplayer.controller.NetStreamControllingStreamProvider;
-
+ import org.flowplayer.controller.NetStreamControllingStreamProvider;
+
import com.adobe.utils.StringUtil;
-
+
import org.flowplayer.config.ExternalInterfaceHelper;
import org.flowplayer.controller.StreamProvider;
import org.flowplayer.model.Callable;
@@ -40,7 +40,7 @@ import flash.system.Security;
import org.flowplayer.model.ProviderModel;
import org.flowplayer.util.Log;
import org.flowplayer.util.URLUtil;
-
+
import flash.display.DisplayObject;
import flash.display.Loader;
import flash.display.LoaderInfo;
@@ -184,7 +184,7 @@ import flash.system.Security;
}
}
}
-
+
private function createIOErrorListener(url:String):Function {
return function(event:IOErrorEvent):void {
log.error("onIoError " + url);
@@ -249,9 +249,9 @@ import flash.system.Security;
private function createPluginModel(loadable:Loadable, pluginInstance:Object):PluginModel {
log.debug("creating model for loadable " + loadable + ", instance " + pluginInstance);
-
+
_loadedPlugins[loadable] = pluginInstance;
-
+
log.debug("pluginInstance " + pluginInstance);
if (pluginInstance is DisplayObject) {
return Loadable(loadable).createDisplayPlugin(pluginInstance as DisplayObject);
@@ -295,18 +295,18 @@ import flash.system.Security;
}
private function createPluginInstance(instanceUsed:Boolean, instance:DisplayObject):Object {
- if (instance.hasOwnProperty("newPlugin")) return instance["newPlugin"]();
-
+ if (instance.hasOwnProperty("newPlugin")) return instance["newPlugin"]();
+
if (! instanceUsed) {
log.debug("using existing instance " + instance);
- return instance;
+ return instance;
}
var className:String = getQualifiedClassName(instance);
log.info("creating new " + className);
var PluginClass:Class = Class(getDefinitionByName(className));
return new PluginClass() as DisplayObject;
}
-
+
public function setConfigPlugins():void {
_allPlugins.forEach(function(loadable:Loadable, index:int, array:Array):void {
if (! loadable.loadFailed) {
@@ -333,15 +333,15 @@ import flash.system.Security;
var swiffUrl:String = slashPos >= 0 ? modelUrl.substr(slashPos) : modelUrl;
return StringUtil.endsWith(infoUrl, swiffUrl);
}
-
+
public function get providers():Dictionary {
return _providers;
}
-
+
public function get loadedCount():int {
return _loadedCount;
}
-
+
public function get loadComplete():Boolean {
return _loadComplete;
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/PluginRegistry.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/PluginRegistry.as
similarity index 95%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/PluginRegistry.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/PluginRegistry.as
index 5cfaf913ad5b..58b58298473a 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/PluginRegistry.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/PluginRegistry.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -20,8 +20,8 @@ package org.flowplayer.view {
import org.flowplayer.controller.ClipURLResolver;
import org.flowplayer.controller.ConnectionProvider;
import org.flowplayer.controller.StreamProvider;
- import org.flowplayer.controller.NetStreamControllingStreamProvider;
- import org.flowplayer.model.DisplayPluginModel;
+ import org.flowplayer.controller.NetStreamControllingStreamProvider;
+ import org.flowplayer.model.DisplayPluginModel;
import org.flowplayer.model.Cloneable;
import org.flowplayer.model.DisplayProperties;
import org.flowplayer.model.Plugin;
@@ -30,9 +30,9 @@ package org.flowplayer.view {
import org.flowplayer.util.Assert;
import org.flowplayer.util.Log;
import org.flowplayer.util.PropertyBinder;
-
+
import flash.display.DisplayObject;
- import flash.utils.Dictionary;
+ import flash.utils.Dictionary;
/**
* @author api
@@ -51,7 +51,7 @@ package org.flowplayer.view {
public function PluginRegistry(panel:Panel) {
_panel = panel;
}
-
+
/**
* Gets all plugins.
* @return the plugins keyed by the plugin name
@@ -59,7 +59,7 @@ package org.flowplayer.view {
public function get plugins():Dictionary {
return _plugins;
}
-
+
/**
* Gets all providers.
* @return the providers keyed by the plugin name
@@ -80,7 +80,7 @@ package org.flowplayer.view {
}
return plugin;
}
-
+
private function updateZIndex(props:DisplayProperties):void {
var zIndex:int = _panel.getZIndex(props.getDisplayObject());
if (zIndex >= 0) {
@@ -129,7 +129,7 @@ package org.flowplayer.view {
internal function registerFont(fontFamily:String):void {
_fonts.push(fontFamily);
- }
+ }
public function registerDisplayPlugin(plugin:DisplayProperties, view:DisplayObject):void {
log.debug("registerDisplayPlugin() " + plugin.name);
@@ -137,28 +137,28 @@ package org.flowplayer.view {
_plugins[plugin.name] = plugin;
_originalProps[plugin.name] = plugin.clone();
}
-
+
internal function registerProvider(model:ProviderModel):void {
log.info("registering provider " + model);
_providers[model.name] = model;
}
-
+
internal function registerGenericPlugin(model:PluginModel):void {
log.info("registering generic plugin " + model.name);
_genericPlugins[model.name] = model;
}
-
+
internal function removePlugin(plugin:PluginModel):void {
if (! plugin) return;
delete _plugins[plugin.name];
delete _originalProps[plugin.name];
delete _providers[plugin.name];
-
+
if (plugin is DisplayPluginModel) {
_panel.removeChild(DisplayPluginModel(plugin).getDisplayObject());
}
}
-
+
public function updateDisplayProperties(props:DisplayProperties, updateOriginalProps:Boolean = false):void {
Assert.notNull(props.name, "displayProperties.name cannot be null");
var view:DisplayObject = DisplayProperties(_plugins[props.name]).getDisplayObject();
@@ -170,11 +170,11 @@ package org.flowplayer.view {
_originalProps[props.name] = props.clone();
}
}
-
+
public function update(plugin:PluginModel):void {
_plugins[plugin.name] = plugin.clone();
}
-
+
internal function updateDisplayPropertiesForDisplay(view:DisplayObject, updated:Object):void {
var props:DisplayProperties = getPluginByDisplay(view);
if (props) {
@@ -182,7 +182,7 @@ package org.flowplayer.view {
updateDisplayProperties(props);
}
}
-
+
internal function onLoad(flowPlayer:FlowplayerBase):void {
log.debug("onLoad");
_flowPlayer = flowPlayer;
@@ -192,27 +192,27 @@ package org.flowplayer.view {
}
private function setPlayerToPlugins(plugins:Dictionary):void {
- // we need to create a copy because any change to the
- // dictionary during the foreach makes it start again,
+ // we need to create a copy because any change to the
+ // dictionary during the foreach makes it start again,
// which causes double onLoad calls
-
+
var transientCopy:Dictionary = new Dictionary();
for ( var name:String in plugins )
transientCopy[name] = plugins[name];
-
+
for each (var model:Object in transientCopy) {
setPlayerToPlugin(model);
}
}
-
+
internal function setPlayerToPlugin(plugin:Object):void {
var pluginObj:Object;
try {
log.debug("setPlayerToPlugin " + plugin);
if (plugin is DisplayProperties) {
- pluginObj = DisplayProperties(plugin).getDisplayObject();
+ pluginObj = DisplayProperties(plugin).getDisplayObject();
} else if (plugin is PluginModel) {
- pluginObj = PluginModel(plugin).pluginObject;
+ pluginObj = PluginModel(plugin).pluginObject;
}
if (pluginObj is NetStreamControllingStreamProvider) {
log.debug("setting player to " + pluginObj);
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/Preloader.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/Preloader.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/Preloader.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/Preloader.as
index 93ffd95e0ddb..846cfdb9576c 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/Preloader.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/Preloader.as
@@ -26,7 +26,7 @@ package org.flowplayer.view {
import flash.utils.getDefinitionByName;
import flash.utils.*;
import flash.display.StageDisplayState;
-
+
import org.flowplayer.util.Arrange;
import org.flowplayer.util.Log;
import org.flowplayer.util.LogConfiguration;
@@ -46,7 +46,7 @@ package org.flowplayer.view {
stop();
addEventListener(Event.ADDED_TO_STAGE, onAddedToStage);
}
-
+
private function onStageResize(e:Event):void{
setParentDimensions();
}
@@ -61,7 +61,7 @@ package org.flowplayer.view {
Arrange.parentWidth = Arrange.localWidth;
Arrange.parentHeight = Arrange.localHeight;
return;
- }
+ }
var p:Object = parent;
while(p){
if(p.width !=0 && p.height !=0 && getQualifiedClassName(p) != 'mx.controls::SWFLoader'){
@@ -78,7 +78,7 @@ package org.flowplayer.view {
}
Arrange.set = true;
}
-
+
private function onAddedToStage(event:Event):void {
log("onAddedToStage(): stage size is " + Arrange.parentWidth + " x " + Arrange.parentHeight);
log("onAddedToStage(), bytes loaded " + loaderInfo.bytesLoaded);
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/RotatingAnimation.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/RotatingAnimation.as
similarity index 100%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/RotatingAnimation.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/RotatingAnimation.as
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/Screen.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/Screen.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/Screen.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/Screen.as
index f510da62a224..13c49c3f75ec 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/Screen.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/Screen.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/StageVideoWrapper.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/StageVideoWrapper.as
similarity index 96%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/StageVideoWrapper.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/StageVideoWrapper.as
index ce37fabcfb64..9f904db8fa06 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/StageVideoWrapper.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/StageVideoWrapper.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008, 2009 Flowplayer Oy
*
* This file is part of Flowplayer.
@@ -18,20 +18,20 @@
*/
package org.flowplayer.view {
-
+
import flash.net.NetStreamPlayOptions;
import flash.net.NetStreamPlayTransitions;
import flash.net.NetStream;
-
- import flash.media.Video;
- import flash.media.StageVideo;
+
+ import flash.media.Video;
+ import flash.media.StageVideo;
import flash.media.StageVideoAvailability;
-
+
import flash.geom.Rectangle;
import flash.geom.Point;
-
+
import flash.display.Stage;
-
+
import flash.events.Event;
import flash.events.StageVideoAvailabilityEvent;
import flash.events.StageVideoEvent;
@@ -47,28 +47,28 @@ package org.flowplayer.view {
private var _stageVideo:StageVideo;
private var _stage:Stage;
-
+
private var _clip:Clip;
-
+
private var _netStream:NetStream = null;
private var _hasStageVideo:Boolean = false;
private var _visible:Boolean = true;
-
+
private var log:Log = new Log(this);
-
+
public function StageVideoWrapper(clip:Clip) {
super();
-
+
_clip = clip;
addEventListener(Event.ADDED_TO_STAGE, onAddedToStage);
addEventListener(Event.REMOVED_FROM_STAGE, onRemovedFromStage);
}
-
+
private function onAddedToStage(event:Event):void {
_stage = stage;
_stage.addEventListener(StageVideoAvailabilityEvent.STAGE_VIDEO_AVAILABILITY, onAvailabilityChanged);
}
-
+
private function onRemovedFromStage(event:Event):void {
_stage.removeEventListener(StageVideoAvailabilityEvent.STAGE_VIDEO_AVAILABILITY, onAvailabilityChanged);
_stage = null;
@@ -84,16 +84,16 @@ package org.flowplayer.view {
private function onAvailabilityChanged(event:StageVideoAvailabilityEvent):void {
log.debug("StageVideo Availability changed: " + event.availability);
-
+
var availableNow:Boolean = event.availability == StageVideoAvailability.AVAILABLE;
useStageVideo(availableNow)
}
private function useStageVideo(availableNow:Boolean):void {
log.debug("useStageVideo : "+ availableNow);
-
+
_hasStageVideo = availableNow;
-
+
if ( _hasStageVideo && _stage.stageVideos.length ) {
_stageVideo = _stage.stageVideos[0];
super.visible = false;
@@ -103,7 +103,7 @@ package org.flowplayer.view {
super.visible = true;
_hasStageVideo = false;
}
-
+
attachNetStream(_netStream);
}
@@ -111,23 +111,23 @@ package org.flowplayer.view {
_netStream = netStream;
if ( hasStageVideo ) {
log.info("Attaching netstream to stageVideo");
-
+
stageVideo.attachNetStream(_netStream);
stageVideo.addEventListener(StageVideoEvent.RENDER_STATE, _displayStageVideo);
-
+
} else {
log.info("Attaching netstream to video");
-
+
super.attachNetStream(_netStream);
-
- if ( _stageVideo != null )
+
+ if ( _stageVideo != null )
_stageVideo.attachNetStream(null);
-
+
visible = _visible;
_clip.dispatch(ClipEventType.STAGE_VIDEO_STATE_CHANGE, stageVideo);
}
}
-
+
private function _displayStageVideo(event:StageVideoEvent):void {
//#612 add some logging for the render state
log.debug("Stagevideo Render State: " + event.status);
@@ -137,11 +137,11 @@ package org.flowplayer.view {
stageVideo.removeEventListener(StageVideoEvent.RENDER_STATE, _displayStageVideo);
super.attachNetStream(null);
-
+
visible = _visible;
_clip.dispatch(ClipEventType.STAGE_VIDEO_STATE_CHANGE, stageVideo);
}
-
+
override public function get videoWidth():int {
return hasStageVideo ? stageVideo.videoWidth : super.videoWidth;
}
@@ -149,7 +149,7 @@ package org.flowplayer.view {
override public function get videoHeight():int {
return hasStageVideo ? stageVideo.videoHeight : super.videoHeight;
}
-
+
override public function set visible(value:Boolean):void {
log.debug("set visible " + value);
_visible = value;
@@ -160,11 +160,11 @@ package org.flowplayer.view {
super.visible = _visible;
}
}
-
+
override public function get visible():Boolean {
return _visible;
}
-
+
private function _updateStageVideo():void {
if ( ! hasStageVideo )
return;
@@ -182,7 +182,7 @@ package org.flowplayer.view {
override public function set width(value:Number):void {
super.width = value;
}
-
+
override public function set height(value:Number):void {
super.height = value;
_updateStageVideo();
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/Styleable.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/Styleable.as
similarity index 97%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/Styleable.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/Styleable.as
index a859251df260..f961ef79693b 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/Styleable.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/Styleable.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of FlowPlayer.
@@ -18,37 +18,37 @@
*/
package org.flowplayer.view {
-
+
/**
- * Interface for objects that support modifying their display style.
+ * Interface for objects that support modifying their display style.
*/
public interface Styleable {
/**
* Notifies new css properties.
- *
+ *
* @param styleProps and object containing the new properties. The propertis contained by this
* object are added, if a specific object already exists it's overwritten. If the parameter is not specified
* returns the current style properties.
* @return void
- */
+ */
function onBeforeCss(styleProps:Object = null):void;
-
+
/**
* Sets/adds css style properties.
- *
+ *
* @param styleProps and object containing the new properties. The propertis contained by this
* object are added, if a specific object already exists it's overwritten. If the parameter is not specified
* returns the current style properties.
* @return the style props after setting the new properties
- */
+ */
function css(styleProps:Object = null):Object;
-
+
/**
* Notifies a css properties animation.
- *
+ *
* @param styleProps and object containing the properties to be animated. The propertis contained by this
* object are added, if a specific object already exists it's overwritten.
* @return void
@@ -57,12 +57,12 @@ package org.flowplayer.view {
/**
* Animates css properties.
- *
+ *
* @param styleProps and object containing the properties to be animated. The propertis contained by this
* object are added, if a specific object already exists it's overwritten.
* @return the style props after setting the new properties
*/
function animate(styleProps:Object):Object;
-
+
}
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/StyleableSprite.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/StyleableSprite.as
similarity index 96%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/StyleableSprite.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/StyleableSprite.as
index c21ae33686c3..cb6dd089beff 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/StyleableSprite.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/StyleableSprite.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of Flowplayer.
@@ -28,7 +28,7 @@ import flash.net.navigateToURL;
import org.flowplayer.view.AbstractSprite;
import org.flowplayer.view.ErrorHandler;
import org.flowplayer.view.FlowStyleSheet;
-
+
import flash.display.Bitmap;
import flash.display.DisplayObject;
import flash.display.DisplayObjectContainer;
@@ -37,12 +37,12 @@ import flash.net.navigateToURL;
import flash.display.Sprite;
import flash.events.Event;
import flash.utils.getDefinitionByName;
- import flash.utils.getQualifiedClassName;
+ import flash.utils.getQualifiedClassName;
/**
* A sprite that can be styled using a StyleSheet. The stylesheet can specify a background image
* to be used or alternatively a background color gradient.
- *
+ *
* @author api
*/
public class StyleableSprite extends AbstractSprite implements Styleable {
@@ -74,15 +74,15 @@ import flash.net.navigateToURL;
*/
override public function setSize(width:Number, height:Number):void {
super.setSize(width, height);
- redraw();
+ redraw();
}
-
+
/**
* Called when the background has been redrawn.
*/
protected function onRedraw():void {
}
-
+
private function redraw():void {
if (! style) {
onRedraw();
@@ -133,7 +133,7 @@ import flash.net.navigateToURL;
GraphicsUtil.removeGradient(this);
}
}
-
+
private function setChildIndexes():void {
if (_imageHolder) {
setChildIndex(_imageHolder, 0);
@@ -149,25 +149,25 @@ import flash.net.navigateToURL;
onSetStyle(style);
loadOrDrawBackground();
}
-
+
protected function onSetStyle(style:FlowStyleSheet):void {
}
-
- public function onBeforeCss(styleProps:Object = null):void
+
+ public function onBeforeCss(styleProps:Object = null):void
{
-
+
}
-
+
public function css(styleProps:Object = null):Object {
_redrawing = true;
log.debug("css " +styleProps);
if (! styleProps) return _style.rootStyle;
-
+
var rootStyle:Object = null;
for (var propName:String in styleProps) {
if (FlowStyleSheet.ROOT_STYLE_PROPS.indexOf(propName) >= 0) {
if (! rootStyle) {
- rootStyle = new Object();
+ rootStyle = new Object();
}
log.debug(propName + " will affect root style, new value " + styleProps[propName]);
rootStyle[propName] = styleProps[propName];
@@ -181,7 +181,7 @@ import flash.net.navigateToURL;
}
return _style.rootStyle;
}
-
+
private function addStyleRules(styleName:String, style:Object):void {
if (styleName == _style.rootStyleName) {
_style.addToRootStyle(style);
@@ -210,23 +210,23 @@ import flash.net.navigateToURL;
onSetRootStyle(style);
loadOrDrawBackground();
}
-
+
public function addToRootStyle(style:Object):void {
_style.addToRootStyle(style);
onAddToRootStyle();
loadOrDrawBackground();
}
-
+
private function onAddToRootStyle():void {
}
protected function onSetRootStyle(style:Object):void {
}
-
+
public final function get style():FlowStyleSheet {
return _style;
}
-
+
private function loadOrDrawBackground():void {
if (_style.backgroundImage && _style.backgroundImage != "none") {
if (! _loader) throw new Error("loader not available");
@@ -250,7 +250,7 @@ import flash.net.navigateToURL;
}
_loader.load(image, onImageLoaded);
}
-
+
private function onImageLoaded(loader:ResourceLoader):void {
_image = loader.getContent() as DisplayObject;
log.debug("received bacground image " + _image);
@@ -268,16 +268,16 @@ import flash.net.navigateToURL;
addBackgroundImage(_image);
var xPos:Length = _style.backgroundImageX;
var yPos:Length = _style.backgroundImageY;
-
+
log.debug("background image xPos " + xPos);
log.debug("background image yPos " + yPos);
-
+
if (xPos.px >= 0) {
_imageHolder.x = xPos.px;
} else if (xPos.pct > 0) {
_imageHolder.x = xPos.pct/100 * width - _imageHolder .width/2;
}
-
+
if (yPos.px >= 0) {
_imageHolder.y = yPos.px;
} else if (yPos.pct > 0) {
@@ -285,7 +285,7 @@ import flash.net.navigateToURL;
}
}
}
-
+
private function removeBackgroundImage():Boolean {
if (_imageHolder) {
log.debug("removing background image");
@@ -295,7 +295,7 @@ import flash.net.navigateToURL;
}
return false;
}
-
+
private function createImageHolder():void {
removeBackgroundImage();
_imageHolder = new Sprite();
@@ -311,7 +311,7 @@ import flash.net.navigateToURL;
navigateToURL(new URLRequest(_style.linkUrl), _style.linkWindow);
event.stopPropagation();
}
-
+
/**
* Creates a sprite that is equal to the size of this sprite.
* @return a sprite that can be used as a mask to hide display objects
@@ -338,24 +338,24 @@ import flash.net.navigateToURL;
var clone:DisplayObject = clone(image);
// make sure cloning succeeded
if (! clone) return;
-
+
var child:DisplayObject = addBackgroundImage(clone);
child.x = x * image.width;
child.y = y * image.height;
log.debug("added backgound at " + child.x + ", " + child.y);
}
- }
+ }
}
-
+
private function clone(target:DisplayObject):DisplayObject {
if (! target) return null;
if (target is Bitmap) return new Bitmap(Bitmap(target).bitmapData);
if (target is Loader) return clone(Loader(target).content);
-
+
var ClassReference:Class = getDefinitionByName(getQualifiedClassName(target)) as Class;
return new ClassReference() as DisplayObject;
}
-
+
private function drawBorder():void {
if (_border && _border.parent == this) {
removeChild(_border);
@@ -363,35 +363,35 @@ import flash.net.navigateToURL;
if (! _style.borderWidth > 0) return;
_border = new Sprite();
addChild(_border);
- log.info("border weight is " + _style.borderWidth + ", alpha "+ _style.borderAlpha);
+ log.info("border weight is " + _style.borderWidth + ", alpha "+ _style.borderAlpha);
_border.graphics.lineStyle(_style.borderWidth, _style.borderColor, _style.borderAlpha);
GraphicsUtil.drawRoundRectangle(_border.graphics, 0, 0, width, height, _style.borderRadius);
}
-
+
protected function get bgImageHolder():Sprite {
return _imageHolder;
}
-
+
/**
* Currently just returns the root style object.
*/
-
- public function onBeforeAnimate(styleProps:Object):void
+
+ public function onBeforeAnimate(styleProps:Object):void
{
}
-
+
public function animate(styleProps:Object):Object {
return _style.rootStyle;
}
-
+
public function get redrawing() : Boolean{
return _redrawing;
}
-
+
protected function set loader(loader:ResourceLoader):void {
log.debug("got loader");
_loader = loader;
- }
+ }
}
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/VideoApiDisplay.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/VideoApiDisplay.as
similarity index 97%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/VideoApiDisplay.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/VideoApiDisplay.as
index 71f14cbd0995..49459b0af91e 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/VideoApiDisplay.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/VideoApiDisplay.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -17,10 +17,10 @@
*/
package org.flowplayer.view {
- import org.flowplayer.util.Arrange;
+ import org.flowplayer.util.Arrange;
import org.flowplayer.model.Clip;
import org.flowplayer.view.MediaDisplay;
-
+
import flash.display.Sprite;
import flash.display.DisplayObject;
@@ -38,7 +38,7 @@ package org.flowplayer.view {
_clip = clip;
createOverlay();
}
-
+
private function createOverlay():void {
// we need to have an invisible layer on top of the video, otherwise the ContextMenu does not work??
_overlay = new Sprite();
@@ -47,7 +47,7 @@ package org.flowplayer.view {
_overlay.graphics.drawRect(0, 0, 10, 10);
_overlay.graphics.endFill();
}
-
+
public function get overlay():Sprite {
return _overlay;
}
@@ -56,7 +56,7 @@ package org.flowplayer.view {
_overlay.width = this.width;
_overlay.height = this.height;
}
-
+
override public function addEventListener(type:String, listener:Function, useCapture:Boolean=false, priority:int=0, useWeakReference:Boolean=false):void {
_overlay.addEventListener(type, listener, useCapture, priority, useWeakReference);
}
@@ -67,9 +67,9 @@ package org.flowplayer.view {
public function init(clip:Clip):void {
_clip = clip;
log.info("init " + _clip);
-
+
//get the display object from the chromeless video provider which is a loader of the external swf loading the video from
-
+
video = clip.getContent();
if (video == null) {
log.warn("no video content in clip " + clip);
@@ -80,11 +80,11 @@ package org.flowplayer.view {
addChild(video);
swapChildren(_overlay, video);
}
-
+
public function hasContent():Boolean {
return video != null;
}
-
+
override public function toString():String {
return "[VideoApiDisplay] for clip " + _clip;
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/VideoDisplay.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/VideoDisplay.as
similarity index 96%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/VideoDisplay.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/VideoDisplay.as
index c0d40bed69d4..68225a84354b 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/VideoDisplay.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/VideoDisplay.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2008-2011 Flowplayer Oy *
* This file is part of Flowplayer.
*
@@ -17,12 +17,12 @@
*/
package org.flowplayer.view {
- import org.flowplayer.util.Arrange;
+ import org.flowplayer.util.Arrange;
import org.flowplayer.model.Clip;
import org.flowplayer.view.MediaDisplay;
-
+
import flash.display.Sprite;
- import flash.media.Video;
+ import flash.media.Video;
/**
* @author api
@@ -37,7 +37,7 @@ package org.flowplayer.view {
_clip = clip;
createOverlay();
}
-
+
private function createOverlay():void {
// we need to have an invisible layer on top of the video, otherwise the ContextMenu does not work??
_overlay = new Sprite();
@@ -46,7 +46,7 @@ package org.flowplayer.view {
_overlay.graphics.drawRect(0, 0, 10, 10);
_overlay.graphics.endFill();
}
-
+
public function get overlay():Sprite {
return _overlay;
}
@@ -81,11 +81,11 @@ package org.flowplayer.view {
addChild(video);
swapChildren(_overlay, video);
}
-
+
public function hasContent():Boolean {
return video != null;
}
-
+
override public function toString():String {
return "[VideoDisplay] for clip " + _clip;
}
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/WrapperForIE.as b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/WrapperForIE.as
similarity index 99%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/WrapperForIE.as
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/WrapperForIE.as
index d2ef9dcb2c4e..0c77c903371f 100644
--- a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/WrapperForIE.as
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/WrapperForIE.as
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008 Anssi Piirainen
*
* This file is part of FlowPlayer.
diff --git a/typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/fplogo.png b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/fplogo.png
similarity index 100%
rename from typo3/contrib/flowplayer/src/actionscript/org/flowplayer/view/fplogo.png
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/actionscript/org/flowplayer/view/fplogo.png
diff --git a/typo3/contrib/flowplayer/src/assets/play.png b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/assets/play.png
similarity index 100%
rename from typo3/contrib/flowplayer/src/assets/play.png
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/assets/play.png
diff --git a/typo3/contrib/flowplayer/src/flash/resources.fla b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/flash/resources.fla
similarity index 100%
rename from typo3/contrib/flowplayer/src/flash/resources.fla
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/flash/resources.fla
diff --git a/typo3/contrib/flowplayer/src/flash/resources.swc b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/flash/resources.swc
similarity index 100%
rename from typo3/contrib/flowplayer/src/flash/resources.swc
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/flash/resources.swc
diff --git a/typo3/contrib/flowplayer/src/flash/resources.swf b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/flash/resources.swf
similarity index 100%
rename from typo3/contrib/flowplayer/src/flash/resources.swf
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/flash/resources.swf
diff --git a/typo3/contrib/flowplayer/src/html/FlowPlayer.html b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/html/FlowPlayer.html
similarity index 93%
rename from typo3/contrib/flowplayer/src/html/FlowPlayer.html
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/html/FlowPlayer.html
index b30aadf8968b..00e44748d09b 100644
--- a/typo3/contrib/flowplayer/src/html/FlowPlayer.html
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/html/FlowPlayer.html
@@ -8,39 +8,39 @@
<body bgcolor="#CCCCCC">
<div id="flowplayerholder">
- This will be replaced by the player.
+ This will be replaced by the player.
</div>
<script type="text/javascript">
var replacementPlaylist = [ { url: "metacafe.flv", provider: "lighttpd" }, { url: "acera.mp4" } ];
-
-new flashembed("flowplayerholder", { id: 'player', src: "flowplayer.commercial.swf", width: 520, height: 360, bgcolor: '#ffffff' },
- { config: {
+
+new flashembed("flowplayerholder", { id: 'player', src: "flowplayer.commercial.swf", width: 520, height: 360, bgcolor: '#ffffff' },
+ { config: {
log: { level: 'debug', filter: 'org.flowplayer.view.Launcher' },
// clip: "honda_accord.flv",
// clip: { url: "honda_accord.flv", autoPlay: false, autoBuffering: false, scaling: "scale" },
// clip: { url: "http://193.33.186.56:84/honda_accord.flv", autoPlay: false, autoBuffering: false, scaling: "scale", provider: "lighttpd", start: 30 },
clip: { scaling: 'scale', baseURL: '/Users/api/code/core/build' },
- playlist: [
+ playlist: [
{ url: 'honda_accord.flv', autoPlay: false, autoBuffering: true, duration: 10 },
{ url: "http://193.33.186.56:84/krzykelo2@56.com_56flv_zhajm_121608180025.flv", provider: 'lighttpd', autoPlay: false, autoBuffering: true, cuepoints: [[ [5, 12, { time: 3, caption: "Buy a license!", price: 120 }], "function()" ], [ [7, 14, { time: 4, caption: "Buy a second license!", price: 90 }], "function()" ]] },
- ],
-
- skinning: {
- play: null,
- contextMenu: [
- { "About FunTube": "function()" },
- { "FunTube player 0.1": null },
- "-",
- { "visit our site yeah": "function()" }
- ]
+ ],
+
+ skinning: {
+ play: null,
+ contextMenu: [
+ { "About FunTube": "function()" },
+ { "FunTube player 0.1": null },
+ "-",
+ { "visit our site yeah": "function()" }
+ ]
},
- plugins: {
+ plugins: {
- //lighttpd: { url: "flowplayer.pseudostreaming.swf" }
- }
+ //lighttpd: { url: "flowplayer.pseudostreaming.swf" }
+ }
} });
var flowplayer = new Object();
@@ -74,7 +74,7 @@ function animateMenu() {
var player = document.getElementById('player');
player.addPlugin("menu", { left: 0, right: 0, width: 120, alpha: 0 });
player.plugin_animate("menu", { left: 320, top: 270, alpha: 1 }, 1000, 'onScreenAnimated');
-
+
}
function increaseVolume() {
diff --git a/typo3/contrib/flowplayer/src/html/embedding.html b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/html/embedding.html
similarity index 100%
rename from typo3/contrib/flowplayer/src/html/embedding.html
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/html/embedding.html
diff --git a/typo3/contrib/flowplayer/src/html/flashembed.min.js b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/html/flashembed.min.js
similarity index 99%
rename from typo3/contrib/flowplayer/src/html/flashembed.min.js
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/html/flashembed.min.js
index 193569f360c1..71ed8af664f6 100644
--- a/typo3/contrib/flowplayer/src/html/flashembed.min.js
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/html/flashembed.min.js
@@ -1,13 +1,13 @@
/**
* flashembed 0.25. Adobe Flash embedding script
- *
+ *
* http://flowplayer.org/player/flash-embed.html
*
* Copyright (c) 2008 Tero Piirainen (tero@flowplayer.org)
*
* Released under the MIT License:
* http://www.opensource.org/licenses/mit-license.php
- *
+ *
* = Basically you can do anything but leave this header as is
*
* Version: 0.10 - 03/11/2008
diff --git a/typo3/contrib/flowplayer/src/javascript/flashembed.js b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flashembed.js
similarity index 100%
rename from typo3/contrib/flowplayer/src/javascript/flashembed.js
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flashembed.js
diff --git a/typo3/contrib/flowplayer/src/javascript/flashembed.min.js b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flashembed.min.js
similarity index 99%
rename from typo3/contrib/flowplayer/src/javascript/flashembed.min.js
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flashembed.min.js
index 193569f360c1..71ed8af664f6 100644
--- a/typo3/contrib/flowplayer/src/javascript/flashembed.min.js
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flashembed.min.js
@@ -1,13 +1,13 @@
/**
* flashembed 0.25. Adobe Flash embedding script
- *
+ *
* http://flowplayer.org/player/flash-embed.html
*
* Copyright (c) 2008 Tero Piirainen (tero@flowplayer.org)
*
* Released under the MIT License:
* http://www.opensource.org/licenses/mit-license.php
- *
+ *
* = Basically you can do anything but leave this header as is
*
* Version: 0.10 - 03/11/2008
diff --git a/typo3/contrib/flowplayer/src/javascript/flowplayer.js/build.xml b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/build.xml
similarity index 85%
rename from typo3/contrib/flowplayer/src/javascript/flowplayer.js/build.xml
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/build.xml
index 1be945444378..1df48e0ac386 100644
--- a/typo3/contrib/flowplayer/src/javascript/flowplayer.js/build.xml
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/build.xml
@@ -1,31 +1,31 @@
<!-- projet name is used as a base name for distribution files -->
-<project name="flowplayer" default="min">
-
+<project name="flowplayer" default="min">
+
<property name="DEVKIT_HOME" value="../../../../lib/devkit"/>
<import file="${DEVKIT_HOME}/js.xml"/>
<property name="version" value="3.2.12"/>
-
+
<!-- concat -->
<target name="concat">
<concat destfile="flowplayer.js">
<fileset dir="${basedir}" includes="flowplayer-src.js"/>
-
+
<fileset dir=".."
includes="flashembed.js"/>
</concat>
</target>
-
+
<target name="min" depends="concat">
<ant antfile="${DEVKIT_HOME}/js.xml" target="min"/>
</target>
- <target name="lint">
+ <target name="lint">
<java jar="${rhino}" fork="true">
<arg value="${DEVKIT_HOME}/lib/jslint.js" />
<arg value="flowplayer-src.js" />
- </java>
- </target>
-
+ </java>
+ </target>
+
</project>
diff --git a/typo3/contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.10.js b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.10.js
similarity index 99%
rename from typo3/contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.10.js
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.10.js
index cc194899c881..fab41e1f3c93 100644
--- a/typo3/contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.10.js
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.10.js
@@ -1129,12 +1129,12 @@ function Iterator(arr) {
var self = this;
for(name in Player.prototype) {
self[name] = function() {
- var args = arguments;
+ var args = arguments;
self.each(function() {
- this[name].apply(this, args);
+ this[name].apply(this, args);
});
};
- }
+ }
}
// these two variables are the only global variables
diff --git a/typo3/contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.10.min.js b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.10.min.js
similarity index 100%
rename from typo3/contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.10.min.js
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.10.min.js
diff --git a/typo3/contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.11.min.js b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.11.min.js
similarity index 100%
rename from typo3/contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.11.min.js
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.11.min.js
diff --git a/typo3/contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.12.min.js b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.12.min.js
similarity index 100%
rename from typo3/contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.12.min.js
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.12.min.js
diff --git a/typo3/contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.7.min.js b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.7.min.js
similarity index 99%
rename from typo3/contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.7.min.js
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.7.min.js
index 143729e5e82b..45168720f73f 100644
--- a/typo3/contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.7.min.js
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.7.min.js
@@ -1,24 +1,24 @@
-/*
+/*
* flowplayer.js 3.2.7. The Flowplayer API
- *
+ *
* Copyright 2009-2011 Flowplayer Oy
- *
+ *
* This file is part of Flowplayer.
- *
+ *
* Flowplayer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* Flowplayer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with Flowplayer. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
* Date: 2011-05-03 09:45:22 -0400 (Tue, 03 May 2011)
- * Revision: 664
+ * Revision: 664
*/
(function(){function g(o){console.log("$f.fireEvent",[].slice.call(o))}function k(q){if(!q||typeof q!="object"){return q}var o=new q.constructor();for(var p in q){if(q.hasOwnProperty(p)){o[p]=k(q[p])}}return o}function m(t,q){if(!t){return}var o,p=0,r=t.length;if(r===undefined){for(o in t){if(q.call(t[o],o,t[o])===false){break}}}else{for(var s=t[0];p<r&&q.call(s,p,s)!==false;s=t[++p]){}}return t}function c(o){return document.getElementById(o)}function i(q,p,o){if(typeof p!="object"){return q}if(q&&p){m(p,function(r,s){if(!o||typeof s!="function"){q[r]=s}})}return q}function n(s){var q=s.indexOf(".");if(q!=-1){var p=s.slice(0,q)||"*";var o=s.slice(q+1,s.length);var r=[];m(document.getElementsByTagName(p),function(){if(this.className&&this.className.indexOf(o)!=-1){r.push(this)}});return r}}function f(o){o=o||window.event;if(o.preventDefault){o.stopPropagation();o.preventDefault()}else{o.returnValue=false;o.cancelBubble=true}return false}function j(q,o,p){q[o]=q[o]||[];q[o].push(p)}function e(){return"_"+(""+Math.random()).slice(2,10)}var h=function(t,r,s){var q=this,p={},u={};q.index=r;if(typeof t=="string"){t={url:t}}i(this,t,true);m(("Begin*,Start,Pause*,Resume*,Seek*,Stop*,Finish*,LastSecond,Update,BufferFull,BufferEmpty,BufferStop").split(","),function(){var v="on"+this;if(v.indexOf("*")!=-1){v=v.slice(0,v.length-1);var w="onBefore"+v.slice(2);q[w]=function(x){j(u,w,x);return q}}q[v]=function(x){j(u,v,x);return q};if(r==-1){if(q[w]){s[w]=q[w]}if(q[v]){s[v]=q[v]}}});i(this,{onCuepoint:function(x,w){if(arguments.length==1){p.embedded=[null,x];return q}if(typeof x=="number"){x=[x]}var v=e();p[v]=[x,w];if(s.isLoaded()){s._api().fp_addCuepoints(x,r,v)}return q},update:function(w){i(q,w);if(s.isLoaded()){s._api().fp_updateClip(w,r)}var v=s.getConfig();var x=(r==-1)?v.clip:v.playlist[r];i(x,w,true)},_fireEvent:function(v,y,w,A){if(v=="onLoad"){m(p,function(B,C){if(C[0]){s._api().fp_addCuepoints(C[0],r,B)}});return false}A=A||q;if(v=="onCuepoint"){var z=p[y];if(z){return z[1].call(s,A,w)}}if(y&&"onBeforeBegin,onMetaData,onStart,onUpdate,onResume".indexOf(v)!=-1){i(A,y);if(y.metaData){if(!A.duration){A.duration=y.metaData.duration}else{A.fullDuration=y.metaData.duration}}}var x=true;m(u[v],function(){x=this.call(s,A,y,w)});return x}});if(t.onCuepoint){var o=t.onCuepoint;q.onCuepoint.apply(q,typeof o=="function"?[o]:o);delete t.onCuepoint}m(t,function(v,w){if(typeof w=="function"){j(u,v,w);delete t[v]}});if(r==-1){s.onCuepoint=this.onCuepoint}};var l=function(p,r,q,t){var o=this,s={},u=false;if(t){i(s,t)}m(r,function(v,w){if(typeof w=="function"){s[v]=w;delete r[v]}});i(this,{animate:function(y,z,x){if(!y){return o}if(typeof z=="function"){x=z;z=500}if(typeof y=="string"){var w=y;y={};y[w]=z;z=500}if(x){var v=e();s[v]=x}if(z===undefined){z=500}r=q._api().fp_animate(p,y,z,v);return o},css:function(w,x){if(x!==undefined){var v={};v[w]=x;w=v}r=q._api().fp_css(p,w);i(o,r);return o},show:function(){this.display="block";q._api().fp_showPlugin(p);return o},hide:function(){this.display="none";q._api().fp_hidePlugin(p);return o},toggle:function(){this.display=q._api().fp_togglePlugin(p);return o},fadeTo:function(y,x,w){if(typeof x=="function"){w=x;x=500}if(w){var v=e();s[v]=w}this.display=q._api().fp_fadeTo(p,y,x,v);this.opacity=y;return o},fadeIn:function(w,v){return o.fadeTo(1,w,v)},fadeOut:function(w,v){return o.fadeTo(0,w,v)},getName:function(){return p},getPlayer:function(){return q},_fireEvent:function(w,v,x){if(w=="onUpdate"){var z=q._api().fp_getPlugin(p);if(!z){return}i(o,z);delete o.methods;if(!u){m(z.methods,function(){var B=""+this;o[B]=function(){var C=[].slice.call(arguments);var D=q._api().fp_invoke(p,B,C);return D==="undefined"||D===undefined?o:D}});u=true}}var A=s[w];if(A){var y=A.apply(o,v);if(w.slice(0,1)=="_"){delete s[w]}return y}return o}})};function b(q,G,t){var w=this,v=null,D=false,u,s,F=[],y={},x={},E,r,p,C,o,A;i(w,{id:function(){return E},isLoaded:function(){return(v!==null&&v.fp_play!==undefined&&!D)},getParent:function(){return q},hide:function(H){if(H){q.style.height="0px"}if(w.isLoaded()){v.style.height="0px"}return w},show:function(){q.style.height=A+"px";if(w.isLoaded()){v.style.height=o+"px"}return w},isHidden:function(){return w.isLoaded()&&parseInt(v.style.height,10)===0},load:function(J){if(!w.isLoaded()&&w._fireEvent("onBeforeLoad")!==false){var H=function(){u=q.innerHTML;if(u&&!flashembed.isSupported(G.version)){q.innerHTML=""}if(J){J.cached=true;j(x,"onLoad",J)}flashembed(q,G,{config:t})};var I=0;m(a,function(){this.unload(function(K){if(++I==a.length){H()}})})}return w},unload:function(J){if(this.isFullscreen()&&/WebKit/i.test(navigator.userAgent)){if(J){J(false)}return w}if(u.replace(/\s/g,"")!==""){if(w._fireEvent("onBeforeUnload")===false){if(J){J(false)}return w}D=true;try{if(v){v.fp_close();w._fireEvent("onUnload")}}catch(H){}var I=function(){v=null;q.innerHTML=u;D=false;if(J){J(true)}};setTimeout(I,100)}else{if(J){J(false)}}return w},getClip:function(H){if(H===undefined){H=C}return F[H]},getCommonClip:function(){return s},getPlaylist:function(){return F},getPlugin:function(H){var J=y[H];if(!J&&w.isLoaded()){var I=w._api().fp_getPlugin(H);if(I){J=new l(H,I,w);y[H]=J}}return J},getScreen:function(){return w.getPlugin("screen")},getControls:function(){return w.getPlugin("controls")._fireEvent("onUpdate")},getLogo:function(){try{return w.getPlugin("logo")._fireEvent("onUpdate")}catch(H){}},getPlay:function(){return w.getPlugin("play")._fireEvent("onUpdate")},getConfig:function(H){return H?k(t):t},getFlashParams:function(){return G},loadPlugin:function(K,J,M,L){if(typeof M=="function"){L=M;M={}}var I=L?e():"_";w._api().fp_loadPlugin(K,J,M,I);var H={};H[I]=L;var N=new l(K,null,w,H);y[K]=N;return N},getState:function(){return w.isLoaded()?v.fp_getState():-1},play:function(I,H){var J=function(){if(I!==undefined){w._api().fp_play(I,H)}else{w._api().fp_play()}};if(w.isLoaded()){J()}else{if(D){setTimeout(function(){w.play(I,H)},50)}else{w.load(function(){J()})}}return w},getVersion:function(){var I="flowplayer.js 3.2.7";if(w.isLoaded()){var H=v.fp_getVersion();H.push(I);return H}return I},_api:function(){if(!w.isLoaded()){throw"Flowplayer "+w.id()+" not loaded when calling an API method"}return v},setClip:function(H){w.setPlaylist([H]);return w},getIndex:function(){return p},_swfHeight:function(){return v.clientHeight}});m(("Click*,Load*,Unload*,Keypress*,Volume*,Mute*,Unmute*,PlaylistReplace,ClipAdd,Fullscreen*,FullscreenExit,Error,MouseOver,MouseOut").split(","),function(){var H="on"+this;if(H.indexOf("*")!=-1){H=H.slice(0,H.length-1);var I="onBefore"+H.slice(2);w[I]=function(J){j(x,I,J);return w}}w[H]=function(J){j(x,H,J);return w}});m(("pause,resume,mute,unmute,stop,toggle,seek,getStatus,getVolume,setVolume,getTime,isPaused,isPlaying,startBuffering,stopBuffering,isFullscreen,toggleFullscreen,reset,close,setPlaylist,addClip,playFeed,setKeyboardShortcutsEnabled,isKeyboardShortcutsEnabled").split(","),function(){var H=this;w[H]=function(J,I){if(!w.isLoaded()){return w}var K=null;if(J!==undefined&&I!==undefined){K=v["fp_"+H](J,I)}else{K=(J===undefined)?v["fp_"+H]():v["fp_"+H](J)}return K==="undefined"||K===undefined?w:K}});w._fireEvent=function(Q){if(typeof Q=="string"){Q=[Q]}var R=Q[0],O=Q[1],M=Q[2],L=Q[3],K=0;if(t.debug){g(Q)}if(!w.isLoaded()&&R=="onLoad"&&O=="player"){v=v||c(r);o=w._swfHeight();m(F,function(){this._fireEvent("onLoad")});m(y,function(S,T){T._fireEvent("onUpdate")});s._fireEvent("onLoad")}if(R=="onLoad"&&O!="player"){return}if(R=="onError"){if(typeof O=="string"||(typeof O=="number"&&typeof M=="number")){O=M;M=L}}if(R=="onContextMenu"){m(t.contextMenu[O],function(S,T){T.call(w)});return}if(R=="onPluginEvent"||R=="onBeforePluginEvent"){var H=O.name||O;var I=y[H];if(I){I._fireEvent("onUpdate",O);return I._fireEvent(M,Q.slice(3))}return}if(R=="onPlaylistReplace"){F=[];var N=0;m(O,function(){F.push(new h(this,N++,w))})}if(R=="onClipAdd"){if(O.isInStream){return}O=new h(O,M,w);F.splice(M,0,O);for(K=M+1;K<F.length;K++){F[K].index++}}var P=true;if(typeof O=="number"&&O<F.length){C=O;var J=F[O];if(J){P=J._fireEvent(R,M,L)}if(!J||P!==false){P=s._fireEvent(R,M,L,J)}}m(x[R],function(){P=this.call(w,O,M);if(this.cached){x[R].splice(K,1)}if(P===false){return false}K++});return P};function B(){if($f(q)){$f(q).getParent().innerHTML="";p=$f(q).getIndex();a[p]=w}else{a.push(w);p=a.length-1}A=parseInt(q.style.height,10)||q.clientHeight;E=q.id||"fp"+e();r=G.id||E+"_api";G.id=r;if(typeof t=="string"){t={clip:{url:t}}}t.playerId=E;t.clip=t.clip||{};if(q.getAttribute("href",2)&&!t.clip.url){t.clip.url=q.getAttribute("href",2)}s=new h(t.clip,-1,w);t.playlist=t.playlist||[t.clip];var I=0;m(t.playlist,function(){var K=this;if(typeof K=="object"&&K.length){K={url:""+K}}m(t.clip,function(L,M){if(M!==undefined&&K[L]===undefined&&typeof M!="function"){K[L]=M}});t.playlist[I]=K;K=new h(K,I,w);F.push(K);I++});m(t,function(K,L){if(typeof L=="function"){if(s[K]){s[K](L)}else{j(x,K,L)}delete t[K]}});m(t.plugins,function(K,L){if(L){y[K]=new l(K,L,w)}});if(!t.plugins||t.plugins.controls===undefined){y.controls=new l("controls",null,w)}y.canvas=new l("canvas",null,w);u=q.innerHTML;function J(L){var K=w.hasiPadSupport&&w.hasiPadSupport();if(/iPad|iPhone|iPod/i.test(navigator.userAgent)&&!/.flv$/i.test(F[0].url)&&!K){return true}if(!w.isLoaded()&&w._fireEvent("onBeforeClick")!==false){w.load()}return f(L)}function H(){if(u.replace(/\s/g,"")!==""){if(q.addEventListener){q.addEventListener("click",J,false)}else{if(q.attachEvent){q.attachEvent("onclick",J)}}}else{if(q.addEventListener){q.addEventListener("click",f,false)}w.load()}}setTimeout(H,0)}if(typeof q=="string"){var z=c(q);if(!z){throw"Flowplayer cannot access element: "+q}q=z;B()}else{B()}}var a=[];function d(o){this.length=o.length;this.each=function(p){m(o,p)};this.size=function(){return o.length}}window.flowplayer=window.$f=function(){var p=null;var o=arguments[0];if(!arguments.length){m(a,function(){if(this.isLoaded()){p=this;return false}});return p||a[0]}if(arguments.length==1){if(typeof o=="number"){return a[o]}else{if(o=="*"){return new d(a)}m(a,function(){if(this.id()==o.id||this.id()==o||this.getParent()==o){p=this;return false}});return p}}if(arguments.length>1){var t=arguments[1],q=(arguments.length==3)?arguments[2]:{};if(typeof t=="string"){t={src:t}}t=i({bgcolor:"#000000",version:[9,0],expressInstall:"http://static.flowplayer.org/swf/expressinstall.swf",cachebusting:false},t);if(typeof o=="string"){if(o.indexOf(".")!=-1){var s=[];m(n(o),function(){s.push(new b(this,k(t),k(q)))});return new d(s)}else{var r=c(o);return new b(r!==null?r:o,t,q)}}else{if(o){return new b(o,t,q)}}}return null};i(window.$f,{fireEvent:function(){var o=[].slice.call(arguments);var q=$f(o[0]);return q?q._fireEvent(o.slice(1)):null},addPlugin:function(o,p){b.prototype[o]=p;return $f},each:m,extend:i});if(typeof jQuery=="function"){jQuery.fn.flowplayer=function(q,p){if(!arguments.length||typeof arguments[0]=="number"){var o=[];this.each(function(){var r=$f(this);if(r){o.push(r)}});return arguments.length?o[arguments[0]]:new d(o)}return this.each(function(){$f(this,k(q),p?k(p):{})})}}})();
\ No newline at end of file
diff --git a/typo3/contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.8.js b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.8.js
similarity index 99%
rename from typo3/contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.8.js
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.8.js
index a1a27bd2e4aa..29fec086a6d5 100644
--- a/typo3/contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.8.js
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.8.js
@@ -1129,12 +1129,12 @@ function Iterator(arr) {
var self = this;
for(name in Player.prototype) {
self[name] = function() {
- var args = arguments;
+ var args = arguments;
self.each(function() {
- this[name].apply(this, args);
+ this[name].apply(this, args);
});
};
- }
+ }
}
// these two variables are the only global variables
diff --git a/typo3/contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.8.min.js b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.8.min.js
similarity index 100%
rename from typo3/contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.8.min.js
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.8.min.js
diff --git a/typo3/contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.9.js b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.9.js
similarity index 99%
rename from typo3/contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.9.js
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.9.js
index f8dc338264ce..0d8a4fcf5185 100644
--- a/typo3/contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.9.js
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.9.js
@@ -1129,12 +1129,12 @@ function Iterator(arr) {
var self = this;
for(name in Player.prototype) {
self[name] = function() {
- var args = arguments;
+ var args = arguments;
self.each(function() {
- this[name].apply(this, args);
+ this[name].apply(this, args);
});
};
- }
+ }
}
// these two variables are the only global variables
diff --git a/typo3/contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.9.min.js b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.9.min.js
similarity index 100%
rename from typo3/contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.9.min.js
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-3.2.9.min.js
diff --git a/typo3/contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-src.js b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-src.js
similarity index 99%
rename from typo3/contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-src.js
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-src.js
index 163c98e6b9fc..13b76ffc5210 100644
--- a/typo3/contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-src.js
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/flowplayer-src.js
@@ -1146,12 +1146,12 @@ function Iterator(arr) {
var self = this;
for(name in Player.prototype) {
self[name] = function() {
- var args = arguments;
+ var args = arguments;
self.each(function() {
- this[name].apply(this, args);
+ this[name].apply(this, args);
});
};
- }
+ }
}
// these two variables are the only global variables
diff --git a/typo3/contrib/flowplayer/src/javascript/flowplayer.js/release-notes.html b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/release-notes.html
similarity index 92%
rename from typo3/contrib/flowplayer/src/javascript/flowplayer.js/release-notes.html
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/release-notes.html
index c3b4935cc0cf..165faefd2772 100644
--- a/typo3/contrib/flowplayer/src/javascript/flowplayer.js/release-notes.html
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/release-notes.html
@@ -8,17 +8,17 @@
3.1.5
- unload really called if unloaded
-
+
3.1.1.
- new API method: <samp>addClip</samp>
- new API method: <samp>toggleFullscreen</samp>
- new event: <samp>onClipAdd</samp>
- a critical fix to a <a href="http://flowplayer.org/forum/8/18186">wrappper bug</a>
-
-3.1.0
+
+3.1.0
* YUICompressor
- * old flash versions and splash screen
-
+ * old flash versions and splash screen
+
3.0.6
* flashembed 1.0.1 - handles IE A- tag container bug
* unload() method working properly
@@ -28,7 +28,7 @@
3.0.5
* uses flashembed
* fixed a bug where player did not always work when common clip was given as plain string
-
+
3.0.3
* re-installation to same node now removes the previous installation
* getIndex() function
@@ -36,7 +36,7 @@
* href does NOT override playlist, only common clip's url
* onError fixed
* onLoad bug fixes (may cause multiple onCuepoint triggers)
-
+
3.0.2
* millisecond cuepoints
* onMouseOver, onMouseOut
@@ -49,7 +49,7 @@
* onBeforeClick was triggered when player was already loaded (Safari only)
* embedded cuepoints
* close method
-
+
3.0.0
* GPL 3
* onBegin and onBeforeBegin events
@@ -59,13 +59,13 @@
* clip specific onBeforeEvent couldn't stop default behaviour
3.0.0-rc3
- * getConfig API method to the Player object (read only)
+ * getConfig API method to the Player object (read only)
* getFlashParams API method to the Player object
* utility methods: <samp>$f.each, $f.extend</samp> for Plugin developers
-
+
3.0.0-rc1
* show(), hide(), isHidden() methods
* resume method missing
* if player not loaded and core api method is called -> no error is thrown. just silence.
- * made flowplayer(0) function work without wrapper element having an id attribute
+ * made flowplayer(0) function work without wrapper element having an id attribute
diff --git a/typo3/contrib/flowplayer/src/javascript/flowplayer.js/test/index.html b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/test/index.html
similarity index 69%
rename from typo3/contrib/flowplayer/src/javascript/flowplayer.js/test/index.html
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/test/index.html
index 97a6b915a5f8..4e1795cfe7e8 100644
--- a/typo3/contrib/flowplayer/src/javascript/flowplayer.js/test/index.html
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/test/index.html
@@ -1,6 +1,6 @@
-
+
<script src="http://piimaa.info/js/flashembed.js"></script>
-<script src="../flowplayer-src.js"></script>
+<script src="../flowplayer-src.js"></script>
<a id="player"> </a>
@@ -8,15 +8,15 @@
$f("player", "foo", {
onError: function(code, message) {
- console.info(code, message);
+ console.info(code, message);
}
-
+
});
// test errors
setTimeout(function() {
$f.fireEvent("player", "onError", 301, "Unable to load plugin");
$f.fireEvent("player", "onError", "content", 100, "Plugin initialization failed");
- $f.fireEvent("player", "onError", 0, 200, "Stream not found");
-}, 100);
+ $f.fireEvent("player", "onError", 0, 200, "Stream not found");
+}, 100);
</script>
diff --git a/typo3/contrib/flowplayer/src/javascript/flowplayer.js/test/test-player.js b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/test/test-player.js
similarity index 79%
rename from typo3/contrib/flowplayer/src/javascript/flowplayer.js/test/test-player.js
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/test/test-player.js
index e7b4012dafc9..a994816358ba 100644
--- a/typo3/contrib/flowplayer/src/javascript/flowplayer.js/test/test-player.js
+++ b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/flowplayer.js/test/test-player.js
@@ -6,116 +6,116 @@ function TestPlayer(player) {
var playerId = player.id();
// clip information
- var index = 0;
+ var index = 0;
var duration = 25;
var bytesTotal = 3345;
-
+
// status information
var bytesLoaded = 0;
- var state = 1;
- var volume = 50;
+ var state = 1;
+ var volume = 50;
var time = 0;
-
-
+
+
// fire onLoad
- setTimeout(function() {
+ setTimeout(function() {
Flowplayer.fireEvent(playerId, "onLoad");
-
+
// setup buffer loading
- var timer = setInterval(function() {
+ var timer = setInterval(function() {
bytesLoaded += 32;
if (bytesLoaded > bytesTotal) {
bytesLoaded = bytesTotal;
- clearInterval(timer);
- }
+ clearInterval(timer);
+ }
}, 100);
-
+
}, 200);
-
+
this.play = function(clip) {
-
+
console.log(playerId, "play", clip);
- clip = clip || 0;
- index = clip >= 0 ? clip : clip.index;
+ clip = clip || 0;
+ index = clip >= 0 ? clip : clip.index;
state = 2;
-
+
// setup playHead running
var timer = setInterval(function() {
time += 100;
if (time >= (duration * 1000)) {
- clearInterval(timer);
+ clearInterval(timer);
}
-
+
}, 100);
-
-
- setTimeout(function() {
+
+
+ setTimeout(function() {
console.log("metadata fired", index);
Flowplayer.fireEvent(playerId, "onMetaData", index, {duration:duration, bytesTotal: bytesTotal});
- }, 100);
-
+ }, 100);
+
setTimeout(function() {
Flowplayer.fireEvent(playerId, "onPlay", index);
state = 3;
}, 150);
-
- setTimeout(function() {
+
+ setTimeout(function() {
Flowplayer.fireEvent(playerId, "onCuePoint", index, 4);
}, 700);
-
- setTimeout(function() {
+
+ setTimeout(function() {
Flowplayer.fireEvent(playerId, "onFinish", index);
state = 5;
}, duration * 1000);
-
+
};
-
+
this.getVersion = function() {
- return [3,0,0];
+ return [3,0,0];
};
-
-
+
+
this.pause = function() {
console.log(playerId, "pause");
state = 5;
setTimeout(function() {
Flowplayer.fireEvent(playerId, "onPause", index);
- }, 50);
+ }, 50);
};
-
+
this.resume = function() {
console.log(playerId, "resume");
state = 3;
setTimeout(function() {
Flowplayer.fireEvent(playerId, "onResume", index);
- }, 50);
- };
-
+ }, 50);
+ };
+
this.setVolume = function(level) {
volume = level;
setTimeout(function() {
Flowplayer.fireEvent(playerId, "onVolume");
- }, level);
+ }, level);
};
-
-
-
+
+
+
this.status = function() {
return {
state:state,
- time:(time / 1000),
- volume:volume,
+ time:(time / 1000),
+ volume:volume,
bytesLoaded:bytesLoaded
- };
+ };
};
-
+
this.state = function() {
- return -1;
+ return -1;
};
-
-
+
+
this.addCuePoints = function(cuePoints, index) {
console.log(self.getVersion(), "addCuePoints", cuePoints, index || -1);
};
@@ -128,27 +128,26 @@ function TestPlayer(player) {
methods: ['html', 'append', 'setStyle']
}
};
-
+
this.plugin_load = function(name, url, properties) {
return {
top: 40,
left: 113,
opacity: 0.9,
methods: ['load', 'camelize', 'geekalize']
- }
+ }
};
-
+
this.plugin_animate = function(pluginName, props, speed, callbackId) {
console.log("plugin_animate", arguments);
setTimeout(function() { Flowplayer.fireEvent(playerId, "onAnimate", callbackId); }, speed);
};
-
+
this.plugin_invoke = function(pluginName, methodName, args) {
- console.log("plugin_invoke", pluginName, methodName, args);
+ console.log("plugin_invoke", pluginName, methodName, args);
return true;
};
-
-
-}
+
+}
diff --git a/typo3/contrib/flowplayer/src/javascript/swfobject.js b/typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/swfobject.js
similarity index 100%
rename from typo3/contrib/flowplayer/src/javascript/swfobject.js
rename to typo3/sysext/mediace/Resources/Contrib/flowplayer/src/javascript/swfobject.js
diff --git a/typo3/contrib/videojs/video-js/LICENSE.txt b/typo3/sysext/mediace/Resources/Contrib/videojs/video-js/LICENSE.txt
similarity index 100%
rename from typo3/contrib/videojs/video-js/LICENSE.txt
rename to typo3/sysext/mediace/Resources/Contrib/videojs/video-js/LICENSE.txt
diff --git a/typo3/contrib/videojs/video-js/README.markdown b/typo3/sysext/mediace/Resources/Contrib/videojs/video-js/README.markdown
similarity index 99%
rename from typo3/contrib/videojs/video-js/README.markdown
rename to typo3/sysext/mediace/Resources/Contrib/videojs/video-js/README.markdown
index dfe503508430..91df9233bf16 100644
--- a/typo3/contrib/videojs/video-js/README.markdown
+++ b/typo3/sysext/mediace/Resources/Contrib/videojs/video-js/README.markdown
@@ -196,7 +196,7 @@ Changelog
1.1.1 (2010-09-14)
- First Formally Versioned Release
-
+
1.0.0 (2010-05-18)
- First released
diff --git a/typo3/contrib/videojs/video-js/controls/audio-description.js b/typo3/sysext/mediace/Resources/Contrib/videojs/video-js/controls/audio-description.js
similarity index 100%
rename from typo3/contrib/videojs/video-js/controls/audio-description.js
rename to typo3/sysext/mediace/Resources/Contrib/videojs/video-js/controls/audio-description.js
diff --git a/typo3/contrib/videojs/video-js/controls/audio-description.png b/typo3/sysext/mediace/Resources/Contrib/videojs/video-js/controls/audio-description.png
similarity index 100%
rename from typo3/contrib/videojs/video-js/controls/audio-description.png
rename to typo3/sysext/mediace/Resources/Contrib/videojs/video-js/controls/audio-description.png
diff --git a/typo3/contrib/videojs/video-js/controls/captions.js b/typo3/sysext/mediace/Resources/Contrib/videojs/video-js/controls/captions.js
similarity index 99%
rename from typo3/contrib/videojs/video-js/controls/captions.js
rename to typo3/sysext/mediace/Resources/Contrib/videojs/video-js/controls/captions.js
index b82c704f6f93..03066d4f45d0 100644
--- a/typo3/contrib/videojs/video-js/controls/captions.js
+++ b/typo3/sysext/mediace/Resources/Contrib/videojs/video-js/controls/captions.js
@@ -55,5 +55,5 @@ VideoJS.player.extend({
},
hideCaptions: function (event) {
this.subtitlesDisplay.style.visibility = "hidden";
- }
+ }
});
\ No newline at end of file
diff --git a/typo3/contrib/videojs/video-js/controls/captions.png b/typo3/sysext/mediace/Resources/Contrib/videojs/video-js/controls/captions.png
similarity index 100%
rename from typo3/contrib/videojs/video-js/controls/captions.png
rename to typo3/sysext/mediace/Resources/Contrib/videojs/video-js/controls/captions.png
diff --git a/typo3/contrib/videojs/video-js/controls/control-bar.css b/typo3/sysext/mediace/Resources/Contrib/videojs/video-js/controls/control-bar.css
similarity index 96%
rename from typo3/contrib/videojs/video-js/controls/control-bar.css
rename to typo3/sysext/mediace/Resources/Contrib/videojs/video-js/controls/control-bar.css
index abfc66a6a8ed..3d1fc18f128d 100644
--- a/typo3/contrib/videojs/video-js/controls/control-bar.css
+++ b/typo3/sysext/mediace/Resources/Contrib/videojs/video-js/controls/control-bar.css
@@ -1,4 +1,4 @@
-/* Placement of Control Items
+/* Placement of Control Items
- Left side of pogress bar, use left & width
- Rigth side of progress bar, use right & width
- Expand with the video (like progress bar) use left & right */
@@ -12,7 +12,7 @@
/* Sub titles toggle*/
.vjs-captions-control div { cursor: pointer !important; }
.vjs-captions-control div {
- padding: 0; text-align: left; vertical-align: top; cursor: pointer !important;
+ padding: 0; text-align: left; vertical-align: top; cursor: pointer !important;
margin: 5px 0 0 5px; /* Placement within the fullscreen control item */
width: 20px; height: 20px;
}
@@ -20,7 +20,7 @@
/* Audio description toggle*/
.vjs-audio-description-control div { cursor: pointer !important; }
.vjs-audio-description-control div {
- padding: 0; text-align: left; vertical-align: top; cursor: pointer !important;
+ padding: 0; text-align: left; vertical-align: top; cursor: pointer !important;
margin: 5px 0 0 5px; /* Placement within the fullscreen control item */
width: 20px; height: 20px;
}
diff --git a/typo3/contrib/videojs/video-js/controls/control-bar.js b/typo3/sysext/mediace/Resources/Contrib/videojs/video-js/controls/control-bar.js
similarity index 94%
rename from typo3/contrib/videojs/video-js/controls/control-bar.js
rename to typo3/sysext/mediace/Resources/Contrib/videojs/video-js/controls/control-bar.js
index b268b4fbf011..91bbb988bc7e 100644
--- a/typo3/contrib/videojs/video-js/controls/control-bar.js
+++ b/typo3/sysext/mediace/Resources/Contrib/videojs/video-js/controls/control-bar.js
@@ -131,12 +131,12 @@ VideoJS.player.extend({
innerHTML: "<div><span></span><span></span><span></span><span></span></div>"
});
this.controls.appendChild(this.captionsControl);
- // Hide the control if there are no tracks
+ // Hide the control if there are no tracks
var tracks = this.video.getElementsByTagName("TRACK");
if (tracks.length) {
- this.activateElement(this.captionsControl, "captionsToggle");
+ this.activateElement(this.captionsControl, "captionsToggle");
} else {
- this.captionsControl.style.display = "none";
+ this.captionsControl.style.display = "none";
}
// Create the audio description control
@@ -144,15 +144,15 @@ VideoJS.player.extend({
className: "vjs-audio-description-control",
innerHTML: "<div><span></span><span></span><span></span><span></span></div>"
});
- // Look for the audio description associated with this video element
- // We could look for audio with same mediagroup...
+ // Look for the audio description associated with this video element
+ // We could look for audio with same mediagroup...
var id = this.video.id.replace("video_js", "audio_element");
var audioDescription = document.getElementById(id);
if (!!audioDescription) {
this.controls.appendChild(this.audioDescriptionControl);
this.activateElement(this.audioDescriptionControl, "audioDescriptionToggle");
} else {
- this.audioDescriptionControl.style.display = "none";
+ this.audioDescriptionControl.style.display = "none";
}
// Crete the fullscreen control
diff --git a/typo3/contrib/videojs/video-js/demo-subtitles.srt b/typo3/sysext/mediace/Resources/Contrib/videojs/video-js/demo-subtitles.srt
similarity index 98%
rename from typo3/contrib/videojs/video-js/demo-subtitles.srt
rename to typo3/sysext/mediace/Resources/Contrib/videojs/video-js/demo-subtitles.srt
index c86609c3d646..b88f84cc5ddf 100644
--- a/typo3/contrib/videojs/video-js/demo-subtitles.srt
+++ b/typo3/sysext/mediace/Resources/Contrib/videojs/video-js/demo-subtitles.srt
@@ -9,5 +9,3 @@ Heay!!
3
00:00:25,712 --> 00:00:30,399
[Bird noises]
-
-
diff --git a/typo3/contrib/videojs/video-js/demo.html b/typo3/sysext/mediace/Resources/Contrib/videojs/video-js/demo.html
similarity index 99%
rename from typo3/contrib/videojs/video-js/demo.html
rename to typo3/sysext/mediace/Resources/Contrib/videojs/video-js/demo.html
index 0cc81c005130..824dfa3b33b8 100644
--- a/typo3/contrib/videojs/video-js/demo.html
+++ b/typo3/sysext/mediace/Resources/Contrib/videojs/video-js/demo.html
@@ -21,10 +21,10 @@
/*
VideoJS.DOMReady(function(){
-
+
// Using the video's ID or element
var myPlayer = VideoJS.setup("example_video_1");
-
+
// OR using an array of video elements/IDs
// Note: It returns an array of players
var myManyPlayers = VideoJS.setup(["example_video_1", "example_video_2", video3Element]);
@@ -52,7 +52,7 @@
*/
// Or as the second option of VideoJS.setup
-
+
/*
VideoJS.DOMReady(function(){
var myPlayer = VideoJS.setup("example_video_1", {
diff --git a/typo3/contrib/videojs/video-js/skins/hu.css b/typo3/sysext/mediace/Resources/Contrib/videojs/video-js/skins/hu.css
similarity index 100%
rename from typo3/contrib/videojs/video-js/skins/hu.css
rename to typo3/sysext/mediace/Resources/Contrib/videojs/video-js/skins/hu.css
diff --git a/typo3/contrib/videojs/video-js/skins/tube.css b/typo3/sysext/mediace/Resources/Contrib/videojs/video-js/skins/tube.css
similarity index 99%
rename from typo3/contrib/videojs/video-js/skins/tube.css
rename to typo3/sysext/mediace/Resources/Contrib/videojs/video-js/skins/tube.css
index 3c7f01c52483..c7362aef76d7 100644
--- a/typo3/contrib/videojs/video-js/skins/tube.css
+++ b/typo3/sysext/mediace/Resources/Contrib/videojs/video-js/skins/tube.css
@@ -86,7 +86,7 @@ Version 2.0.0
/* Big Play Button (at start)
---------------------------------------------------------*/
-.tube-css div.vjs-big-play-button {
+.tube-css div.vjs-big-play-button {
width: 84px; height: 58px; margin: -29px 0 0 -42px;
border: 2px solid #ccc; opacity: 0.9;
border-radius: 10px; -webkit-border-radius: 10px; -moz-border-radius: 10px;
diff --git a/typo3/contrib/videojs/video-js/skins/vim.css b/typo3/sysext/mediace/Resources/Contrib/videojs/video-js/skins/vim.css
similarity index 100%
rename from typo3/contrib/videojs/video-js/skins/vim.css
rename to typo3/sysext/mediace/Resources/Contrib/videojs/video-js/skins/vim.css
diff --git a/typo3/contrib/videojs/video-js/video-js.css b/typo3/sysext/mediace/Resources/Contrib/videojs/video-js/video-js.css
similarity index 98%
rename from typo3/contrib/videojs/video-js/video-js.css
rename to typo3/sysext/mediace/Resources/Contrib/videojs/video-js/video-js.css
index c9c482371f18..4e9aeac831d6 100644
--- a/typo3/contrib/videojs/video-js/video-js.css
+++ b/typo3/sysext/mediace/Resources/Contrib/videojs/video-js/video-js.css
@@ -1,4 +1,4 @@
-/*
+/*
VideoJS Default Styles (http://videojs.com)
Version 2.0.2
@@ -41,12 +41,12 @@ Using all CSS to draw the controls. Images could be used if desired.
Instead of editing this file, I recommend creating your own skin CSS file to be included after this file,
so you can upgrade to newer versions easier. */
-/* Controls Layout
+/* Controls Layout
Using absolute positioning to position controls */
.video-js-box .vjs-controls {
position: absolute; margin: 0; opacity: 0.85; color: #fff;
display: none; /* Start hidden */
- left: 0; right: 0; /* 100% width of video-js-box */
+ left: 0; right: 0; /* 100% width of video-js-box */
width: 100%;
bottom: 0px; /* Distance from the bottom of the box/video. Keep 0. Use height to add more bottom margin. */
height: 35px; /* Including any margin you want above or below control items */
@@ -59,7 +59,7 @@ so you can upgrade to newer versions easier. */
height: 25px; /* Default height of individual controls */
top: 5px; /* Top margin to put space between video and controls when controls are below */
- /* CSS Background Gradients
+ /* CSS Background Gradients
Using to give the aqua-ish look. */
/* Default */ background-color: #0B151A;
/* Webkit */ background: #1F3744 -webkit-gradient(linear, left top, left bottom, from(#0B151A), to(#1F3744)) left 12px;
@@ -72,7 +72,7 @@ so you can upgrade to newer versions easier. */
box-shadow: 1px 1px 2px #000; -webkit-box-shadow: 1px 1px 2px #000; -moz-box-shadow: 1px 1px 2px #000;
}
-/* Placement of Control Items
+/* Placement of Control Items
- Left side of pogress bar, use left & width
- Rigth side of progress bar, use right & width
- Expand with the video (like progress bar) use left & right */
@@ -87,7 +87,7 @@ so you can upgrade to newer versions easier. */
border-top-right-radius: 0; -webkit-border-top-right-radius: 0; -moz-border-radius-topright: 0;
border-bottom-right-radius: 0; -webkit-border-bottom-right-radius: 0; -moz-border-radius-bottomright: 0;
}
-.vjs-controls > div.vjs-time-control {
+.vjs-controls > div.vjs-time-control {
border-top-left-radius: 0; -webkit-border-top-left-radius: 0; -moz-border-radius-topleft: 0;
border-bottom-left-radius: 0; -webkit-border-bottom-left-radius: 0; -moz-border-radius-bottomleft: 0;
}
@@ -165,7 +165,7 @@ so you can upgrade to newer versions easier. */
-------------------------------------------------------------------------------- */
.vjs-fullscreen-control { cursor: pointer !important; }
.vjs-fullscreen-control div {
- padding: 0; text-align: left; vertical-align: top; cursor: pointer !important;
+ padding: 0; text-align: left; vertical-align: top; cursor: pointer !important;
margin: 5px 0 0 5px; /* Placement within the fullscreen control item */
width: 20px; height: 20px;
}
@@ -197,7 +197,7 @@ div.vjs-big-play-button {
position: absolute; top: 50%; left: 50%; width: 80px; height: 80px; margin: -43px 0 0 -43px; text-align: center; vertical-align: center; cursor: pointer !important;
border: 3px solid #fff; opacity: 0.9;
border-radius: 20px; -webkit-border-radius: 20px; -moz-border-radius: 20px;
-
+
/* CSS Background Gradients */
/* Default */ background-color: #0B151A;
/* Webkit */ background: #1F3744 -webkit-gradient(linear, left top, left bottom, from(#0B151A), to(#1F3744)) left 40px;
diff --git a/typo3/contrib/videojs/video-js/video.js b/typo3/sysext/mediace/Resources/Contrib/videojs/video-js/video.js
similarity index 100%
rename from typo3/contrib/videojs/video-js/video.js
rename to typo3/sysext/mediace/Resources/Contrib/videojs/video-js/video.js
--
GitLab