[!!!][TASK] Remove mediace from the Core 35/41135/15
authorBenjamin Mack <benni@typo3.org>
Thu, 22 Oct 2015 16:47:26 +0000 (18:47 +0200)
committerBenni Mack <benni@typo3.org>
Wed, 28 Oct 2015 22:26:17 +0000 (23:26 +0100)
The EXT:mediace is now available on TER and GitHub
for further development and is removed from the
Core. An upgrade wizard checks the instance for
usage of plugins of ext:mediace. If found an
upgrade wizard is provided that offers to
activate the extension.

Resolves: #68079
Resolves: #71082
Releases: master
Change-Id: I07c15a9b76013e2e5f3db7e3e6469fe48a25270a
Reviewed-on: https://review.typo3.org/41135
Reviewed-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Tested-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
65 files changed:
composer.json
composer.lock
typo3/sysext/core/Documentation/Changelog/master/Important-68079-ExtensionMediaceMovedToTER.rst [new file with mode: 0644]
typo3/sysext/install/Classes/Updates/AbstractDownloadExtensionUpdate.php [new file with mode: 0644]
typo3/sysext/install/Classes/Updates/MediaceExtractionUpdate.php [new file with mode: 0644]
typo3/sysext/install/ext_localconf.php
typo3/sysext/mediace/Classes/ContentObject/FlowPlayerContentObject.php [deleted file]
typo3/sysext/mediace/Classes/ContentObject/MediaContentObject.php [deleted file]
typo3/sysext/mediace/Classes/ContentObject/MultimediaContentObject.php [deleted file]
typo3/sysext/mediace/Classes/ContentObject/QuicktimeObjectContentObject.php [deleted file]
typo3/sysext/mediace/Classes/ContentObject/ShockwaveFlashObjectContentObject.php [deleted file]
typo3/sysext/mediace/Classes/Hooks/PageLayoutView/MultimediaPreviewRenderer.php [deleted file]
typo3/sysext/mediace/Classes/MediaWizard/MediaWizardProvider.php [deleted file]
typo3/sysext/mediace/Classes/MediaWizard/MediaWizardProviderInterface.php [deleted file]
typo3/sysext/mediace/Classes/MediaWizard/MediaWizardProviderManager.php [deleted file]
typo3/sysext/mediace/Configuration/FlexForms/media.xml [deleted file]
typo3/sysext/mediace/Configuration/TCA/Overrides/tt_content.php [deleted file]
typo3/sysext/mediace/Configuration/TypoScript/constants.txt [deleted file]
typo3/sysext/mediace/Configuration/TypoScript/setup.txt [deleted file]
typo3/sysext/mediace/Migrations/Code/ClassAliasMap.php [deleted file]
typo3/sysext/mediace/Migrations/Code/LegacyClassesForIde.php [deleted file]
typo3/sysext/mediace/Resources/Contrib/flashmedia/flvplayer.swf [deleted file]
typo3/sysext/mediace/Resources/Contrib/flashmedia/player.license.txt [deleted file]
typo3/sysext/mediace/Resources/Contrib/flashmedia/player.readme.txt [deleted file]
typo3/sysext/mediace/Resources/Contrib/flashmedia/player.swf [deleted file]
typo3/sysext/mediace/Resources/Contrib/flashmedia/qtobject/qtobject.js [deleted file]
typo3/sysext/mediace/Resources/Contrib/flashmedia/src/doc_core_mediace.sxw [deleted file]
typo3/sysext/mediace/Resources/Contrib/flashmedia/src/flvplayer.as [deleted file]
typo3/sysext/mediace/Resources/Contrib/flashmedia/src/flvplayer.fla [deleted file]
typo3/sysext/mediace/Resources/Contrib/flashmedia/swfobject/expressInstall.swf [deleted file]
typo3/sysext/mediace/Resources/Contrib/flashmedia/swfobject/swfobject.js [deleted file]
typo3/sysext/mediace/Resources/Contrib/flowplayer/LICENSE-exception.txt [deleted file]
typo3/sysext/mediace/Resources/Contrib/flowplayer/LICENSE.txt [deleted file]
typo3/sysext/mediace/Resources/Contrib/flowplayer/LICENSE_COMMERCIAL.txt [deleted file]
typo3/sysext/mediace/Resources/Contrib/flowplayer/LICENSE_MULTIDOMAIN.txt [deleted file]
typo3/sysext/mediace/Resources/Contrib/flowplayer/LICENSE_UNLIMITED.txt [deleted file]
typo3/sysext/mediace/Resources/Contrib/flowplayer/README.txt [deleted file]
typo3/sysext/mediace/Resources/Contrib/flowplayer/express-install/express-install.css [deleted file]
typo3/sysext/mediace/Resources/Contrib/flowplayer/express-install/flashplayerlogo.jpg [deleted file]
typo3/sysext/mediace/Resources/Contrib/flowplayer/expressinstall.swf [deleted file]
typo3/sysext/mediace/Resources/Contrib/flowplayer/flowplayer-3.2.13.min.js [deleted file]
typo3/sysext/mediace/Resources/Contrib/flowplayer/flowplayer-3.2.18.swf [deleted file]
typo3/sysext/mediace/Resources/Contrib/flowplayer/flowplayer.controls-3.2.16.swf [deleted file]
typo3/sysext/mediace/Resources/Contrib/videojs/video-js/LICENSE.txt [deleted file]
typo3/sysext/mediace/Resources/Contrib/videojs/video-js/README.markdown [deleted file]
typo3/sysext/mediace/Resources/Contrib/videojs/video-js/controls/audio-description.js [deleted file]
typo3/sysext/mediace/Resources/Contrib/videojs/video-js/controls/audio-description.png [deleted file]
typo3/sysext/mediace/Resources/Contrib/videojs/video-js/controls/captions.js [deleted file]
typo3/sysext/mediace/Resources/Contrib/videojs/video-js/controls/captions.png [deleted file]
typo3/sysext/mediace/Resources/Contrib/videojs/video-js/controls/control-bar.css [deleted file]
typo3/sysext/mediace/Resources/Contrib/videojs/video-js/controls/control-bar.js [deleted file]
typo3/sysext/mediace/Resources/Contrib/videojs/video-js/demo-subtitles.srt [deleted file]
typo3/sysext/mediace/Resources/Contrib/videojs/video-js/demo.html [deleted file]
typo3/sysext/mediace/Resources/Contrib/videojs/video-js/skins/hu.css [deleted file]
typo3/sysext/mediace/Resources/Contrib/videojs/video-js/skins/tube.css [deleted file]
typo3/sysext/mediace/Resources/Contrib/videojs/video-js/skins/vim.css [deleted file]
typo3/sysext/mediace/Resources/Contrib/videojs/video-js/video-js.css [deleted file]
typo3/sysext/mediace/Resources/Contrib/videojs/video-js/video.js [deleted file]
typo3/sysext/mediace/Resources/Private/Language/locallang.xlf [deleted file]
typo3/sysext/mediace/Tests/Unit/MediaWizard/MediaWizardProviderTest.php [deleted file]
typo3/sysext/mediace/composer.json [deleted file]
typo3/sysext/mediace/ext_emconf.php [deleted file]
typo3/sysext/mediace/ext_icon.gif [deleted file]
typo3/sysext/mediace/ext_localconf.php [deleted file]
typo3/sysext/mediace/ext_tables.sql [deleted file]

index ef86ef8..38d7dd8 100644 (file)
                        "FoT3\\Jumpurl\\Tests\\": "typo3/sysext/jumpurl/Tests/",
                        "TYPO3\\CMS\\Lang\\Tests\\": "typo3/sysext/lang/Tests/",
                        "TYPO3\\CMS\\Lowlevel\\Tests\\": "typo3/sysext/lowlevel/Tests/",
-                       "FoT3\\Mediace\\": "typo3/sysext/mediace/Classes/",
-                       "FoT3\\Mediace\\Tests\\": "typo3/sysext/mediace/Tests/",
                        "TYPO3\\CMS\\Recordlist\\Tests\\": "typo3/sysext/recordlist/Tests/",
                        "TYPO3\\CMS\\Reports\\Tests\\": "typo3/sysext/reports/Tests/",
                        "TYPO3\\CMS\\Rsaauth\\Tests\\": "typo3/sysext/rsaauth/Tests/",
index 5a266fa..509b642 100644 (file)
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "5ddec795d6eef6b9142eac36815546a0",
+    "hash": "9ec4dcb3b06b158e39b165b3236fa0f0",
     "packages": [
         {
             "name": "cogpowered/finediff",
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Important-68079-ExtensionMediaceMovedToTER.rst b/typo3/sysext/core/Documentation/Changelog/master/Important-68079-ExtensionMediaceMovedToTER.rst
new file mode 100644 (file)
index 0000000..ba136bb
--- /dev/null
@@ -0,0 +1,12 @@
+====================================================
+Important: #68079 - Extension "mediace" moved to TER
+====================================================
+
+Description
+===========
+
+The previously available "mediace" extension is moved to the TYPO3 Extension Repository (TER) and managed on
+GitHub (https://github.com/FriendsOfTYPO3/mediace).
+
+An upgrade wizard in the Install Tool will check if the extension is needed. If so, it is downloaded from the TER
+and installed if necessary.
diff --git a/typo3/sysext/install/Classes/Updates/AbstractDownloadExtensionUpdate.php b/typo3/sysext/install/Classes/Updates/AbstractDownloadExtensionUpdate.php
new file mode 100644 (file)
index 0000000..cfa1ebe
--- /dev/null
@@ -0,0 +1,173 @@
+<?php
+namespace TYPO3\CMS\Install\Updates;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+use TYPO3\CMS\Core\Package\PackageManager;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Object\ObjectManager;
+use TYPO3\CMS\Extensionmanager\Utility\Connection\TerUtility;
+use TYPO3\CMS\Extensionmanager\Utility\FileHandlingUtility;
+use TYPO3\CMS\Extensionmanager\Utility\InstallUtility;
+use TYPO3\CMS\Extensionmanager\Utility\ListUtility;
+
+/**
+ * Download extension from TER
+ */
+abstract class AbstractDownloadExtensionUpdate extends AbstractUpdate
+{
+
+    /**
+     * @var string
+     */
+    protected $title = 'Install an Extension from the Extension Repository';
+
+    /**
+     * See subclasses for more information
+     * @var array
+     */
+    protected $extensionDetails = [];
+
+    /**
+     * @var string
+     */
+    protected $repositoryUrl = 'https://typo3.org/fileadmin/ter/@filename';
+
+    /**
+     * This method can be called to install an extension following all proper processes
+     * (e.g. installing in extList, respecting priority, etc.)
+     *
+     * @param string $extensionKey
+     * @param mixed $customMessages
+     * @return bool whether the installation worked or not
+     */
+    protected function installExtension($extensionKey, &$customMessages)
+    {
+        $updateSuccessful = true;
+        /** @var $objectManager ObjectManager */
+        $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
+
+        /** @var $extensionListUtility ListUtility */
+        $extensionListUtility = $objectManager->get(ListUtility::class);
+
+        $availableExtensions = $extensionListUtility->getAvailableExtensions();
+        $availableAndInstalledExtensions = $extensionListUtility->getAvailableAndInstalledExtensions($availableExtensions);
+
+        // Extension is not downloaded yet.
+        if (!is_array($availableAndInstalledExtensions[$extensionKey])) {
+            /** @var $extensionTerUtility TerUtility */
+            $extensionTerUtility = $objectManager->get(TerUtility::class);
+            $extensionDetails = $this->getExtensionDetails($extensionKey);
+            if (empty($extensionDetails)) {
+                $updateSuccessful = false;
+                $customMessages .= 'No version information for extension ' . $extensionKey . ' found. Can not install the extension.';
+            }
+            $t3xContent = $this->fetchExtension($extensionKey, $extensionDetails['versionString']);
+            if (empty($t3xContent)) {
+                $updateSuccessful = false;
+                $customMessages .= 'The extension ' . $extensionKey . ' could not be downloaded.';
+            }
+            $t3xExtracted = $extensionTerUtility->decodeExchangeData($t3xContent);
+            if (empty($t3xExtracted) || !is_array($t3xExtracted) || empty($t3xExtracted['extKey'])) {
+                $updateSuccessful = false;
+                $customMessages .= 'The extension ' . $extensionKey . ' could not be extracted.';
+            }
+
+            /** @var $extensionFileHandlingUtility FileHandlingUtility */
+            $extensionFileHandlingUtility = $objectManager->get(FileHandlingUtility::class);
+            $extensionFileHandlingUtility->unpackExtensionFromExtensionDataArray($t3xExtracted);
+
+            // the list utility now needs to have the regenerated list of packages
+            /** @var PackageManager $packageManager */
+            $packageManager = $objectManager->get(PackageManager::class);
+            $packageManager->scanAvailablePackages();
+            $extensionListUtility->reloadAvailableExtensions();
+        }
+
+        if ($updateSuccessful !== false) {
+            /** @var $extensionInstallUtility InstallUtility */
+            $extensionInstallUtility = $objectManager->get(InstallUtility::class);
+            $extensionInstallUtility->install($extensionKey);
+        }
+        return $updateSuccessful;
+    }
+
+    /**
+     * Returns the details of a local or external extension
+     *
+     * @param string $extensionKey Key of the extension to check
+     *
+     * @return array Extension details
+     */
+    protected function getExtensionDetails($extensionKey)
+    {
+        if (array_key_exists($extensionKey, $this->extensionDetails)) {
+            return $this->extensionDetails[$extensionKey];
+        }
+
+        return [];
+    }
+
+    /**
+     * Fetch extension from repository
+     *
+     * @param string $extensionKey The extension key to fetch
+     * @param string $version The version to fetch
+     *
+     * @throws \InvalidArgumentException
+     * @return string T3X file content
+     */
+    protected function fetchExtension($extensionKey, $version)
+    {
+        if (empty($extensionKey) || empty($version)) {
+            throw new \InvalidArgumentException('No extension key for fetching an extension was given.',
+                1344687432);
+        }
+
+        $filename = $extensionKey[0] . '/' . $extensionKey[1] . '/' . $extensionKey . '_' . $version . '.t3x';
+        $url = str_replace('@filename', $filename, $this->repositoryUrl);
+
+        return $this->fetchUrl($url);
+    }
+
+    /**
+     * Open an URL and return the response
+     *
+     * This wrapper method is required to try several download methods if
+     * the configuration is not valid or initially written by the installer.
+     *
+     * @param string $url The URL to file
+     *
+     * @throws \Exception
+     * @throws \InvalidArgumentException
+     * @return string File content
+     */
+    protected function fetchUrl($url)
+    {
+        if (empty($url)) {
+            throw new \InvalidArgumentException('No URL for downloading an extension given.',
+                1344687436);
+        }
+
+        $fileContent = GeneralUtility::getUrl($url, 0, array(TYPO3_user_agent));
+
+        // Can not fetch url, throw an exception
+        if ($fileContent === false) {
+            throw new \RuntimeException('Can not fetch URL "' . $url . '". Possible reasons are network problems or misconfiguration.',
+                1344685036);
+        }
+
+        return $fileContent;
+    }
+}
diff --git a/typo3/sysext/install/Classes/Updates/MediaceExtractionUpdate.php b/typo3/sysext/install/Classes/Updates/MediaceExtractionUpdate.php
new file mode 100644 (file)
index 0000000..3f2bf36
--- /dev/null
@@ -0,0 +1,90 @@
+<?php
+namespace TYPO3\CMS\Install\Updates;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+
+/**
+ * Installs and downloads EXT:mediace if needed
+ */
+class MediaceExtractionUpdate extends AbstractDownloadExtensionUpdate
+{
+    /**
+     * @var string
+     */
+    protected $title = 'Installs extension "mediace" from TER if media elements are used.';
+
+    /**
+     * @var string
+     */
+    protected $extensionKey = 'mediace';
+
+    /**
+     * @var array
+     */
+    protected $extensionDetails = [
+        'mediace' => [
+            'title' => 'Media Content Element',
+            'description' => 'The media functionality from TYPO3 6.2 and earlier can be found here. This extension provides ContentObjects and Content Elements.',
+            'versionString' => '7.6.0',
+        ]
+    ];
+
+    /**
+     * Checks if an update is needed
+     *
+     * @param string &$description The description for the update
+     * @return bool Whether an update is needed (TRUE) or not (FALSE)
+     */
+    public function checkForUpdate(&$description)
+    {
+        $updateNeeded = true;
+
+        if ($this->isWizardDone() || ExtensionManagementUtility::isLoaded('mediace')) {
+            $updateNeeded = false;
+        } else {
+            $amountOfMediaElements = $this->getDatabaseConnection()->exec_SELECTcountRows(
+                'uid',
+                'tt_content',
+                'CType IN (\'media\', \'multimedia\') AND deleted=0'
+            );
+
+            if ($amountOfMediaElements === 0) {
+                $updateNeeded = false;
+            }
+        }
+
+        $description = 'The extension "mediace" (Media Content Element) was extracted into the TYPO3 Extension Repository. ' .
+            'This update checks if media content elements are used and downloads the TYPO3 Extension from the TER.';
+
+        return $updateNeeded;
+    }
+
+    /**
+     * Performs the database update if media CTypes are available.
+     *
+     * @param array &$databaseQueries Queries done in this update
+     * @param mixed &$customMessages Custom messages
+     * @return bool
+     */
+    public function performUpdate(array &$databaseQueries, &$customMessages)
+    {
+        $updateSuccessful = $this->installExtension($this->extensionKey, $customMessages);
+        if ($updateSuccessful) {
+            $this->markWizardAsDone();
+        }
+        return true;
+    }
+}
index e207695..09c2a5a 100644 (file)
@@ -14,6 +14,7 @@ $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update'][\TYPO3\CMS\In
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update']['textmediaCType'] = \TYPO3\CMS\Install\Updates\ContentTypesToTextMediaUpdate::class;
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update'][\TYPO3\CMS\Install\Updates\WorkspacesNotificationSettingsUpdate::class] = \TYPO3\CMS\Install\Updates\WorkspacesNotificationSettingsUpdate::class;
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update']['textmediaAssets'] = \TYPO3\CMS\Install\Updates\MigrateMediaToAssetsForTextMediaCe::class;
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update']['mediaceExtension'] = \TYPO3\CMS\Install\Updates\MediaceExtractionUpdate::class;
 
 $signalSlotDispatcher = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\SignalSlot\Dispatcher::class);
 $signalSlotDispatcher->connect(
diff --git a/typo3/sysext/mediace/Classes/ContentObject/FlowPlayerContentObject.php b/typo3/sysext/mediace/Classes/ContentObject/FlowPlayerContentObject.php
deleted file mode 100644 (file)
index 8f3a7fc..0000000
+++ /dev/null
@@ -1,740 +0,0 @@
-<?php
-namespace FoT3\Mediace\ContentObject;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-use TYPO3\CMS\Core\Utility\ArrayUtility;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Utility\StringUtility;
-
-/**
- * Contains FlowPlayer class object.
- */
-class FlowPlayerContentObject extends \TYPO3\CMS\Frontend\ContentObject\AbstractContentObject
-{
-    /**
-     * File extension to mime type
-     *
-     * @var array
-     */
-    public $mimeTypes = array(
-        'aif' => array(
-            'audio' => 'audio/aiff'
-        ),
-        'au' => array(
-            'audio' => 'audio/x-au'
-        ),
-        'asf' => array(
-            'video' => 'video/x-ms-asf'
-        ),
-        'avi' => array(
-            'audio' => 'video/x-msvideo'
-        ),
-        'class' => array(
-            'audio' => 'application/java',
-            'video' => 'application/java'
-        ),
-        'dcr' => array(
-            'video' => 'application/x-director'
-        ),
-        'flac' => array(
-            'audio' => 'audio/flac'
-        ),
-        'flv' => array(
-            'video' => 'video/x-flv'
-        ),
-        'm4a' => array(
-            'audio' => 'audio/mp4a-latm'
-        ),
-        'm4v' => array(
-            'video' => 'video/x-m4v'
-        ),
-        'mov' => array(
-            'video' => 'video/quicktime'
-        ),
-        'mp3' => array(
-            'audio' => 'audio/mpeg'
-        ),
-        'mp4' => array(
-            'video' => 'video/mp4'
-        ),
-        'oga' => array(
-            'audio' => 'audio/ogg'
-        ),
-        'ogg' => array(
-            'audio' => 'audio/ogg',
-            'video' => 'video/ogg'
-        ),
-        'ogv' => array(
-            'video' => 'video/ogg'
-        ),
-        'qt' => array(
-            'video' => 'video/quicktime'
-        ),
-        'swa' => array(
-            'audio' => 'application/x-director'
-        ),
-        'swf' => array(
-            'audio' => 'application/x-shockwave-flash',
-            'video' => 'application/x-shockwave-flash'
-        ),
-        'wav' => array(
-            'audio' => 'audio/wave'
-        ),
-        'webm' => array(
-            'audio' => 'audio/webm',
-            'video' => 'video/webm'
-        ),
-        'wmv' => array(
-            'audio' => 'audio/x-ms-wmv'
-        )
-    );
-
-    /**
-     * VideoJS options
-     *
-     * @var array
-     */
-    public $videoJsOptions = array(
-        // Use the browser's controls (iPhone)
-        'useBuiltInControls',
-        // Display control bar below video vs. in front of
-        'controlsBelow',
-        // Make controls visible when page loads
-        'controlsAtStart',
-        // Hide controls when not over the video
-        'controlsHiding',
-        // Will be overridden by localStorage volume if available
-        'defaultVolume',
-        // Players and order to use them
-        'playerFallbackOrder'
-    );
-
-    /**
-     * html5 tag attributes
-     *
-     * @var array
-     */
-    public $html5TagAttributes = array(
-        'autoPlay',
-        'controls',
-        'loop',
-        'preload'
-    );
-
-    /**
-     * Flowplayer captions plugin configuration
-     *
-     * @var array
-     */
-    public $flowplayerCaptionsConfig = array(
-        'plugins' => array(
-            // The captions plugin
-            'captions' => array(
-                'url' => 'plugins/flowplayer.captions-3.2.10.swf',
-                // Pointer to a content plugin (see below)
-                'captionTarget' => 'content'
-            ),
-            // Configure a content plugin so that it looks good for showing captions
-            'content' => array(
-                'url' => 'plugins/flowplayer.content-3.2.9.swf',
-                'bottom' => 5,
-                'height' => 40,
-                'backgroundColor' => 'transparent',
-                'backgroundGradient' => 'none',
-                'border' => 0,
-                'textDecoration' => 'outline',
-                'style' => array(
-                    'body' => array(
-                        'fontSize' => 14,
-                        'fontFamily' => 'Arial',
-                        'textAlign' => 'center',
-                        'color' => '#ffffff'
-                    )
-                )
-            )
-        )
-    );
-
-    /**
-     * Flowplayer audio configuration
-     *
-     * @var array
-     */
-    public $flowplayerAudioConfig = array(
-        'provider' => 'audio',
-        'plugins' => array(
-            'audio' => array(
-                'url' => 'plugins/flowplayer.audio-3.2.11.swf'
-            ),
-            'controls' => array(
-                'autoHide' => false,
-                'fullscreen' => false
-            )
-        )
-    );
-
-    /**
-     * Flowplayer configuration for the audio description
-     *
-     * @var array
-     */
-    public $flowplayerAudioDescriptionConfig = array(
-        // The controls plugin
-        'plugins' => array(
-            'controls' => null
-        )
-    );
-
-    /**
-     * Rendering the cObject, SWFOBJECT
-     *
-     * @param array $conf Array of TypoScript properties
-     * @return string Output
-     */
-    public function render($conf = array())
-    {
-        $params = ($prefix = '');
-        if ($GLOBALS['TSFE']->baseUrl) {
-            $prefix = $GLOBALS['TSFE']->baseUrl;
-        }
-        if ($GLOBALS['TSFE']->absRefPrefix) {
-            $prefix = $GLOBALS['TSFE']->absRefPrefix;
-        }
-        // Initialize content
-        $replaceElementIdString = StringUtility::getUniqueId('mmswf');
-        $GLOBALS['TSFE']->register['MMSWFID'] = $replaceElementIdString;
-        $layout = isset($conf['layout.']) ? $this->cObj->stdWrap($conf['layout'], $conf['layout.']) : $conf['layout'];
-        $content = str_replace('###ID###', $replaceElementIdString, $layout);
-        $type = isset($conf['type.']) ? $this->cObj->stdWrap($conf['type'], $conf['type.']) : $conf['type'];
-        $typeConf = $conf[$type . '.'];
-        // Add Flowplayer js-file
-        $this->getPageRenderer()->addJsFile($this->getPathToLibrary('flowplayer/flowplayer-3.2.13.min.js'));
-        // Add Flowpayer css for express install
-        $this->getPageRenderer()->addCssFile($this->getPathToLibrary('flowplayer/express-install/express-install.css'));
-        // Add videoJS js-file
-        $this->getPageRenderer()->addJsFile($this->getPathToLibrary('videojs/video-js/video.js'));
-        // Add videoJS css-file
-        $this->getPageRenderer()->addCssFile($this->getPathToLibrary('videojs/video-js/video-js.css'));
-        // Add extended videoJS control bar
-        $this->getPageRenderer()->addJsFile($this->getPathToLibrary('videojs/video-js/controls/control-bar.js'));
-        $this->getPageRenderer()->addCssFile($this->getPathToLibrary('videojs/video-js/controls/control-bar.css'));
-        // Build Flash configuration
-        $player = isset($typeConf['player.']) ? $this->cObj->stdWrap($typeConf['player'], $typeConf['player.']) : $typeConf['player'];
-        if (!$player) {
-            $player = $prefix . $this->getPathToLibrary('flowplayer/flowplayer-3.2.18.swf');
-        } elseif (strpos($player, 'EXT:') === 0) {
-            $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) {
-            $flashVersion = array(9, 115);
-        }
-        $flashConfiguration = array(
-            // Flowplayer component
-            'src' => $player,
-            // Express install url
-            'expressInstall' => $installUrl,
-            // Require at least this Flash version
-            'version' => $flashVersion,
-            // Older versions will see a message
-            'onFail' => '###ONFAIL###'
-        );
-        $flashDownloadUrl = 'http://www.adobe.com/go/getflashplayer';
-        $onFail = 'function()  {
-                       if (!(flashembed.getVersion()[0] > 0)) {
-                               var message = "<p>" + "' . $GLOBALS['TSFE']->sL('LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.needFlashPlugin') . '" + "</p>" + "<p>" + "<a href=\\"' . $flashDownloadUrl . '\\">' . $GLOBALS['TSFE']->sL('LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.downloadFlash') . '</a>" + "</p>";
-                               document.getElementById("' . $replaceElementIdString . '_flash_install_info").innerHTML = "<div class=\\"message\\">" + message + "</div>";
-                       }
-               }';
-        $flashConfiguration = json_encode($flashConfiguration);
-        $flashConfiguration = str_replace('"###ONFAIL###"', $onFail, $flashConfiguration);
-        $filename = isset($conf['file.']) ? $this->cObj->stdWrap($conf['file'], $conf['file.']) : $conf['file'];
-        if ($filename) {
-            if (strpos($filename, '://') !== false) {
-                $conf['flashvars.']['url'] = $filename;
-            } else {
-                if ($prefix) {
-                    $conf['flashvars.']['url'] = $prefix . $filename;
-                } else {
-                    $conf['flashvars.']['url'] = str_repeat('../', substr_count($player, '/')) . $filename;
-                }
-            }
-        }
-        if (is_array($conf['sources'])) {
-            foreach ($conf['sources'] as $key => $source) {
-                if (strpos($source, '://') === false) {
-                    $conf['sources'][$key] = $prefix . $source;
-                }
-            }
-        }
-        if (is_array($conf['audioSources'])) {
-            foreach ($conf['audioSources'] as $key => $source) {
-                if (strpos($source, '://') === false) {
-                    $conf['audioSources'][$key] = $prefix . $source;
-                }
-            }
-        }
-        if (isset($conf['audioFallback']) && strpos($conf['audioFallback'], '://') === false) {
-            $conf['audioFallback'] = $prefix . $conf['audioFallback'];
-        }
-        if (isset($conf['caption']) && strpos($conf['caption'], '://') === false) {
-            $conf['caption'] = $prefix . $conf['caption'];
-        }
-        // Write calculated values in conf for the hook
-        $conf['player'] = $player ?: $filename;
-        $conf['installUrl'] = $installUrl;
-        $conf['filename'] = $conf['flashvars.']['url'];
-        $conf['prefix'] = $prefix;
-        // merge with default parameters
-        $conf['flashvars.'] = array_merge((array)$typeConf['default.']['flashvars.'], (array)$conf['flashvars.']);
-        $conf['params.'] = array_merge((array)$typeConf['default.']['params.'], (array)$conf['params.']);
-        $conf['attributes.'] = array_merge((array)$typeConf['default.']['attributes.'], (array)$conf['attributes.']);
-        $conf['embedParams'] = 'flashvars, params, attributes';
-        // Hook for manipulating the conf array, it's needed for some players like flowplayer
-        if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/hooks/class.tx_cms_mediaitems.php']['swfParamTransform'])) {
-            foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/hooks/class.tx_cms_mediaitems.php']['swfParamTransform'] as $classRef) {
-                GeneralUtility::callUserFunction($classRef, $conf, $this);
-            }
-        }
-        // Flowplayer config
-        $flowplayerVideoConfig = array();
-        $flowplayerAudioConfig = array();
-        if (is_array($conf['flashvars.']) && is_array($typeConf['mapping.']['flashvars.'])) {
-            ArrayUtility::remapArrayKeys($conf['flashvars.'], $typeConf['mapping.']['flashvars.']);
-        } else {
-            $conf['flashvars.'] = array();
-        }
-        $conf['videoflashvars'] = $conf['flashvars.'];
-        $conf['audioflashvars'] = $conf['flashvars.'];
-        $conf['audioflashvars']['url'] = $conf['audioFallback'];
-        // Render video sources
-        $videoSources = '';
-        if (is_array($conf['sources'])) {
-            foreach ($conf['sources'] as $source) {
-                $fileinfo = GeneralUtility::split_fileref($source);
-                $mimeType = $this->mimeTypes[$fileinfo['fileext']]['video'];
-                $videoSources .= '<source src="' . $source . '"' . ($mimeType ? ' type="' . $mimeType . '"' : '') . ' />' . LF;
-            }
-        }
-        // Render audio sources
-        $audioSources = '';
-        if (is_array($conf['audioSources'])) {
-            foreach ($conf['audioSources'] as $source) {
-                $fileinfo = GeneralUtility::split_fileref($source);
-                $mimeType = $this->mimeTypes[$fileinfo['fileext']]['audio'];
-                $audioSources .= '<source src="' . $source . '"' . ($mimeType ? ' type="' . $mimeType . '"' : '') . ' />' . LF;
-            }
-        }
-        // Configure captions
-        if ($conf['type'] === 'video' && isset($conf['caption'])) {
-            // Assemble captions track tag
-            $videoCaptions = '<track id="' . $replaceElementIdString . '_captions_track" kind="captions" src="' . $conf['caption'] . '" default>' . LF;
-            // Add videoJS extension for captions
-            $this->getPageRenderer()->addJsFile($this->getPathToLibrary('videojs/video-js/controls/captions.js'));
-            // Flowplayer captions
-            $conf['videoflashvars']['captionUrl'] = $conf['caption'];
-            // Flowplayer captions plugin configuration
-            $flowplayerVideoConfig = array_merge_recursive($flowplayerVideoConfig, $this->flowplayerCaptionsConfig);
-        }
-        // Configure flowplayer audio fallback
-        if (isset($conf['audioFallback'])) {
-            $flowplayerAudioConfig = array_merge_recursive($flowplayerAudioConfig, $this->flowplayerAudioConfig);
-        }
-        // Configure audio description
-        if ($conf['type'] == 'video') {
-            if (is_array($conf['audioSources']) && !empty($conf['audioSources'])) {
-                // Add videoJS audio description toggle
-                $this->getPageRenderer()->addJsFile($this->getPathToLibrary('videojs/video-js/controls/audio-description.js'));
-            }
-            if (isset($conf['audioFallback'])) {
-                // Audio description flowplayer config (remove controls)
-                $flowplayerAudioConfig = array_merge_recursive($flowplayerAudioConfig, $this->flowplayerAudioDescriptionConfig);
-            }
-        }
-        // Assemble Flowplayer configuration
-        if (!empty($conf['videoflashvars'])) {
-            $flowplayerVideoConfig = array_merge_recursive($flowplayerVideoConfig, array('clip' => $conf['videoflashvars']));
-        }
-        $flowplayerVideoJsonConfig = str_replace(array('"true"', '"false"'), array('true', 'false'), json_encode($flowplayerVideoConfig));
-        if (!empty($conf['audioflashvars'])) {
-            $flowplayerAudioConfig = array_merge_recursive($flowplayerAudioConfig, array('clip' => $conf['audioflashvars']));
-        }
-        $flowplayerAudioJsonConfig = str_replace(array('"true"', '"false"'), array('true', 'false'), json_encode($flowplayerAudioConfig));
-        // Assemble param tags (required?)
-        if (is_array($conf['params.']) && is_array($typeConf['mapping.']['params.'])) {
-            ArrayUtility::remapArrayKeys($conf['params.'], $typeConf['mapping.']['params.']);
-        }
-        $videoFlashParams = '';
-        if (is_array($conf['params.'])) {
-            foreach ($conf['params.'] as $name => $value) {
-                $videoFlashParams .= '<param name="' . $name . '" value="' . $value . '" />' . LF;
-            }
-        }
-        $audioFlashParams = $videoFlashParams;
-        // Required param tags
-        $videoFlashParams .= '<param name="movie" value="' . $player . '" />' . LF;
-        $videoFlashParams .= '<param name="flashvars" value=\'config=' . $flowplayerVideoJsonConfig . '\' />' . LF;
-        $audioFlashParams .= '<param name="movie" value="' . $player . '" />' . LF;
-        $audioFlashParams .= '<param name="flashvars" value=\'config=' . $flowplayerAudioJsonConfig . '\' />' . LF;
-        // Assemble audio/video tag attributes
-        $attributes = '';
-        if (is_array($conf['attributes.']) && is_array($typeConf['attributes.']['params.'])) {
-            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) . '" ';
-            }
-        }
-        // Media dimensions
-        $width = isset($conf['width.']) ? $this->cObj->stdWrap($conf['width'], $conf['width.']) : $conf['width'];
-        if (!$width) {
-            $width = $conf[$type . '.']['defaultWidth'];
-        }
-        $height = isset($conf['height.']) ? $this->cObj->stdWrap($conf['height'], $conf['height.']) : $conf['height'];
-        if (!$height) {
-            $height = $conf[$type . '.']['defaultHeight'];
-        }
-        // Alternate content
-        $alternativeContent = isset($conf['alternativeContent.']) ? $this->cObj->stdWrap($conf['alternativeContent'], $conf['alternativeContent.']) : $conf['alternativeContent'];
-        // Render video
-        if ($conf['type'] === 'video') {
-            // add preview image, html5 poster attribute
-            $sourceBasePath = substr($conf['sources'][1], 0, strrpos($conf['sources'][1], '.'));
-            foreach (['.jpg', '.jpeg', '.png'] as $fileExtension) {
-                $posterFilePath = $GLOBALS['TSFE']->tmpl->getFileName($sourceBasePath . $fileExtension);
-                if (file_exists($posterFilePath)) {
-                    $attributes .= ' poster="' . htmlspecialchars($posterFilePath) . '"';
-                    break;
-                }
-            }
-
-            if ($conf['preferFlashOverHtml5']) {
-                // Flash with video tag fallback
-                $conf['params.']['playerFallbackOrder'] = array('flash', 'html5');
-                $flashDivContent = $videoFlashParams . LF . '<video id="' . $replaceElementIdString . '_video_js" class="video-js" ' . $attributes . 'controls="controls"  mediagroup="' . $replaceElementIdString . '" width="' . $width . '" height="' . $height . '">' . LF . $videoSources . $videoCaptions . $alternativeContent . LF . '</video>' . LF;
-                $divContent = '
-                                       <div id="' . $replaceElementIdString . '_flash_install_info" class="flash-install-info"></div>' . LF . '<noscript>' . LF . '<object id="' . $replaceElementIdString . '_vjs_flash" type="application/x-shockwave-flash" data="' . $player . '" width="' . $width . '" height="' . $height . '">' . LF . $flashDivContent . '</object>' . LF . '</noscript>' . LF;
-                $content = str_replace('###SWFOBJECT###', '<div id="' . $replaceElementIdString . '_video" class="flashcontainer" style="width:' . $width . 'px; height:' . $height . 'px;">' . LF . $divContent . '</div>', $content);
-            } else {
-                // Video tag with Flash fallback
-                $conf['params.']['playerFallbackOrder'] = array('html5', 'flash');
-                $videoTagContent = $videoSources . $videoCaptions;
-                if (isset($conf['videoflashvars']['url'])) {
-                    $videoTagContent .= '
-                                               <noscript>' . LF . '<object class="vjs-flash-fallback" id="' . $replaceElementIdString . '_vjs_flash_fallback" type="application/x-shockwave-flash" data="' . $player . '" width="' . $width . '" height="' . $height . '">' . LF . $videoFlashParams . LF . $alternativeContent . LF . '</object>' . LF . '</noscript>';
-                }
-                $divContent = '
-                                       <div id="' . $replaceElementIdString . '_flash_install_info" class="flash-install-info"></div>' . LF . '<video id="' . $replaceElementIdString . '_video_js" class="video-js" ' . $attributes . 'controls="controls" mediagroup="' . $replaceElementIdString . '" width="' . $width . '" height="' . $height . '">' . LF . $videoTagContent . '</video>';
-                $content = str_replace('###SWFOBJECT###', '<div id="' . $replaceElementIdString . '_video" class="video-js-box" style="width:' . $width . 'px; height:' . $height . 'px;">' . LF . $divContent . '</div>', $content);
-            }
-        }
-        // Render audio
-        if ($conf['type'] === 'audio' || $audioSources || isset($conf['audioFallback'])) {
-            if ($conf['preferFlashOverHtml5']) {
-                // Flash with audio tag fallback
-                $flashDivContent = $audioFlashParams . LF . '<audio id="' . $replaceElementIdString . '_audio_element"' . $attributes . ($conf['type'] === 'video' ? ' mediagroup="' . $replaceElementIdString . 'style="position:absolute;left:-10000px;"' : ' controls="controls"') . ' style="width:' . $width . 'px; height:' . $height . 'px;">' . LF . $audioSources . $alternativeContent . LF . '</audio>' . LF;
-                $divContent = ($conf['type'] === 'video' ? '' : '<div id="' . $replaceElementIdString . '_flash_install_info" class="flash-install-info"></div>' . LF) . '<noscript>' . LF . '<object id="' . $replaceElementIdString . '_audio_flash" type="application/x-shockwave-flash" data="' . $player . '" width="' . ($conf['type'] === 'video' ? 0 : $width) . '" height="' . ($conf['type'] === 'video' ? 0 : $height) . '">' . LF . $flashDivContent . '</object>' . LF . '</noscript>' . LF;
-                $audioContent = '<div id="' . $replaceElementIdString . '_audio_box" class="audio-flash-container" style="width:' . ($conf['type'] === 'video' ? 0 : $width) . 'px; height:' . ($conf['type'] === 'video' ? 0 : $height) . 'px;">' . LF . $divContent . '</div>';
-            } else {
-                // Audio tag with Flash fallback
-                $audioTagContent = $audioSources;
-                if (isset($conf['audioflashvars']['url'])) {
-                    $audioTagContent .= '
-                                               <noscript>' . LF . '<object class="audio-flash-fallback" id="' . $replaceElementIdString . '_audio_flash" type="application/x-shockwave-flash" data="' . $player . '" width="' . $width . '" height="' . $height . '">' . LF . $audioFlashParams . LF . $alternativeContent . LF . '</object>' . LF . '</noscript>';
-                }
-                $divContent = ($conf['type'] === 'video' ? '' : '<div id="' . $replaceElementIdString . '_flash_install_info" class="flash-install-info"></div>' . LF) . '<audio id="' . $replaceElementIdString . '_audio_element" class="audio-element"' . $attributes . ($conf['type'] === 'video' ? ' mediagroup="' . $replaceElementIdString . '" style="position:absolute;left:-10000px;"' : ' controls="controls"') . '>' . LF . $audioTagContent . '</audio>' . LF . $audioSourcesEmbeddingJsScript;
-                $audioContent = '<div id="' . $replaceElementIdString . '_audio_box" class="audio-box" style="width:' . ($conf['type'] === 'video' ? 0 : $width) . 'px; height:' . ($conf['type'] === 'video' ? 0 : $height) . 'px;">' . LF . $divContent . '</div>';
-            }
-            if ($conf['type'] === 'audio') {
-                $content = str_replace('###SWFOBJECT###', $audioContent, $content);
-            } else {
-                $content .= LF . $audioContent;
-            }
-        }
-        // Assemble inline JS code
-        $videoJsSetup = '';
-        $flowplayerHandlers = '';
-        if ($conf['type'] === 'video') {
-            // Assemble videoJS options
-            $videoJsOptions = array();
-            foreach ($this->videoJsOptions as $videoJsOption) {
-                if (isset($conf['params.'][$videoJsOption])) {
-                    $videoJsOptions[$videoJsOption] = $conf['params.'][$videoJsOption];
-                }
-            }
-            $videoJsOptions = !empty($videoJsOptions) ? json_encode($videoJsOptions) : '{}';
-            // videoJS setup and videoJS listeners for audio description synchronisation
-            if ($audioSources || isset($conf['audioFallback'])) {
-                $videoJsSetup = '
-                       var ' . $replaceElementIdString . '_video = VideoJS.setup("' . $replaceElementIdString . '_video_js", ' . $videoJsOptions . ');
-                       var ' . $replaceElementIdString . '_video_element = document.getElementById("' . $replaceElementIdString . '_video_js");
-                       var ' . $replaceElementIdString . '_audio_element = document.getElementById("' . $replaceElementIdString . '_audio_element");
-                       if (!!' . $replaceElementIdString . '_video_element && !!' . $replaceElementIdString . '_audio_element) {
-                               ' . $replaceElementIdString . '_audio_element.muted = true;
-                               VideoJS.addListener(' . $replaceElementIdString . '_video_element, "pause", function () { document.getElementById("' . $replaceElementIdString . '_audio_element").pause(); });
-                               VideoJS.addListener(' . $replaceElementIdString . '_video_element, "play", function () { try {document.getElementById("' . $replaceElementIdString . '_audio_element").currentTime = document.getElementById("' . $replaceElementIdString . '_video_js").currentTime} catch(e) {}; document.getElementById("' . $replaceElementIdString . '_audio_element").play(); });
-                               VideoJS.addListener(' . $replaceElementIdString . '_video_element, "seeked", function () { document.getElementById("' . $replaceElementIdString . '_audio_element").currentTime = document.getElementById("' . $replaceElementIdString . '_video_js").currentTime; });
-                               VideoJS.addListener(' . $replaceElementIdString . '_video_element, "volumechange", function () { document.getElementById("' . $replaceElementIdString . '_audio_element").volume = document.getElementById("' . $replaceElementIdString . '_video_js").volume; });
-                       }';
-            } else {
-                $videoJsSetup = '
-                       var ' . $replaceElementIdString . '_video = VideoJS.setup("' . $replaceElementIdString . '_video_js", ' . $videoJsOptions . ');
-                       ';
-            }
-            // Prefer Flash or fallback to Flash
-            $videoSourcesEmbedding = '';
-            // If we have a video file for Flash
-            if (isset($conf['filename'])) {
-                // If we prefer Flash
-                if ($conf['preferFlashOverHtml5']) {
-                    $videoTagAssembly = '';
-                    // Create "source" elements
-                    if (is_array($conf['sources']) && !empty($conf['sources'])) {
-                        foreach ($conf['sources'] as $source) {
-                            $fileinfo = GeneralUtility::split_fileref($source);
-                            $mimeType = $this->mimeTypes[$fileinfo['fileext']]['video'];
-                            $videoTagAssembly .= '
-                       ' . $replaceElementIdString . '_video_js.appendChild($f.extend(document.createElement("source"), {
-                               src: "' . $source . '",
-                               type: "' . $mimeType . '"
-                       }));';
-                        }
-                        // Create "track" elements
-                        if (isset($conf['caption'])) {
-                            // Assemble captions track tag
-                            // It will take a while before the captions are loaded and parsed...
-                            $videoTagAssembly .= '
-                       var track  = document.createElement("track");
-                       track.setAttribute("src", "' . $conf['caption'] . '");
-                       track.setAttribute("id", "' . $replaceElementIdString . '_captions_track");
-                       track.setAttribute("kind", "captions");
-                       track.setAttribute("default", "default");
-                       ' . $replaceElementIdString . '_video_js.appendChild(track);';
-                        }
-                        $videoTagAssembly .= '
-                       $f.extend(' . $replaceElementIdString . '_video_js, {
-                               id: "' . $replaceElementIdString . '_video_js",
-                               className: "video-js",
-                               controls: "controls",
-                               mediagroup: "' . $replaceElementIdString . '",
-                               preload: "none",
-                               width: "' . $width . '",
-                               height: "' . $height . '"
-                       });
-                       ' . $replaceElementIdString . '_video.appendChild(' . $replaceElementIdString . '_video_js);
-                       ' . $replaceElementIdString . '_video.className = "video-js-box";';
-                        $videoTagAssembly .= $videoJsSetup;
-                    }
-                    $videoSourcesEmbedding = '
-               var ' . $replaceElementIdString . '_video = document.getElementById("' . $replaceElementIdString . '_video");
-               var ' . $replaceElementIdString . '_video_js = document.createElement("video");
-               if (flashembed.getVersion()[0] > 0) {
-                               // Flash is available
-                       var videoPlayer = flowplayer("' . $replaceElementIdString . '_video", ' . $flashConfiguration . ', ' . $flowplayerVideoJsonConfig . ').load();
-                       videoPlayer.onBeforeUnload(function () { return false; });
-               } else if (!!' . $replaceElementIdString . '_video_js.canPlayType) {
-                               // Flash is not available: fallback to videoJS if video tag is supported
-                       ' . $videoTagAssembly . '
-               } else {
-                               // Neither Flash nor video is available: offer to install Flash
-                       flashembed("' . $replaceElementIdString . '_video", ' . $flashConfiguration . ');
-               }';
-                } elseif (is_array($conf['sources'])) {
-                    // HTML5 is the preferred rendering method
-                    // Test whether the browser supports any of types of the provided sources
-                    $supported = array();
-                    foreach ($conf['sources'] as $source) {
-                        $fileinfo = GeneralUtility::split_fileref($source);
-                        $mimeType = $this->mimeTypes[$fileinfo['fileext']]['video'];
-                        $supported[] = $replaceElementIdString . '_videoTag.canPlayType("' . $mimeType . '") != ""';
-                    }
-                    // Testing whether the browser supports the video tag with any of the provided source types
-                    // If no support, embed flowplayer
-                    $videoSourcesEmbedding = '
-               var ' . $replaceElementIdString . '_videoTag = document.createElement(\'video\');
-               var ' . $replaceElementIdString . '_video_box = document.getElementById("' . $replaceElementIdString . '_video");
-               if (' . $replaceElementIdString . '_video_box) {
-                       if (!' . $replaceElementIdString . '_videoTag || !' . $replaceElementIdString . '_videoTag.canPlayType || !(' . (!empty($supported) ? implode(' || ', $supported) : 'false') . ')) {
-                                       // Avoid showing an empty video element
-                               if (document.getElementById("' . $replaceElementIdString . '_video_js")) {
-                                       document.getElementById("' . $replaceElementIdString . '_video_js").style.display = "none";
-                               }
-                               if (flashembed.getVersion()[0] > 0) {
-                                               // Flash is available
-                                       var videoPlayer = flowplayer("' . $replaceElementIdString . '_video", ' . $flashConfiguration . ', ' . $flowplayerVideoJsonConfig . ').load();
-                                       videoPlayer.onBeforeUnload(function () { return false; });
-                               } else {
-                                               // Neither Flash nor video is available: offer to install Flash
-                                       flashembed("' . $replaceElementIdString . '_video", ' . $flashConfiguration . ');
-                               }
-                       } else {' . $videoJsSetup . '
-                       }
-               }';
-                }
-            }
-        }
-        // Audio fallback to Flash
-        $audioSourcesEmbedding = '';
-        // If we have an audio file for Flash
-        if (isset($conf['audioFallback'])) {
-            // If we prefer Flash in
-            if ($conf['preferFlashOverHtml5']) {
-                $audioTagAssembly = '';
-                // Create "source" elements
-                if (is_array($conf['audioSources']) && !empty($conf['audioSources'])) {
-                    foreach ($conf['audioSources'] as $source) {
-                        $fileinfo = GeneralUtility::split_fileref($source);
-                        $mimeType = $this->mimeTypes[$fileinfo['fileext']]['audio'];
-                        $audioTagAssembly .= '
-               ' . $replaceElementIdString . '_audio_element.appendChild($f.extend(document.createElement("source"), {
-                       src: "' . $source . '",
-                       type: "' . $mimeType . '"
-               }));';
-                    }
-                    $audioTagAssembly .= '
-               $f.extend(' . $replaceElementIdString . '_audio_element, {
-                       id: "' . $replaceElementIdString . '_audio_element",
-                       className: "audio-element",
-                       controls: "' . ($conf['type'] === 'video' ? '' : 'controls') . '",
-                       mediagroup: "' . $replaceElementIdString . '",
-                       preload: "none",
-                       width: "' . ($conf['type'] === 'video' ? 0 : $width) . 'px",
-                       height: "' . ($conf['type'] === 'video' ? 0 : $height) . 'px"
-               });
-               ' . $replaceElementIdString . '_audio_box.appendChild(' . $replaceElementIdString . '_audio_element);
-               ' . $replaceElementIdString . '_audio_box.className = "audio-box";';
-                }
-                $audioSourcesEmbedding = '
-               var ' . $replaceElementIdString . '_audio_box = document.getElementById("' . $replaceElementIdString . '_audio_box");
-               var ' . $replaceElementIdString . '_audio_element = document.createElement("audio");
-               if (flashembed.getVersion()[0] > 0) {
-                               // Flash is available
-                       var audioPlayer = flowplayer("' . $replaceElementIdString . '_audio_box", ' . $flashConfiguration . ', ' . $flowplayerAudioJsonConfig . ').load();
-                       audioPlayer.onBeforeUnload(function () { return false; });
-                       ' . ($conf['type'] === 'video' ? 'audioPlayer.mute();' : '') . '
-               } else if (!!' . $replaceElementIdString . '_audio_element.canPlayType) {
-                               // Flash is not available: fallback to audio element if audio tag is supported
-                       ' . $audioTagAssembly . '
-               } else {
-                               // Neither Flash nor audio is available: offer to install Flash if this is not an audio description of a video
-                       ' . ($conf['type'] === 'video' ? '' : 'flashembed("' . $replaceElementIdString . '_audio_box", ' . $flashConfiguration . ');') . '
-               }';
-            } elseif (is_array($conf['audioSources'])) {
-                // HTML5 is the preferred rendering method
-                // Test whether the browser supports any of types of the provided sources
-                $supported = array();
-                foreach ($conf['audioSources'] as $source) {
-                    $fileinfo = GeneralUtility::split_fileref($source);
-                    $mimeType = $this->mimeTypes[$fileinfo['fileext']]['audio'];
-                    $supported[] = $replaceElementIdString . '_audioTag.canPlayType("' . $mimeType . '") != ""';
-                }
-                // Testing whether the browser supports the audio tag with any of the provided source types
-                // If no support, embed flowplayer
-                $audioSourcesEmbedding = '
-               var ' . $replaceElementIdString . '_audioTag = document.createElement(\'audio\');
-               var ' . $replaceElementIdString . '_audio_box = document.getElementById("' . $replaceElementIdString . '_audio_box");
-               if (' . $replaceElementIdString . '_audio_box) {
-                       if (!' . $replaceElementIdString . '_audioTag || !' . $replaceElementIdString . '_audioTag.canPlayType || !(' . (!empty($supported) ? implode(' || ', $supported) : 'false') . ')) {
-                                       // Avoid showing an empty audio element
-                               if (document.getElementById("' . $replaceElementIdString . '_audio_element")) {
-                                       document.getElementById("' . $replaceElementIdString . '_audio_element").style.display = "none";
-                               }
-                               if (flashembed.getVersion()[0] > 0) {
-                                       var audioPlayer = flowplayer("' . $replaceElementIdString . '_audio_box", ' . $flashConfiguration . ', ' . $flowplayerAudioJsonConfig . ').load();
-                                       audioPlayer.onBeforeUnload(function () { return false; });
-                                       ' . ($conf['type'] === 'video' ? 'audioPlayer.mute()' : '') . '
-                               } else {
-                                               // Neither Flash nor audio is available: offer to install Flash if this is not an audio description of a video
-                                       ' . ($conf['type'] === 'video' ? '' : 'flashembed("' . $replaceElementIdString . '_audio_box", ' . $flashConfiguration . ');') . '
-                               }
-                       }
-               }';
-            }
-            // Flowplayer eventHandlers for audio description synchronisation
-            $flowplayerHandlers = '';
-            if ($conf['type'] === 'video') {
-                $flowplayerHandlers = '
-               if (flashembed.getVersion()[0] > 0) {
-                               // Flash is available
-                       var videoPlayer = flowplayer("' . $replaceElementIdString . '_video");
-                       if (videoPlayer) {
-                                       // Control audio description through video control bar
-                               videoPlayer.onVolume(function (volume) { flowplayer("' . $replaceElementIdString . '_audio_box").setVolume(volume); });
-                               videoPlayer.onMute(function () { flowplayer("' . $replaceElementIdString . '_audio_box").mute(); });
-                               videoPlayer.onUnmute(function () { flowplayer("' . $replaceElementIdString . '_audio_box").unmute(); });
-                               videoPlayer.onPause(function () { flowplayer("' . $replaceElementIdString . '_audio_box").pause(); });
-                               videoPlayer.onResume(function () { flowplayer("' . $replaceElementIdString . '_audio_box").resume(); });
-                               videoPlayer.onStart(function () { flowplayer("' . $replaceElementIdString . '_audio_box").play(); });
-                               videoPlayer.onStop(function () { flowplayer("' . $replaceElementIdString . '_audio_box").stop(); });
-                               videoPlayer.onSeek(function (clip, seconds) { flowplayer("' . $replaceElementIdString . '_audio_box").seek(seconds); });
-                                       // Mute audio description on start
-                               flowplayer("' . $replaceElementIdString . '_audio_box").onStart(function () { this.mute()});
-                                       // Audio description toggle
-                               var videoContainer = document.getElementById("' . $replaceElementIdString . '_video");
-                               var buttonContainer = document.createElement("div");
-                               $f.extend(buttonContainer, {
-                                       id: "' . $replaceElementIdString . '_audio_description_toggle",
-                                       className: "vjs-audio-description-control"
-                               });
-                               var button = document.createElement("div");
-                               buttonContainer.appendChild(button);
-                               buttonContainer.style.position = "relative";
-                               buttonContainer.style.left = (parseInt(' . $width . ', 10)-27) + "px";
-                               videoContainer.parentNode.insertBefore(buttonContainer, videoContainer.nextSibling);
-                               VideoJS.addListener(buttonContainer, "click", function () {
-                                       var buttonContainer = document.getElementById("' . $replaceElementIdString . '_audio_description_toggle");
-                                       var state = buttonContainer.getAttribute("data-state");
-                                       if (state == "enabled") {
-                                               buttonContainer.setAttribute("data-state", "disabled");
-                                               flowplayer("' . $replaceElementIdString . '_audio_box").mute();
-                                       } else {
-                                               buttonContainer.setAttribute("data-state", "enabled");
-                                               flowplayer("' . $replaceElementIdString . '_audio_box").unmute();
-                                       }
-                               });
-                       }
-               }';
-            }
-        }
-        // Wrap up inline JS code
-        $jsInlineCode = $audioSourcesEmbedding . $videoSourcesEmbedding . $flowplayerHandlers;
-        if ($jsInlineCode) {
-            $jsInlineCode = 'VideoJS.DOMReady(function(){' . $jsInlineCode . LF . '});';
-        }
-        $this->getPageRenderer()->addJsInlineCode($replaceElementIdString, $jsInlineCode);
-        if (isset($conf['stdWrap.'])) {
-            $content = $this->cObj->stdWrap($content, $conf['stdWrap.']);
-        }
-        return $content;
-    }
-
-    /**
-     * resolves the path to the extensions' Contrib directory
-     *
-     * @param string $fileAndFolderName the file to be located
-     * @return string
-     */
-    protected function getPathToLibrary($fileAndFolderName)
-    {
-        return $GLOBALS['TSFE']->tmpl->getFileName('EXT:mediace/Resources/Contrib/' . $fileAndFolderName);
-    }
-}
diff --git a/typo3/sysext/mediace/Classes/ContentObject/MediaContentObject.php b/typo3/sysext/mediace/Classes/ContentObject/MediaContentObject.php
deleted file mode 100644 (file)
index 800f515..0000000
+++ /dev/null
@@ -1,298 +0,0 @@
-<?php
-namespace FoT3\Mediace\ContentObject;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-/**
- * Contains MEDIA class object.
- */
-class MediaContentObject extends \TYPO3\CMS\Frontend\ContentObject\AbstractContentObject
-{
-    /**
-     * Rendering the cObject, MEDIA
-     *
-     * @param array $conf Array of TypoScript properties
-     * @return string Output
-     */
-    public function render($conf = array())
-    {
-        $content = '';
-        // Add flex parameters to configuration
-        $flexParams = isset($conf['flexParams.']) ? $this->cObj->stdWrap($conf['flexParams'], $conf['flexParams.']) : $conf['flexParams'];
-        if ($flexParams[0] === '<') {
-            // It is a content element rather a TS object
-            $flexParams = \TYPO3\CMS\Core\Utility\GeneralUtility::xml2array($flexParams, 'T3');
-            foreach ($flexParams['data'] as $sheetData) {
-                $this->cObj->readFlexformIntoConf($sheetData['lDEF'], $conf['parameter.'], true);
-            }
-        }
-        // Type is video or audio
-        $conf['type'] = $this->doFlexFormOverlay($conf, 'type');
-        // Video sources
-        $sources = $this->doFlexFormOverlay($conf, 'sources', 'mmSourcesContainer');
-        if (is_array($sources) && !empty($sources)) {
-            $conf['sources'] = array();
-            foreach ($sources as $key => $source) {
-                if (isset($source['mmSource'])) {
-                    $source = $source['mmSource'];
-                    $conf['sources'][$key] = $this->retrieveMediaUrl($source);
-                }
-            }
-        } else {
-            unset($conf['sources']);
-        }
-        // Video fallback and backward compatibility file
-        $videoFallback = $this->doFlexFormOverlay($conf, 'file');
-
-        // Backward compatibility file
-        if ($videoFallback !== null) {
-            $conf['file'] = $this->retrieveMediaUrl($videoFallback);
-        } else {
-            unset($conf['file']);
-        }
-        // Audio sources
-        $audioSources = $this->doFlexFormOverlay($conf, 'audioSources', 'mmAudioSourcesContainer');
-        if (is_array($audioSources) && !empty($audioSources)) {
-            $conf['audioSources'] = array();
-            foreach ($audioSources as $key => $source) {
-                if (isset($source['mmAudioSource'])) {
-                    $source = $source['mmAudioSource'];
-                    $conf['audioSources'][$key] = $this->retrieveMediaUrl($source);
-                }
-            }
-        } else {
-            unset($conf['audioSources']);
-        }
-        // Audio fallback
-        $audioFallback = $this->doFlexFormOverlay($conf, 'audioFallback');
-        if ($audioFallback) {
-            $conf['audioFallback'] = $this->retrieveMediaUrl($audioFallback);
-        } else {
-            unset($conf['audioFallback']);
-        }
-        // Caption file
-        $caption = $this->doFlexFormOverlay($conf, 'caption');
-        if ($caption) {
-            $conf['caption'] = $this->retrieveMediaUrl($caption);
-        } else {
-            unset($conf['caption']);
-        }
-        // Establish render type
-        $renderType = $this->doFlexFormOverlay($conf, 'renderType');
-        $conf['preferFlashOverHtml5'] = 0;
-        if ($renderType === 'preferFlashOverHtml5') {
-            $renderType = 'auto';
-        }
-        if ($renderType === 'auto') {
-            // Default renderType is swf
-            $renderType = 'swf';
-            $handler = array_keys($conf['fileExtHandler.']);
-            if ($conf['type'] === 'video') {
-                $fileinfo = \TYPO3\CMS\Core\Utility\GeneralUtility::split_fileref($conf['file']);
-            } else {
-                $fileinfo = \TYPO3\CMS\Core\Utility\GeneralUtility::split_fileref($conf['audioFallback']);
-            }
-            if (in_array($fileinfo['fileext'], $handler)) {
-                $renderType = strtolower($conf['fileExtHandler.'][$fileinfo['fileext']]);
-            }
-        }
-        $mime = $renderType . 'object';
-        $typeConf = $conf['mimeConf.'][$mime . '.'][$conf['type'] . '.'] ?: array();
-        $conf['predefined'] = array();
-        // Width and height
-        $conf['width'] = (int)$this->doFlexFormOverlay($conf, 'width');
-        $conf['height'] = (int)$this->doFlexFormOverlay($conf, 'height');
-        if (is_array($conf['parameter.']['mmMediaOptions'])) {
-            foreach ($conf['parameter.']['mmMediaOptions'] as $key => $value) {
-                if ($key == 'mmMediaCustomParameterContainer') {
-                    foreach ($value as $val) {
-                        // Custom parameter entry
-                        $rawTS = $val['mmParamCustomEntry'];
-                        // Read and merge
-                        $tmp = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(LF, $rawTS);
-                        if (!empty($tmp)) {
-                            foreach ($tmp as $tsLine) {
-                                if ($tsLine[0] !== '#' && ($pos = strpos($tsLine, '.'))) {
-                                    $parts[0] = substr($tsLine, 0, $pos);
-                                    $parts[1] = substr($tsLine, $pos + 1);
-                                    $valueParts = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode('=', $parts[1], true, 2);
-                                    switch (strtolower($parts[0])) {
-                                        case 'flashvars':
-                                            $conf['flashvars.'][$valueParts[0]] = rawurlencode($valueParts[1]);
-                                            break;
-                                        case 'params':
-                                            $conf['params.'][$valueParts[0]] = $valueParts[1];
-                                            break;
-                                        case 'attributes':
-                                            $conf['attributes.'][$valueParts[0]] = $valueParts[1];
-                                            break;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                } elseif ($key == 'mmMediaOptionsContainer') {
-                    foreach ($value as $val) {
-                        if (isset($val['mmParamSet'])) {
-                            $pName = $val['mmParamName'];
-                            $pSet = $val['mmParamSet'];
-                            $pValue = $pSet == 2 ? $val['mmParamValue'] : ($pSet == 0 ? 'false' : 'true');
-                            $conf['predefined'][$pName] = $pValue;
-                        }
-                    }
-                }
-            }
-        }
-        if ($renderType === 'swf' && $this->doFlexFormOverlay($conf, 'useHTML5')) {
-            $renderType = 'flowplayer';
-        }
-        if ($conf['type'] === 'audio' && !isset($conf['audioSources'])) {
-            $renderType = 'swf';
-        }
-        if ($renderType !== 'qt' && $renderType !== 'embed' && $conf['type'] == 'video') {
-            if (isset($conf['file']) && (strpos($conf['file'], '.swf') !== false || strpos($conf['file'], '://') !== false && strpos(\TYPO3\CMS\Core\Utility\GeneralUtility::getUrl($conf['file'], 2), 'application/x-shockwave-flash') !== false)) {
-                $conf = array_merge((array)$conf['mimeConf.']['swfobject.'], $conf);
-                $conf[$conf['type'] . '.']['player'] = strpos($conf['file'], '://') === false ? 'http://' . $conf['file'] : $conf['file'];
-                $conf['installUrl'] = 'null';
-                $conf['forcePlayer'] = 0;
-                $renderType = 'swf';
-            } elseif (isset($conf['file']) && strpos($conf['file'], '://') !== false) {
-                $mediaWizard = \FoT3\Mediace\MediaWizard\MediaWizardProviderManager::getValidMediaWizardProvider($conf['file']);
-                if ($mediaWizard !== null) {
-                    $conf['installUrl'] = 'null';
-                    $conf['forcePlayer'] = 0;
-                    $renderType = 'swf';
-                }
-            } elseif (isset($conf['file']) && !isset($conf['caption']) && !isset($conf['sources'])) {
-                $renderType = 'swf';
-                $conf['forcePlayer'] = 1;
-            }
-        }
-        switch ($renderType) {
-            case 'flowplayer':
-                $conf[$conf['type'] . '.'] = array_merge((array)$conf['mimeConf.']['flowplayer.'][($conf['type'] . '.')], $typeConf);
-                $conf = array_merge((array)$conf['mimeConf.']['flowplayer.'], $conf);
-                unset($conf['mimeConf.']);
-                $conf['attributes.'] = array_merge((array)$conf['attributes.'], $conf['predefined']);
-                $conf['params.'] = array_merge((array)$conf['params.'], $conf['predefined']);
-                $conf['flashvars.'] = array_merge((array)$conf['flashvars.'], $conf['predefined']);
-                $content = $this->cObj->cObjGetSingle('FLOWPLAYER', $conf);
-                break;
-            case 'swf':
-                $conf[$conf['type'] . '.'] = array_merge((array)$conf['mimeConf.']['swfobject.'][($conf['type'] . '.')], $typeConf);
-                $conf = array_merge((array)$conf['mimeConf.']['swfobject.'], $conf);
-                unset($conf['mimeConf.']);
-                $conf['flashvars.'] = array_merge((array)$conf['flashvars.'], $conf['predefined']);
-                $content = $this->cObj->cObjGetSingle('SWFOBJECT', $conf);
-                break;
-            case 'qt':
-                $conf[$conf['type'] . '.'] = array_merge($conf['mimeConf.']['swfobject.'][$conf['type'] . '.'], $typeConf);
-                $conf = array_merge($conf['mimeConf.']['qtobject.'], $conf);
-                unset($conf['mimeConf.']);
-                $conf['params.'] = array_merge((array)$conf['params.'], $conf['predefined']);
-                $content = $this->cObj->cObjGetSingle('QTOBJECT', $conf);
-                break;
-            case 'embed':
-                $paramsArray = array_merge((array)$typeConf['default.']['params.'], (array)$conf['params.'], $conf['predefined']);
-                $conf['params'] = '';
-                foreach ($paramsArray as $key => $value) {
-                    $conf['params'] .= $key . '=' . $value . LF;
-                }
-                $content = $this->cObj->cObjGetSingle('MULTIMEDIA', $conf);
-                break;
-            default:
-                if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/hooks/class.tx_cms_mediaitems.php']['customMediaRender'])) {
-                    foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/hooks/class.tx_cms_mediaitems.php']['customMediaRender'] as $classRef) {
-                        $hookObj = \TYPO3\CMS\Core\Utility\GeneralUtility::getUserObj($classRef);
-                        $conf['file'] = $videoFallback;
-                        $conf['mode'] = is_file(PATH_site . $videoFallback) ? 'file' : 'url';
-                        if (method_exists($hookObj, 'customMediaRender')) {
-                            $content = $hookObj->customMediaRender($renderType, $conf, $this);
-                        }
-                    }
-                }
-                if (isset($conf['stdWrap.'])) {
-                    $content = $this->cObj->stdWrap($content, $conf['stdWrap.']);
-                }
-        }
-        return $content;
-    }
-
-    /**
-     * Resolves the URL of an file
-     *
-     * @param string $file
-     * @return string|NULL
-     */
-    protected function retrieveMediaUrl($file)
-    {
-        $returnValue = null;
-
-        // because the file value can possibly have link parameters, use explode to split all values
-        $fileParts = explode(' ', $file);
-
-        /** @var $mediaWizard \FoT3\Mediace\MediaWizard\MediaWizardProviderInterface */
-        $mediaWizard = \FoT3\Mediace\MediaWizard\MediaWizardProviderManager::getValidMediaWizardProvider($fileParts[0]);
-        // Get the path relative to the page currently outputted
-        if (substr($fileParts[0], 0, 5) === 'file:') {
-            $fileUid = substr($fileParts[0], 5);
-
-            if (!empty($fileUid) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($fileUid)) {
-                $fileObject = \TYPO3\CMS\Core\Resource\ResourceFactory::getInstance()->getFileObject($fileUid);
-
-                if ($fileObject instanceof \TYPO3\CMS\Core\Resource\FileInterface) {
-                    $returnValue = $fileObject->getPublicUrl();
-                }
-            }
-        } elseif (is_file(PATH_site . $fileParts[0])) {
-            $returnValue = $GLOBALS['TSFE']->tmpl->getFileName($fileParts[0]);
-        } elseif ($mediaWizard !== null) {
-            $jumpUrlEnabled = $GLOBALS['TSFE']->config['config']['jumpurl_enable'];
-            $GLOBALS['TSFE']->config['config']['jumpurl_enable'] = 0;
-            $returnValue = $this->cObj->typoLink_URL(array(
-                'parameter' => $mediaWizard->rewriteUrl($fileParts[0])
-            ));
-            $GLOBALS['TSFE']->config['config']['jumpurl_enable'] = $jumpUrlEnabled;
-        } elseif (\TYPO3\CMS\Core\Utility\GeneralUtility::isValidUrl($fileParts[0])) {
-            $returnValue = $fileParts[0];
-        }
-
-        return $returnValue;
-    }
-
-    /**
-     * Looks up if the key is set via flexform and returns the actual value.
-     * If not present in flexform, it processes the value which might be given in TS
-     * with stdWrap (if needed) and returns that value.
-     *
-     * @param array &$confArray
-     * @param string $key
-     * @param string $sectionKey
-     * @return mixed
-     */
-    protected function doFlexFormOverlay(array &$confArray, $key, $sectionKey = null)
-    {
-        $flexValue = null;
-        $flexKey = 'mm' . ucfirst($key);
-        if ($sectionKey === null) {
-            $flexValue = $confArray['parameter.'][$flexKey];
-        } else {
-            $flexValue = $confArray['parameter.'][$flexKey][$sectionKey];
-        }
-        if ($flexValue === null) {
-            $flexValue = isset($confArray[$key . '.']) ? $this->cObj->stdWrap($confArray[$key], $confArray[$key . '.']) : $confArray[$key];
-        }
-        return $flexValue;
-    }
-}
diff --git a/typo3/sysext/mediace/Classes/ContentObject/MultimediaContentObject.php b/typo3/sysext/mediace/Classes/ContentObject/MultimediaContentObject.php
deleted file mode 100644 (file)
index 5284d7b..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-namespace FoT3\Mediace\ContentObject;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-/**
- * Contains MULTIMEDIA class object.
- */
-class MultimediaContentObject extends \TYPO3\CMS\Frontend\ContentObject\AbstractContentObject
-{
-    /**
-     * Rendering the cObject, MULTIMEDIA
-     *
-     * @param array $conf Array of TypoScript properties
-     * @return string Output
-     */
-    public function render($conf = array())
-    {
-        $content = '';
-        $filename = isset($conf['file.']) ? $this->cObj->stdWrap($conf['file'], $conf['file.']) : $conf['file'];
-        $incFile = $GLOBALS['TSFE']->tmpl->getFileName($filename);
-        if ($incFile) {
-            $fileinfo = \TYPO3\CMS\Core\Utility\GeneralUtility::split_fileref($incFile);
-            if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList('txt,html,htm', $fileinfo['fileext'])) {
-                $content = $GLOBALS['TSFE']->tmpl->fileContent($incFile);
-            } else {
-                // Default params...
-                $parArray = array();
-                // Src is added
-                $width = isset($conf['width.']) ? $this->cObj->stdWrap($conf['width'], $conf['width.']) : $conf['width'];
-                if (!$width) {
-                    $width = 200;
-                }
-                $height = isset($conf['height.']) ? $this->cObj->stdWrap($conf['height'], $conf['height.']) : $conf['height'];
-                if (!$height) {
-                    $height = 200;
-                }
-                $parArray['src'] = 'src="' . $GLOBALS['TSFE']->absRefPrefix . $incFile . '"';
-                if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList('au,wav,mp3', $fileinfo['fileext'])) {
-                }
-                if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList('avi,mov,mpg,asf,wmv', $fileinfo['fileext'])) {
-                    $parArray['width'] = 'width="' . $width . '"';
-                    $parArray['height'] = 'height="' . $height . '"';
-                }
-                if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList('swf,swa,dcr', $fileinfo['fileext'])) {
-                    $parArray['quality'] = 'quality="high"';
-                    $parArray['width'] = 'width="' . $width . '"';
-                    $parArray['height'] = 'height="' . $height . '"';
-                }
-                if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList('class', $fileinfo['fileext'])) {
-                    $parArray['width'] = 'width="' . $width . '"';
-                    $parArray['height'] = 'height="' . $height . '"';
-                }
-                // fetching params
-                $params = isset($conf['params.']) ? $this->cObj->stdWrap($conf['params'], $conf['params.']) : $conf['params'];
-                $lines = explode(LF, $params);
-                foreach ($lines as $l) {
-                    $parts = explode('=', $l);
-                    $parameter = strtolower(trim($parts[0]));
-                    $value = trim($parts[1]);
-                    if ((string)$value != '') {
-                        $parArray[$parameter] = $parameter . '="' . htmlspecialchars($value) . '"';
-                    } else {
-                        unset($parArray[$parameter]);
-                    }
-                }
-                if ($fileinfo['fileext'] == 'class') {
-                    unset($parArray['src']);
-                    $parArray['code'] = 'code="' . htmlspecialchars($fileinfo['file']) . '"';
-                    $parArray['codebase'] = 'codebase="' . htmlspecialchars($fileinfo['path']) . '"';
-                    $content = '<applet ' . implode(' ', $parArray) . '></applet>';
-                } else {
-                    $content = '<embed ' . implode(' ', $parArray) . '></embed>';
-                }
-            }
-        }
-        if (isset($conf['stdWrap.'])) {
-            $content = $this->cObj->stdWrap($content, $conf['stdWrap.']);
-        }
-        return $content;
-    }
-}
diff --git a/typo3/sysext/mediace/Classes/ContentObject/QuicktimeObjectContentObject.php b/typo3/sysext/mediace/Classes/ContentObject/QuicktimeObjectContentObject.php
deleted file mode 100644 (file)
index a23a0b8..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-namespace FoT3\Mediace\ContentObject;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-use TYPO3\CMS\Core\Utility\ArrayUtility;
-use TYPO3\CMS\Core\Utility\StringUtility;
-
-/**
- * Contains QTOBJECT content object.
- */
-class QuicktimeObjectContentObject extends \TYPO3\CMS\Frontend\ContentObject\AbstractContentObject
-{
-    /**
-     * Rendering the cObject, QTOBJECT
-     *
-     * @param array $conf Array of TypoScript properties
-     * @return string Output
-     */
-    public function render($conf = array())
-    {
-        $params = ($prefix = '');
-        if ($GLOBALS['TSFE']->baseUrl) {
-            $prefix = $GLOBALS['TSFE']->baseUrl;
-        }
-        if ($GLOBALS['TSFE']->absRefPrefix) {
-            $prefix = $GLOBALS['TSFE']->absRefPrefix;
-        }
-        $type = isset($conf['type.']) ? $this->cObj->stdWrap($conf['type'], $conf['type.']) : $conf['type'];
-
-        // If file is audio and an explicit path has not been set,
-        // take path from audio fallback property
-        if ($type == 'audio' && empty($conf['file'])) {
-            $conf['file'] = $conf['audioFallback'];
-        }
-        $filename = isset($conf['file.'])
-            ? $this->cObj->stdWrap($conf['file'], $conf['file.'])
-            : $conf['file'];
-
-        $typeConf = $conf[$type . '.'];
-        // Add QTobject js-file
-        $this->getPageRenderer()->addJsFile($this->getPathToLibrary('flashmedia/qtobject/qtobject.js'));
-        $replaceElementIdString = StringUtility::getUniqueId('mmqt');
-        $GLOBALS['TSFE']->register['MMQTID'] = $replaceElementIdString;
-        $qtObject = 'QTObject' . $replaceElementIdString;
-        // Merge with default parameters
-        $conf['params.'] = array_merge((array)$typeConf['default.']['params.'], (array)$conf['params.']);
-        if (is_array($conf['params.']) && is_array($typeConf['mapping.']['params.'])) {
-            ArrayUtility::remapArrayKeys($conf['params.'], $typeConf['mapping.']['params.']);
-            foreach ($conf['params.'] as $key => $value) {
-                $params .= $qtObject . '.addParam("' . $key . '", "' . $value . '");' . LF;
-            }
-        }
-        $params = ($params ? substr($params, 0, -2) : '') . LF . $qtObject . '.write("' . $replaceElementIdString . '");';
-        $alternativeContent = isset($conf['alternativeContent.']) ? $this->cObj->stdWrap($conf['alternativeContent'], $conf['alternativeContent.']) : $conf['alternativeContent'];
-        $layout = str_replace(
-            array(
-                '###ID###',
-                '###QTOBJECT###'
-            ),
-            array(
-                $replaceElementIdString,
-                '<div id="' . $replaceElementIdString . '">' . $alternativeContent . '</div>'
-            ),
-            isset($conf['layout.']) ? $this->cObj->stdWrap($conf['layout'], $conf['layout.']) : $conf['layout']
-        );
-        $width = isset($conf['width.']) ? $this->cObj->stdWrap($conf['width'], $conf['width.']) : $conf['width'];
-        if (!$width) {
-            $width = $conf[$type . '.']['defaultWidth'];
-        }
-        $height = isset($conf['height.']) ? $this->cObj->stdWrap($conf['height'], $conf['height.']) : $conf['height'];
-        if (!$height) {
-            $height = $conf[$type . '.']['defaultHeight'];
-        }
-        $fullFilename = $filename;
-        // If the file name doesn't contain a scheme, prefix with appropriate data
-        if (strpos($filename, '://') === false && !empty($prefix)) {
-            $fullFilename = $prefix . $filename;
-        }
-        $embed = 'var ' . $qtObject . ' = new QTObject("' . $fullFilename . '", "' . $replaceElementIdString . '", "' . $width . '", "' . $height . '");';
-        $content = $layout . '
-                       <script type="text/javascript">
-                               ' . $embed . '
-                               ' . $params . '
-                       </script>';
-        if (isset($conf['stdWrap.'])) {
-            $content = $this->cObj->stdWrap($content, $conf['stdWrap.']);
-        }
-        return $content;
-    }
-
-    /**
-     * resolves the path to the extensions' Contrib directory
-     *
-     * @param string $fileAndFolderName the file to be located
-     * @return string
-     */
-    protected function getPathToLibrary($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
deleted file mode 100644 (file)
index bfab9f5..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-namespace FoT3\Mediace\ContentObject;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-use TYPO3\CMS\Core\Utility\ArrayUtility;
-use TYPO3\CMS\Core\Utility\StringUtility;
-
-/**
- * Contains SWFOBJECT content object.
- */
-class ShockwaveFlashObjectContentObject extends \TYPO3\CMS\Frontend\ContentObject\AbstractContentObject
-{
-    /**
-     * Rendering the cObject, SWFOBJECT
-     *
-     * @param array $conf Array of TypoScript properties
-     * @return string Output
-     */
-    public function render($conf = array())
-    {
-        $prefix = '';
-        if ($GLOBALS['TSFE']->baseUrl) {
-            $prefix = $GLOBALS['TSFE']->baseUrl;
-        }
-        if ($GLOBALS['TSFE']->absRefPrefix) {
-            $prefix = $GLOBALS['TSFE']->absRefPrefix;
-        }
-        $type = isset($conf['type.']) ? $this->cObj->stdWrap($conf['type'], $conf['type.']) : $conf['type'];
-        $typeConf = $conf[$type . '.'];
-
-        // Add SWFobject js-file
-        $this->getPageRenderer()->addJsFile($this->getPathToLibrary('flashmedia/swfobject/swfobject.js'));
-        $player = isset($typeConf['player.']) ? $this->cObj->stdWrap($typeConf['player'], $typeConf['player.']) : $typeConf['player'];
-        if (strpos($player, 'EXT:') === 0) {
-            $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('flashmedia/swfobject/expressInstall.swf');
-        }
-        // If file is audio and an explicit path has not been set,
-        // take path from audio fallback property
-        if ($type == 'audio' && empty($conf['file'])) {
-            $conf['file'] = $conf['audioFallback'];
-        }
-        $filename = isset($conf['file.']) ? $this->cObj->stdWrap($conf['file'], $conf['file.']) : $conf['file'];
-        $forcePlayer = isset($conf['forcePlayer.']) ? $this->cObj->stdWrap($conf['forcePlayer'], $conf['forcePlayer.']) : $conf['forcePlayer'];
-        if ($filename && $forcePlayer) {
-            if (strpos($filename, '://') !== false) {
-                $conf['flashvars.']['file'] = $filename;
-            } else {
-                if ($prefix) {
-                    $conf['flashvars.']['file'] = $prefix . $filename;
-                } else {
-                    $conf['flashvars.']['file'] = str_repeat('../', substr_count($player, '/')) . $filename;
-                }
-            }
-        } else {
-            $player = $filename;
-        }
-        // Write calculated values in conf for the hook
-        $conf['player'] = $player;
-        $conf['installUrl'] = $installUrl;
-        $conf['filename'] = $filename;
-        $conf['prefix'] = $prefix;
-        // Merge with default parameters
-        $conf['flashvars.'] = array_merge((array)$typeConf['default.']['flashvars.'], (array)$conf['flashvars.']);
-        $conf['params.'] = array_merge((array)$typeConf['default.']['params.'], (array)$conf['params.']);
-        $conf['attributes.'] = array_merge((array)$typeConf['default.']['attributes.'], (array)$conf['attributes.']);
-        $conf['embedParams'] = 'flashvars, params, attributes';
-        // Hook for manipulating the conf array, it's needed for some players like flowplayer
-        if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/hooks/class.tx_cms_mediaitems.php']['swfParamTransform'])) {
-            foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/hooks/class.tx_cms_mediaitems.php']['swfParamTransform'] as $classRef) {
-                \TYPO3\CMS\Core\Utility\GeneralUtility::callUserFunction($classRef, $conf, $this);
-            }
-        }
-        if (is_array($conf['flashvars.']) && is_array($typeConf['mapping.']['flashvars.'])) {
-            ArrayUtility::remapArrayKeys($conf['flashvars.'], $typeConf['mapping.']['flashvars.']);
-        }
-        $flashvars = 'var flashvars = ' . (!empty($conf['flashvars.']) ? json_encode($conf['flashvars.']) : '{}') . ';';
-        if (is_array($conf['params.']) && is_array($typeConf['mapping.']['params.'])) {
-            ArrayUtility::remapArrayKeys($conf['params.'], $typeConf['mapping.']['params.']);
-        }
-        $params = 'var params = ' . (!empty($conf['params.']) ? json_encode($conf['params.']) : '{}') . ';';
-        if (is_array($conf['attributes.']) && is_array($typeConf['attributes.']['params.'])) {
-            ArrayUtility::remapArrayKeys($conf['attributes.'], $typeConf['attributes.']['params.']);
-        }
-        $attributes = 'var attributes = ' . (!empty($conf['attributes.']) ? json_encode($conf['attributes.']) : '{}') . ';';
-        $flashVersion = isset($conf['flashVersion.']) ? $this->cObj->stdWrap($conf['flashVersion'], $conf['flashVersion.']) : $conf['flashVersion'];
-        if (!$flashVersion) {
-            $flashVersion = '9';
-        }
-        $replaceElementIdString = StringUtility::getUniqueId('mmswf');
-        $GLOBALS['TSFE']->register['MMSWFID'] = $replaceElementIdString;
-        $alternativeContent = isset($conf['alternativeContent.']) ? $this->cObj->stdWrap($conf['alternativeContent'], $conf['alternativeContent.']) : $conf['alternativeContent'];
-        $layout = isset($conf['layout.']) ? $this->cObj->stdWrap($conf['layout'], $conf['layout.']) : $conf['layout'];
-        $content = str_replace('###ID###', $replaceElementIdString, $layout);
-        $content = str_replace('###SWFOBJECT###', '<div id="' . $replaceElementIdString . '">' . $alternativeContent . '</div>', $content);
-        $width = isset($conf['width.']) ? $this->cObj->stdWrap($conf['width'], $conf['width.']) : $conf['width'];
-        if (!$width) {
-            $width = $conf[$type . '.']['defaultWidth'];
-        }
-        $height = isset($conf['height.']) ? $this->cObj->stdWrap($conf['height'], $conf['height.']) : $conf['height'];
-        if (!$height) {
-            $height = $conf[$type . '.']['defaultHeight'];
-        }
-        $embed = 'swfobject.embedSWF("' . $conf['player'] . '", "' . $replaceElementIdString . '", "' . $width . '", "' . $height . '",
-                               "' . $flashVersion . '", "' . $installUrl . '", ' . $conf['embedParams'] . ');';
-        $script = $flashvars . $params . $attributes . $embed;
-        $this->getPageRenderer()->addJsInlineCode($replaceElementIdString, $script);
-        if (isset($conf['stdWrap.'])) {
-            $content = $this->cObj->stdWrap($content, $conf['stdWrap.']);
-        }
-        return $content;
-    }
-
-    /**
-     * resolves the path to the extensions' Contrib directory
-     *
-     * @param string $fileAndFolderName the file to be located
-     * @return string
-     */
-    protected function getPathToLibrary($fileAndFolderName)
-    {
-        return $GLOBALS['TSFE']->tmpl->getFileName('EXT:mediace/Resources/Contrib/' . $fileAndFolderName);
-    }
-}
diff --git a/typo3/sysext/mediace/Classes/Hooks/PageLayoutView/MultimediaPreviewRenderer.php b/typo3/sysext/mediace/Classes/Hooks/PageLayoutView/MultimediaPreviewRenderer.php
deleted file mode 100644 (file)
index daa4e48..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-namespace FoT3\Mediace\Hooks\PageLayoutView;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-/**
- * Contains a preview rendering for the page module of
- * CType="multimedia"
- */
-class MultimediaPreviewRenderer implements \TYPO3\CMS\Backend\View\PageLayoutViewDrawItemHookInterface
-{
-    /**
-     * Preprocesses the preview rendering of a content element of type "multimedia"
-     *
-     * @param \TYPO3\CMS\Backend\View\PageLayoutView $parentObject Calling parent object
-     * @param bool $drawItem Whether to draw the item using the default functionality
-     * @param string $headerContent Header content
-     * @param string $itemContent Item content
-     * @param array $row Record row of tt_content
-     *
-     * @return void
-     */
-    public function preProcess(
-        \TYPO3\CMS\Backend\View\PageLayoutView &$parentObject,
-        &$drawItem,
-        &$headerContent,
-        &$itemContent,
-        array &$row
-    ) {
-        if ($row['CType'] === 'multimedia' && $row['multimedia']) {
-            $itemContent .= $parentObject->renderText($row['multimedia']) . '<br />';
-            $itemContent .= $parentObject->renderText($row['parameters']) . '<br />';
-
-            $drawItem = false;
-        }
-    }
-}
diff --git a/typo3/sysext/mediace/Classes/MediaWizard/MediaWizardProvider.php b/typo3/sysext/mediace/Classes/MediaWizard/MediaWizardProvider.php
deleted file mode 100644 (file)
index bca3d60..0000000
+++ /dev/null
@@ -1,302 +0,0 @@
-<?php
-namespace FoT3\Mediace\MediaWizard;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-use TYPO3\CMS\Core\Utility\GeneralUtility;
-
-/**
- * Contains an implementation of the mediaWizardProvider supporting some
- * well known providers.
- */
-class MediaWizardProvider implements MediaWizardProviderInterface
-{
-    /**
-     * @var array List of providers we can handle in this class
-     */
-    protected $providers = array(
-        'youtube',
-        'youtu',
-        'dailymotion',
-        'sevenload',
-        'vimeo',
-        'clipfish',
-        'google',
-        'metacafe',
-        'myvideo',
-        'liveleak',
-        'veoh'
-    );
-
-    /**
-     * Checks if we have a valid method for processing a given URL.
-     *
-     * This is done by analysing the hostname of the URL and checking if it contains
-     * any of our provider tags defined in $this->providers.
-     *
-     * @param string $url
-     * @return string
-     */
-    protected function getMethod($url)
-    {
-        $urlInfo = @parse_url($url);
-        if ($urlInfo === false) {
-            return null;
-        }
-        // The URL passed might not contain http:// prefix
-        if (!isset($urlInfo['host'])) {
-            $urlInfo = @parse_url('http://' . $url);
-        }
-        if (empty($urlInfo['host'])) {
-            return null;
-        }
-        $hostName = GeneralUtility::trimExplode('.', $urlInfo['host'], true);
-        foreach ($this->providers as $provider) {
-            $functionName = 'process_' . $provider;
-            if (in_array($provider, $hostName) && is_callable(array($this, $functionName))) {
-                return $functionName;
-            }
-        }
-        return null;
-    }
-
-    /***********************************************
-     *
-     * Implementation of MediaWizardProviderInterface
-     *
-     ***********************************************/
-    /**
-     * @param string $url
-     * @return bool
-     * @see MediaWizardProviderInterface::canHandle
-     */
-    public function canHandle($url)
-    {
-        return $this->getMethod($url) !== null;
-    }
-
-    /**
-     * @param string $url URL to rewrite
-     * @return string The rewritten URL
-     * @see MediaWizardProviderInterface::rewriteUrl
-     */
-    public function rewriteUrl($url)
-    {
-        $method = $this->getMethod($url);
-        return $this->{$method}($url);
-    }
-
-    /***********************************************
-     *
-     * Providers URL rewriting:
-     *
-     ***********************************************/
-    /**
-     * Parse youtube url
-     *
-     * @param string $url
-     * @return string processed url
-     */
-    protected function process_youtube($url)
-    {
-        $videoId = '';
-
-        $pattern = '%
-               ^(?:https?://)?                                                                 # Optional URL scheme Either http or https
-               (?:www\.)?                                                                              # Optional www subdomain
-               (?:                                                                                             # Group host alternatives:
-                       youtu\.be/                                                                      #  Either youtu.be/,
-                       |youtube(?:                                                                     #  or youtube.com/
-                               -nocookie                                                               #   optional nocookie domain
-                       )?\.com/(?:
-                               [^/]+/.+/                                                               #   Either /something/other_params/ for channels,
-                               |(?:v|e(?:                                                              #   or v/ or e/,
-                                       mbed                                                            #    optional mbed for embed/
-                               )?)/
-                               |.*[?&]v=                                                               #   or ?v= or ?other_param&v=
-                       )
-               )                                                                                               # End host alternatives.
-               ([^"&?/ ]{11})                                                                  # 11 characters (Length of Youtube video ids).
-               (?:.+)?$                                                                                # Optional other ending URL parameters.
-               %xs';
-        if (preg_match($pattern, $url, $matches)) {
-            $videoId = $matches[1];
-        }
-
-        if ($videoId) {
-            $url = $this->getUrlSchema() . 'www.youtube.com/v/' . $videoId . '?fs=1';
-        }
-        return $url;
-    }
-
-    /**
-     * Parse youtube short url
-     *
-     * @param string $url
-     * @return string processed url
-     */
-    protected function process_youtu($url)
-    {
-        return $this->process_youtube($url);
-    }
-
-    /**
-     * Parse dailymotion url
-     *
-     * @param string $url
-     * @return string processed url
-     */
-    protected function process_dailymotion($url)
-    {
-        $parts = explode('video/', $url);
-        $videoId = $parts[1];
-        if (strpos($videoId, '/') !== false) {
-            $videoId = substr($videoId, 0, strpos($videoId, '/'));
-        }
-        return $this->getUrlSchema() . 'www.dailymotion.com/swf/' . $videoId;
-    }
-
-    /**
-     * Parse sevenload url
-     *
-     * @param string $url
-     * @return string processed url and preview image
-     */
-    protected function process_sevenload($url)
-    {
-        $parts = explode('/', $url);
-        $videoId = $parts[count($parts) - 1];
-        if (strpos($videoId, '-') !== false) {
-            $videoId = substr($videoId, 0, strpos($videoId, '-'));
-        }
-        return 'http://de.sevenload.com/pl/' . $videoId . '/400x500/swf';
-    }
-
-    /**
-     * Parse vimeo url
-     *
-     * Supports:
-     * - http://vimeo.com/hd#<id>
-     * - http://vimeo.com/<id>
-     * - http://player.vimeo.com/video/<id>
-     *
-     * @param string $url
-     * @return string processed url
-     */
-    protected function process_vimeo($url)
-    {
-        if (preg_match('/[\\/#](\\d+)$/', $url, $matches)) {
-            $videoId = $matches[1];
-            $url = $this->getUrlSchema() . 'vimeo.com/moogaloop.swf?clip_id=' . $videoId . '&server=vimeo.com&show_title=1&show_byline=1&show_portrait=0&fullscreen=1';
-        }
-        return $url;
-    }
-
-    /**
-     * Parse clipfish url
-     *
-     * @param string $url
-     * @return string processed url
-     */
-    protected function process_clipfish($url)
-    {
-        if (preg_match('/video([^(\\&|$)]*)/', $url, $matches)) {
-            $parts = explode('/', $matches[1]);
-            $videoId = $parts[1];
-            $url = 'http://www.clipfish.de/cfng/flash/clipfish_player_3.swf?as=0&r=1&noad=1&fs=1&vid=' . $videoId;
-        }
-        return $url;
-    }
-
-    /**
-     * Parse google url
-     *
-     * @param string $url
-     * @return string processed url
-     */
-    protected function process_google($url)
-    {
-        if (preg_match('/docid=([^(\\&|$)]*)/', $url, $matches)) {
-            $videoId = $matches[1];
-            $url = $this->getUrlSchema() . 'video.google.com/googleplayer.swf?docid=' . $videoId;
-        }
-        return $url;
-    }
-
-    /**
-     * Parse metacafe url
-     *
-     * @param string $url
-     * @return string processed url
-     */
-    protected function process_metacafe($url)
-    {
-        if (preg_match('/watch([^(\\&|$)]*)/', $url, $matches)) {
-            $parts = explode('/', $matches[1]);
-            $videoId = $parts[1];
-            $url = 'http://www.metacafe.com/fplayer/' . $videoId . '/.swf';
-        }
-        return $url;
-    }
-
-    /**
-     * Parse myvideo url
-     *
-     * @param string $url
-     * @return string processed url
-     */
-    protected function process_myvideo($url)
-    {
-        preg_match('/watch([^(\\&|$)]*)/', $url, $matches);
-        $parts = explode('/', $matches[1]);
-        $videoId = $parts[1];
-        return $this->getUrlSchema() . 'www.myvideo.de/movie/' . $videoId . '/';
-    }
-
-    /**
-     * Parse liveleak url
-     *
-     * @param string $url
-     * @return string processed url
-     */
-    protected function process_liveleak($url)
-    {
-        preg_match('/i=([^(\\&|$)]*)/', $url, $matches);
-        $videoId = $matches[1];
-        return 'http://www.liveleak.com/e/' . $videoId;
-    }
-
-    /**
-     * Parse veoh url
-     *
-     * @param string $url
-     * @return string processed url
-     */
-    protected function process_veoh($url)
-    {
-        preg_match('/watch\\/([^(\\&|$)]*)/', $url, $matches);
-        $videoId = $matches[1];
-        return 'http://www.veoh.com/static/swf/webplayer/WebPlayer.swf?version=AFrontend.5.5.2.1001&permalinkId=' . $videoId;
-    }
-
-    /**
-     * Get the correct url schema
-     *
-     * @return string
-     */
-    protected function getUrlSchema()
-    {
-        return GeneralUtility::getIndpEnv('TYPO3_SSL') ? 'https://' : 'http://';
-    }
-}
diff --git a/typo3/sysext/mediace/Classes/MediaWizard/MediaWizardProviderInterface.php b/typo3/sysext/mediace/Classes/MediaWizard/MediaWizardProviderInterface.php
deleted file mode 100644 (file)
index 7807620..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-namespace FoT3\Mediace\MediaWizard;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-/**
- * Interface for classes which hook into tslib_mediawizard adding additional
- * media wizard providers
- */
-interface MediaWizardProviderInterface
-{
-    /**
-     * Tells the calling party if we can handle the URL passed to the constructor
-     *
-     * @param string $url URL to be handled
-     * @return bool
-     */
-    public function canHandle($url);
-
-    /**
-     * Rewrites a media provider URL into a canonized form that can be embedded
-     *
-     * @param string $url URL to be handled
-     * @return string Canonized URL that can be used to embed
-     */
-    public function rewriteUrl($url);
-}
diff --git a/typo3/sysext/mediace/Classes/MediaWizard/MediaWizardProviderManager.php b/typo3/sysext/mediace/Classes/MediaWizard/MediaWizardProviderManager.php
deleted file mode 100644 (file)
index 1cec342..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-namespace FoT3\Mediace\MediaWizard;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-use TYPO3\CMS\Core\Utility\GeneralUtility;
-
-/**
- * Manager to register and call registered media wizard providers
- * @static
- */
-class MediaWizardProviderManager
-{
-    /**
-     * @var array All class names of registered providers
-     */
-    protected static $providers = array();
-
-    /**
-     * @var array Instances of registered providers, set up on first call of getValidMediaWizardProvider()
-     */
-    protected static $providerObjects = array();
-
-    /**
-     * Allows extensions to register themselves as media wizard providers
-     *
-     * @param string $className A class implementing MediaWizardProviderInterface
-     * @throws \UnexpectedValueException
-     * @return void
-     */
-    public static function registerMediaWizardProvider($className)
-    {
-        self::$providers[] = $className;
-    }
-
-    /**
-     * Instantiate all registered media wizard providers
-     *
-     * @throws \UnexpectedValueException
-     */
-    protected static function instantiateMediaWizardProviders()
-    {
-        $providerClassNames = array_unique(self::$providers);
-        foreach ($providerClassNames as $className) {
-            if (!isset(self::$providerObjects[$className])) {
-                $provider = GeneralUtility::makeInstance($className);
-                if (!$provider instanceof MediaWizardProviderInterface) {
-                    throw new \UnexpectedValueException($className . ' is registered as a mediaWizardProvider, so it must implement interface ' . MediaWizardProviderInterface::class, 1285022360);
-                }
-                self::$providerObjects[$className] = $provider;
-            }
-        }
-    }
-
-    /**
-     * Return a media wizard provider that can handle given URL
-     *
-     * @param string $url
-     * @return MediaWizardProviderInterface|NULL A valid mediaWizardProvider that can handle this URL
-     */
-    public static function getValidMediaWizardProvider($url)
-    {
-        self::instantiateMediaWizardProviders();
-        // Go through registered providers in reverse order (last one registered wins)
-        $providers = array_reverse(self::$providerObjects, true);
-        foreach ($providers as $provider) {
-            /** @var $provider MediaWizardProviderInterface */
-            if ($provider->canHandle($url)) {
-                return $provider;
-            }
-        }
-        // No provider found
-        return null;
-    }
-}
diff --git a/typo3/sysext/mediace/Configuration/FlexForms/media.xml b/typo3/sysext/mediace/Configuration/FlexForms/media.xml
deleted file mode 100644 (file)
index 53f88fc..0000000
+++ /dev/null
@@ -1,454 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<T3DataStructure>
-       <sheets>
-               <sGeneral>
-                       <ROOT>
-                               <TCEforms>
-                                       <sheetTitle>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.options</sheetTitle>
-                               </TCEforms>
-                               <type>array</type>
-                               <el>
-                                       <mmType>
-                                               <TCEforms>
-                                                       <onChange>reload</onChange>
-                                                       <label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.type</label>
-                                                       <config>
-                                                               <type>select</type>
-                                                               <items>
-                                                                       <numIndex index="0">
-                                                                               <numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.type.video</numIndex>
-                                                                               <numIndex index="1">video</numIndex>
-                                                                       </numIndex>
-                                                                       <numIndex index="1">
-                                                                               <numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.type.audio</numIndex>
-                                                                               <numIndex index="1">audio</numIndex>
-                                                                       </numIndex>
-                                                               </items>
-                                                       </config>
-                                               </TCEforms>
-                                       </mmType>
-                                       <mmUseHTML5>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.useHTML5</label>
-                                                       <displayCond>FIELD:mmType:!=:audio</displayCond>
-                                                       <onChange>reload</onChange>
-                                                       <config>
-                                                               <type>check</type>
-                                                               <default>0</default>
-                                                       </config>
-                                               </TCEforms>
-                                       </mmUseHTML5>
-                                       <mmWidth>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.width</label>
-                                                       <config>
-                                                               <type>input</type>
-                                                               <size>8</size>
-                                                               <max>5</max>
-                                                               <eval>trim,num</eval>
-                                                       </config>
-                                               </TCEforms>
-                                       </mmWidth>
-                                       <mmHeight>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.height</label>
-                                                       <config>
-                                                               <type>input</type>
-                                                               <size>8</size>
-                                                               <max>5</max>
-                                                               <eval>trim,num</eval>
-                                                       </config>
-                                               </TCEforms>
-                                       </mmHeight>
-                                       <mmRenderType>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.renderType</label>
-                                                       <displayCond>FIELD:mmType:!=:audio</displayCond>
-                                                       <config>
-                                                               <type>select</type>
-                                                               <items>
-                                                                       <numIndex index="0">
-                                                                               <numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.renderType.auto</numIndex>
-                                                                               <numIndex index="1">auto</numIndex>
-                                                                       </numIndex>
-                                                                       <numIndex index="1">
-                                                                               <numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.renderType.qt</numIndex>
-                                                                               <numIndex index="1">qt</numIndex>
-                                                                       </numIndex>
-                                                                       <numIndex index="2">
-                                                                               <numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.renderType.embed</numIndex>
-                                                                               <numIndex index="1">embed</numIndex>
-                                                                       </numIndex>
-                                                               </items>
-                                                               <itemsProcFunc>TYPO3\CMS\Frontend\Hooks\MediaItemHooks->customMediaRenderTypes</itemsProcFunc>
-                                                       </config>
-                                               </TCEforms>
-                                       </mmRenderType>
-                                       <mmMediaOptions>
-                                               <title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.additionalOptions</title>
-                                               <type>array</type>
-                                               <section>1</section>
-                                               <el>
-                                                       <mmMediaOptionsContainer>
-                                                               <type>array</type>
-                                                               <title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params</title>
-                                                               <el>
-                                                                       <mmParamName>
-                                                                               <TCEforms>
-                                                                                       <label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.option</label>
-                                                                                       <config>
-                                                                                               <type>select</type>
-                                                                                               <items>
-                                                                                                       <numIndex index="0">
-                                                                                                               <numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.autoPlay</numIndex>
-                                                                                                               <numIndex index="1">autoPlay</numIndex>
-                                                                                                       </numIndex>
-                                                                                                       <numIndex index="1">
-                                                                                                               <numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.loop</numIndex>
-                                                                                                               <numIndex index="1">loop</numIndex>
-                                                                                                       </numIndex>
-                                                                                                       <numIndex index="2">
-                                                                                                               <numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.quality</numIndex>
-                                                                                                               <numIndex index="1">quality</numIndex>
-                                                                                                       </numIndex>
-                                                                                                       <numIndex index="3">
-                                                                                                               <numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.preview</numIndex>
-                                                                                                               <numIndex index="1">preview</numIndex>
-                                                                                                       </numIndex>
-                                                                                                       <numIndex index="4">
-                                                                                                               <numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.allowScriptAccess</numIndex>
-                                                                                                               <numIndex index="1">allowScriptAccess</numIndex>
-                                                                                                       </numIndex>
-                                                                                                       <numIndex index="5">
-                                                                                                               <numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.allowFullScreen</numIndex>
-                                                                                                               <numIndex index="1">allowFullScreen</numIndex>
-                                                                                                       </numIndex>
-                                                                                                       <numIndex index="6">
-                                                                                                               <numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.preload</numIndex>
-                                                                                                               <numIndex index="1">preload</numIndex>
-                                                                                                       </numIndex>
-                                                                                                       <numIndex index="7">
-                                                                                                               <numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.controlsBelow</numIndex>
-                                                                                                               <numIndex index="1">controlsBelow</numIndex>
-                                                                                                       </numIndex>
-                                                                                                       <numIndex index="8">
-                                                                                                               <numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.controlsAtStart</numIndex>
-                                                                                                               <numIndex index="1">controlsAtStart</numIndex>
-                                                                                                       </numIndex>
-                                                                                                       <numIndex index="9">
-                                                                                                               <numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.controlsHiding</numIndex>
-                                                                                                               <numIndex index="1">controlsHiding</numIndex>
-                                                                                                       </numIndex>
-                                                                                                       <numIndex index="10">
-                                                                                                               <numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.defaultVolume</numIndex>
-                                                                                                               <numIndex index="1">defaultVolume</numIndex>
-                                                                                                       </numIndex>
-                                                                                               </items>
-                                                                                               <itemsProcFunc>TYPO3\CMS\Frontend\Hooks\MediaItemHooks->customMediaParams</itemsProcFunc>
-                                                                                       </config>
-                                                                               </TCEforms>
-                                                                       </mmParamName>
-                                                                       <mmParamSet>
-                                                                               <TCEforms>
-                                                                                       <label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.setTo</label>
-                                                                                       <config>
-                                                                                               <type>select</type>
-                                                                                               <items>
-                                                                                                       <numIndex index="0">
-                                                                                                               <numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.on</numIndex>
-                                                                                                               <numIndex index="1">1</numIndex>
-                                                                                                       </numIndex>
-                                                                                                       <numIndex index="1">
-                                                                                                               <numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.off</numIndex>
-                                                                                                               <numIndex index="1">0</numIndex>
-                                                                                                       </numIndex>
-                                                                                                       <numIndex index="2">
-                                                                                                               <numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.valueEntry</numIndex>
-                                                                                                               <numIndex index="1">2</numIndex>
-                                                                                                       </numIndex>
-                                                                                               </items>
-                                                                                       </config>
-                                                                               </TCEforms>
-                                                                       </mmParamSet>
-                                                                       <mmParamValue>
-                                                                               <TCEforms>
-                                                                                       <label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.value</label>
-                                                                                       <config>
-                                                                                               <type>input</type>
-                                                                                               <size>16</size>
-                                                                                               <default></default>
-                                                                                       </config>
-                                                                               </TCEforms>
-                                                                       </mmParamValue>
-                                                               </el>
-                                                       </mmMediaOptionsContainer>
-                                                       <mmMediaCustomParameterContainer>
-                                                               <type>array</type>
-                                                               <title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.customEntry</title>
-                                                               <el>
-                                                                       <mmParamCustomEntry>
-                                                                               <TCEforms>
-                                                                                       <label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.customEntryLabel</label>
-                                                                                       <config>
-                                                                                               <type>text</type>
-                                                                                               <rows>6</rows>
-                                                                                               <cols>60</cols>
-                                                                                       </config>
-                                                                               </TCEforms>
-                                                                       </mmParamCustomEntry>
-                                                               </el>
-                                                       </mmMediaCustomParameterContainer>
-                                               </el>
-                                       </mmMediaOptions>
-                               </el>
-                       </ROOT>
-               </sGeneral>
-               <sVideo>
-                       <ROOT>
-                               <TCEforms>
-                                       <sheetTitle>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.tabVideo</sheetTitle>
-                                       <displayCond>FIELD:sGeneral.mmType:!=:audio</displayCond>
-                               </TCEforms>
-                               <type>array</type>
-                               <el>
-                                       <mmFile>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.fallbackUrl</label>
-                                                       <config>
-                                                               <type>input</type>
-                                                               <size>60</size>
-                                                               <eval>trim,required</eval>
-                                                               <default></default>
-                                                               <wizards type="array">
-                                                                       <link type="array">
-                                                                               <type>popup</type>
-                                                                               <title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.browseUrlTitle</title>
-                                                                               <icon>EXT:mediace/Resources/Public/Images/FormFieldWizard/wizard_link.gif</icon>
-                                                                               <module type="array">
-                                                                                       <name>wizard_link_browser</name>
-                                                                                       <urlParameters type="array">
-                                                                                               <act>file</act>
-                                                                                       </urlParameters>
-                                                                               </module>
-                                                                               <params type="array">
-                                                                                       <blindLinkOptions>page,folder,mail,spec</blindLinkOptions>
-                                                                                       <allowedExtensions>class,swa,dcr,wav,avi,au,mov,asf,mpg,wmv,mp3,mp4,m4v,m4a,flv,ogg,ogv,swf,webm</allowedExtensions>
-                                                                               </params>
-                                                                               <JSopenParams>width=800,height=600,status=0,menubar=0,scrollbars=1</JSopenParams>
-                                                                       </link>
-                                                               </wizards>
-                                                       </config>
-                                               </TCEforms>
-                                       </mmFile>
-                               </el>
-                       </ROOT>
-               </sVideo>
-               <sVideoAccessible>
-                       <ROOT>
-                               <TCEforms>
-                                       <sheetTitle>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.tabVideoAccessible</sheetTitle>
-                                       <displayCond>FIELD:sGeneral.mmUseHTML5:=:1</displayCond>
-                               </TCEforms>
-                               <type>array</type>
-                               <el>
-                                       <mmSources>
-                                               <title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.sources</title>
-                                               <type>array</type>
-                                               <section>1</section>
-                                               <el>
-                                                       <mmSourcesContainer>
-                                                               <type>array</type>
-                                                               <title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.media.url</title>
-                                                               <el>
-                                                                       <mmSource>
-                                                                               <TCEforms>
-                                                                                       <label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.url</label>
-                                                                                       <config>
-                                                                                               <type>input</type>
-                                                                                               <size>60</size>
-                                                                                               <eval>trim,required</eval>
-                                                                                               <default></default>
-                                                                                               <wizards type="array">
-                                                                                                       <link type="array">
-                                                                                                               <type>popup</type>
-                                                                                                               <title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.browseUrlTitle</title>
-                                                                                                               <icon>EXT:mediace/Resources/Public/Images/FormFieldWizard/wizard_link.gif</icon>
-                                                                                                               <module type="array">
-                                                                                                                       <name>wizard_link_browser</name>
-                                                                                                                       <urlParameters type="array">
-                                                                                                                               <act>file</act>
-                                                                                                                       </urlParameters>
-                                                                                                               </module>
-                                                                                                               <params type="array">
-                                                                                                                       <blindLinkOptions>page,folder,mail,spec</blindLinkOptions>
-                                                                                                                       <allowedExtensions>mov,mpg,mp4,m4a,m4v,ogg,ogv,swf,webm</allowedExtensions>
-                                                                                                               </params>
-                                                                                                               <JSopenParams>width=800,height=600,status=0,menubar=0,scrollbars=1</JSopenParams>
-                                                                                                       </link>
-                                                                                               </wizards>
-                                                                                       </config>
-                                                                               </TCEforms>
-                                                                       </mmSource>
-                                                               </el>
-                                                       </mmSourcesContainer>
-                                               </el>
-                                       </mmSources>
-                                       <mmCaption>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.captionUrl</label>
-                                                       <config>
-                                                               <type>input</type>
-                                                               <size>60</size>
-                                                               <eval>trim</eval>
-                                                               <default></default>
-                                                               <wizards type="array">
-                                                                       <link type="array">
-                                                                               <type>popup</type>
-                                                                               <title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.browseUrlTitle</title>
-                                                                               <icon>EXT:mediace/Resources/Public/Images/FormFieldWizard/wizard_link.gif</icon>
-                                                                               <module type="array">
-                                                                                       <name>wizard_link_browser</name>
-                                                                                       <urlParameters type="array">
-                                                                                               <act>file</act>
-                                                                                       </urlParameters>
-                                                                               </module>
-                                                                               <params type="array">
-                                                                                       <blindLinkOptions>page,folder,mail,spec</blindLinkOptions>
-                                                                                       <allowedExtensions>srt,vtt</allowedExtensions>
-                                                                               </params>
-                                                                               <JSopenParams>width=800,height=600,status=0,menubar=0,scrollbars=1</JSopenParams>
-                                                                       </link>
-                                                               </wizards>
-                                                       </config>
-                                               </TCEforms>
-                                       </mmCaption>
-                                       <mmAudioSources>
-                                               <title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.audioDescription</title>
-                                               <type>array</type>
-                                               <section>1</section>
-                                               <el>
-                                                       <mmAudioSourcesContainer>
-                                                               <type>array</type>
-                                                               <title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.media.browseUrl</title>
-                                                               <el>
-                                                                       <mmAudioSource>
-                                                                               <TCEforms>
-                                                                                       <label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.browseUrl</label>
-                                                                                       <config>
-                                                                                               <type>input</type>
-                                                                                               <size>60</size>
-                                                                                               <eval>trim,required</eval>
-                                                                                               <default></default>
-                                                                                               <wizards type="array">
-                                                                                                       <link type="array">
-                                                                                                               <type>popup</type>
-                                                                                                               <title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.browseUrlTitle</title>
-                                                                                                               <icon>EXT:mediace/Resources/Public/Images/FormFieldWizard/wizard_link.gif</icon>
-                                                                                                               <module type="array">
-                                                                                                                       <name>wizard_link_browser</name>
-                                                                                                                       <urlParameters type="array">
-                                                                                                                               <act>file</act>
-                                                                                                                       </urlParameters>
-                                                                                                               </module>
-                                                                                                               <params type="array">
-                                                                                                                       <blindLinkOptions>page,folder,mail,spec</blindLinkOptions>
-                                                                                                                       <allowedExtensions>au,asf,mp3,m4a,oga,ogg, wav,webm,wmv</allowedExtensions>
-                                                                                                               </params>
-                                                                                                               <JSopenParams>width=800,height=600,status=0,menubar=0,scrollbars=1</JSopenParams>
-                                                                                                       </link>
-                                                                                               </wizards>
-                                                                                       </config>
-                                                                               </TCEforms>
-                                                                       </mmAudioSource>
-                                                               </el>
-                                                       </mmAudioSourcesContainer>
-                                               </el>
-                                       </mmAudioSources>
-
-                               </el>
-                       </ROOT>
-               </sVideoAccessible>
-               <sAudio>
-                       <ROOT>
-                               <TCEforms>
-                                       <sheetTitle>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.tabAudio</sheetTitle>
-                                       <displayCond>FIELD:sGeneral.mmType:=:audio</displayCond>
-                               </TCEforms>
-                               <type>array</type>
-                               <el>
-                                       <mmAudioFallback>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.audioFallbackUrl</label>
-                                                       <config>
-                                                               <type>input</type>
-                                                               <size>60</size>
-                                                               <eval>trim</eval>
-                                                               <default></default>
-                                                               <wizards type="array">
-                                                                       <link type="array">
-                                                                               <type>popup</type>
-                                                                               <title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.browseUrlTitle</title>
-                                                                               <icon>EXT:mediace/Resources/Public/Images/FormFieldWizard/wizard_link.gif</icon>
-                                                                               <module type="array">
-                                                                                       <name>wizard_link_browser</name>
-                                                                                       <urlParameters type="array">
-                                                                                               <act>file</act>
-                                                                                       </urlParameters>
-                                                                               </module>
-                                                                               <params type="array">
-                                                                                       <blindLinkOptions>page,folder,mail,spec</blindLinkOptions>
-                                                                                       <allowedExtensions>au,asf,mp3,m4a,oga,swa,wav,webm,wmv</allowedExtensions>
-                                                                               </params>
-                                                                               <JSopenParams>width=800,height=600,status=0,menubar=0,scrollbars=1</JSopenParams>
-                                                                       </link>
-                                                               </wizards>
-                                                       </config>
-                                               </TCEforms>
-                                       </mmAudioFallback>
-                                       <mmAudioSources>
-                                               <title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.audioSources</title>
-                                               <type>array</type>
-                                               <section>1</section>
-                                               <el>
-                                                       <mmAudioSourcesContainer>
-                                                               <type>array</type>
-                                                               <title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.media.url</title>
-                                                               <el>
-                                                                       <mmAudioSource>
-                                                                               <TCEforms>
-                                                                                       <label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.url</label>
-                                                                                       <config>
-                                                                                               <type>input</type>
-                                                                                               <size>60</size>
-                                                                                               <eval>trim,required</eval>
-                                                                                               <default></default>
-                                                                                               <wizards type="array">
-                                                                                                       <link type="array">
-                                                                                                               <type>popup</type>
-                                                                                                               <title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.browseUrlTitle</title>
-                                                                                                               <icon>EXT:mediace/Resources/Public/Images/FormFieldWizard/wizard_link.gif</icon>
-                                                                                                               <module type="array">
-                                                                                                                       <name>wizard_link_browser</name>
-                                                                                                                       <urlParameters type="array">
-                                                                                                                               <act>file</act>
-                                                                                                                       </urlParameters>
-                                                                                                               </module>
-                                                                                                               <params type="array">
-                                                                                                                       <blindLinkOptions>page,folder,mail,spec</blindLinkOptions>
-                                                                                                                       <allowedExtensions>au,asf,mp3,m4a,oga,ogg, wav,webm,wmv</allowedExtensions>
-                                                                                                               </params>
-                                                                                                               <JSopenParams>width=800,height=600,status=0,menubar=0,scrollbars=1</JSopenParams>
-                                                                                                       </link>
-                                                                                               </wizards>
-                                                                                       </config>
-                                                                               </TCEforms>
-                                                                       </mmAudioSource>
-                                                               </el>
-                                                       </mmAudioSourcesContainer>
-                                               </el>
-                                       </mmAudioSources>
-                               </el>
-                       </ROOT>
-               </sAudio>
-       </sheets>
-</T3DataStructure>
diff --git a/typo3/sysext/mediace/Configuration/TCA/Overrides/tt_content.php b/typo3/sysext/mediace/Configuration/TCA/Overrides/tt_content.php
deleted file mode 100644 (file)
index 24b84cf..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-defined('TYPO3_MODE') or die();
-
-/**
- * Registering CType "media" and "multimedia"
- */
-$GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['multimedia'] = 'mimetypes-x-content-multimedia';
-$GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['media'] = 'mimetypes-x-content-multimedia';
-
-
-// Register new CType in item list just before "menu"
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem('tt_content', 'CType',
-    array(
-        'LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:tt_content.CType.item.multimedia',
-        'multimedia',
-        'content-special-media'
-    ),
-    'menu', 'before'
-);
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem('tt_content', 'CType',
-    array(
-        'LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:tt_content.CType.item.media',
-        'media',
-        'content-special-media'
-    ),
-    'menu', 'before'
-);
-
-// Add new field
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('tt_content', array(
-    'multimedia' => array(
-        'label' => 'LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:tt_content.multimedia',
-        'config' => array(
-            'type' => 'group',
-            'internal_type' => 'file',
-            'allowed' => 'txt,html,htm,class,swf,swa,dcr,wav,avi,au,mov,asf,mpg,wmv,mp3,mp4,m4v',
-            'max_size' => $GLOBALS['TYPO3_CONF_VARS']['BE']['maxFileSize'],
-            'uploadfolder' => 'uploads/media',
-            'size' => '2',
-            'maxitems' => '1',
-            'minitems' => '0'
-        )
-    )
-));
-
-// add type definition and palette
-$GLOBALS['TCA']['tt_content']['types']['multimedia'] = array(
-    'showitem' => '--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.general;general,
-                       --palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.header;header,
-               --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.media,
-                       --palette--;LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:tt_content.palette.multimediafiles;multimediafiles,
-               --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.appearance,
-                       --palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.frames;frames,
-               --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.access,
-                       --palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.visibility;visibility,
-                       --palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.access;access,
-               --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.extended'
-);
-$GLOBALS['TCA']['tt_content']['types']['media'] = array(
-    'showitem' => '--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.general;general,
-                       --palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.header;header,
-               --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.media,
-                       pi_flexform,
-               --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.appearance,
-                       --palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.frames;frames,
-               --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.access,
-                       --palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.visibility;visibility,
-                       --palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.access;access,
-               --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.behaviour,
-                       bodytext;LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:tt_content.bodytext,
-               --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.extended'
-);
-$baseDefaultExtrasOfBodytext = '';
-if (!empty($GLOBALS['TCA']['tt_content']['columns']['bodytext']['defaultExtras'])) {
-    $baseDefaultExtrasOfBodytext = $GLOBALS['TCA']['tt_content']['columns']['bodytext']['defaultExtras'] . ':';
-}
-if (!is_array($GLOBALS['TCA']['tt_content']['types']['media']['columnsOverrides'])) {
-    $GLOBALS['TCA']['tt_content']['types']['media']['columnsOverrides'] = array();
-}
-if (!is_array($GLOBALS['TCA']['tt_content']['types']['media']['columnsOverrides']['bodytext'])) {
-    $GLOBALS['TCA']['tt_content']['types']['media']['columnsOverrides']['bodytext'] = array();
-}
-$GLOBALS['TCA']['tt_content']['types']['media']['columnsOverrides']['bodytext']['defaultExtras'] = $baseDefaultExtrasOfBodytext . 'richtext:rte_transform[mode=ts_css]';
-
-$GLOBALS['TCA']['tt_content']['palettes']['multimediafiles'] = array(
-    'showitem' => 'multimedia;LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:tt_content.multimedia_formlabel, bodytext;LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:tt_content.bodytext',
-);
-if (!is_array($GLOBALS['TCA']['tt_content']['types']['multimedia']['columnsOverrides'])) {
-    $GLOBALS['TCA']['tt_content']['types']['multimedia']['columnsOverrides'] = array();
-}
-if (!is_array($GLOBALS['TCA']['tt_content']['types']['multimedia']['columnsOverrides']['bodytext'])) {
-    $GLOBALS['TCA']['tt_content']['types']['multimedia']['columnsOverrides']['bodytext'] = array();
-}
-$GLOBALS['TCA']['tt_content']['types']['multimedia']['columnsOverrides']['bodytext']['defaultExtras'] = $baseDefaultExtrasOfBodytext . 'nowrap';
-
-
-// Add flexform
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('*', 'FILE:EXT:mediace/Configuration/FlexForms/media.xml', 'media');
diff --git a/typo3/sysext/mediace/Configuration/TypoScript/constants.txt b/typo3/sysext/mediace/Configuration/TypoScript/constants.txt
deleted file mode 100644 (file)
index 9e112eb..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-styles.content.media {
-    # cat=content/cMedia/j1; type=; label= Video Player: configure the path to the video player
-  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 = 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 = EXT:mediace/Resources/Contrib/flowplayer/flowplayer-3.2.18.swf
-}
diff --git a/typo3/sysext/mediace/Configuration/TypoScript/setup.txt b/typo3/sysext/mediace/Configuration/TypoScript/setup.txt
deleted file mode 100644 (file)
index b0b91c6..0000000
+++ /dev/null
@@ -1,192 +0,0 @@
-# ******************
-# CType: multimedia
-# ******************
-tt_content.multimedia = COA
-tt_content.multimedia {
-       10 = < lib.stdheader
-
-       20 = MULTIMEDIA
-       20.file.field = multimedia
-       20.file.wrap = uploads/media/
-       20.file.listNum = 0
-       20.params.field = bodytext
-
-       20.stdWrap {
-               editIcons = tt_content: multimedia, bodytext
-               editIcons.iconTitle.data = LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:editIcon.multimedia
-
-               prefixComment = 2 | Multimedia element:
-       }
-}
-
-# *****************
-# CType: swfobject
-# *****************
-tt_content.swfobject = COA
-tt_content.swfobject {
-       10 = < lib.stdheader
-
-       20 = SWFOBJECT
-       20 {
-               file =
-               width =
-               height =
-
-               flexParams.field = pi_flexform
-
-               alternativeContent.field = bodytext
-
-               layout = ###SWFOBJECT###
-
-               video {
-                       player = {$styles.content.media.videoPlayer}
-
-                       defaultWidth  = {$styles.content.media.defaultVideoWidth}
-                       defaultHeight  = {$styles.content.media.defaultVideoHeight}
-
-                       default {
-                               params.quality = high
-                               params.menu = false
-                               params.allowScriptAccess = sameDomain
-                               params.allowFullScreen = true
-                       }
-                       mapping {
-
-                       }
-               }
-
-               audio {
-                       player = {$styles.content.media.audioPlayer}
-
-                       defaultWidth = {$styles.content.media.defaultAudioWidth}
-                       defaultHeight = {$styles.content.media.defaultAudioHeight}
-
-                       default {
-                               params.quality = high
-                               params.allowScriptAccess = sameDomain
-                               params.menu = false
-                       }
-                       mapping {
-                               flashvars.file = soundFile
-                       }
-               }
-
-       }
-       20.stdWrap {
-               editIcons = tt_content: multimedia, imagewidth, imageheight, pi_flexform, bodytext
-               editIcons.iconTitle.data = LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:editIcon.multimedia
-
-               prefixComment = 2 | SWFobject element:
-       }
-}
-
-# *****************
-# CType: qtobject
-# *****************
-tt_content.qtobject = COA
-tt_content.qtobject {
-       10 = < lib.stdheader
-
-       20 = QTOBJECT
-       20 {
-               file =
-               width =
-               height =
-
-               flexParams.field = pi_flexform
-
-               alternativeContent.field = bodytext
-
-               layout = ###QTOBJECT###
-
-               video {
-                       player = {$styles.content.media.videoPlayer}
-
-                       defaultWidth  = {$styles.content.media.defaultVideoWidth}
-                       defaultHeight  = {$styles.content.media.defaultVideoHeight}
-
-                       default {
-                               params.quality = high
-                               params.menu = false
-                               params.allowScriptAccess = sameDomain
-                               params.allowFullScreen = true
-                       }
-                       mapping {
-
-                       }
-               }
-
-               audio {
-                       player = {$styles.content.media.audioPlayer}
-
-                       defaultWidth = {$styles.content.media.defaultAudioWidth}
-                       defaultHeight = {$styles.content.media.defaultAudioHeight}
-
-                       default {
-                               params.quality = high
-                               params.allowScriptAccess = sameDomain
-                               params.menu = false
-                       }
-                       mapping {
-                               flashvars.file = soundFile
-                       }
-               }
-       }
-       20.stdWrap {
-               editIcons = tt_content: multimedia, imagewidth, imageheight, pi_flexform, bodytext
-               editIcons.iconTitle.data = LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:editIcon.multimedia
-
-               prefixComment = 2 | QTobject element:
-       }
-}
-
-# *****************
-# CType: media
-# *****************
-tt_content.media = COA
-tt_content.media {
-       10 = < lib.stdheader
-
-       20 = MEDIA
-       20 {
-
-               flexParams.field = pi_flexform
-               alternativeContent < tt_content.text.20
-               alternativeContent.field = bodytext
-
-               type = video
-               renderType = auto
-               allowEmptyUrl = 0
-               forcePlayer = 1
-
-               fileExtHandler {
-                       default = MEDIA
-                       avi = MEDIA
-                       asf = MEDIA
-                       class = MEDIA
-                       wmv = MEDIA
-                       mp3 = SWF
-                       mp4 = SWF
-                       m4v = SWF
-                       swa = SWF
-                       flv = SWF
-                       swf = SWF
-                       mov = QT
-                       m4v = QT
-                       m4a = QT
-               }
-
-               mimeConf.swfobject < tt_content.swfobject.20
-               mimeConf.qtobject < tt_content.qtobject.20
-               mimeConf.flowplayer < tt_content.swfobject.20
-               mimeConf.flowplayer.audio.player = {$styles.content.media.flowPlayer}
-               mimeConf.flowplayer.video.player = {$styles.content.media.flowPlayer}
-
-       }
-       20.stdWrap {
-               editIcons = tt_content: pi_flexform, bodytext
-               editIcons.iconTitle.data = LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:editIcon.multimedia
-
-               prefixComment = 2 | Media element:
-       }
-}
diff --git a/typo3/sysext/mediace/Migrations/Code/ClassAliasMap.php b/typo3/sysext/mediace/Migrations/Code/ClassAliasMap.php
deleted file mode 100644 (file)
index 14af464..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-return array(
-    'TYPO3\\CMS\\Frontend\\ContentObject\\FlowplayerContentObject' => \FoT3\Mediace\ContentObject\FlowplayerContentObject::class,
-    'TYPO3\\CMS\\Frontend\\ContentObject\\MediaContentObject' => \FoT3\Mediace\ContentObject\MediaContentObject::class,
-    'TYPO3\\CMS\\Frontend\\ContentObject\\MultimediaContentObject' => \FoT3\Mediace\ContentObject\MultimediaContentObject::class,
-    'TYPO3\\CMS\\Frontend\\ContentObject\\QuicktimeObjectContentObject' => \FoT3\Mediace\ContentObject\QuicktimeObjectContentObject::class,
-    'TYPO3\\CMS\\Frontend\\ContentObject\\ShockwaveFlashObjectContentObject' => \FoT3\Mediace\ContentObject\ShockwaveFlashObjectContentObject::class,
-    'TYPO3\\CMS\\Frontend\\MediaWizard\MediaWizardProvider' => \FoT3\Mediace\MediaWizard\MediaWizardProvider::class,
-    'TYPO3\\CMS\\Frontend\\MediaWizard\MediaWizardProviderInterface' => \FoT3\Mediace\MediaWizard\MediaWizardProviderInterface::class,
-    'TYPO3\\CMS\\Frontend\\MediaWizard\MediaWizardProviderManager' => \FoT3\Mediace\MediaWizard\MediaWizardProviderManager::class,
-    'TYPO3\\CMS\\Mediace\\ContentObject\\FlowplayerContentObject' => \FoT3\Mediace\ContentObject\FlowplayerContentObject::class,
-    'TYPO3\\CMS\\Mediace\\ContentObject\\MediaContentObject' => \FoT3\Mediace\ContentObject\MediaContentObject::class,
-    'TYPO3\\CMS\\Mediace\\ContentObject\\MultimediaContentObject' => \FoT3\Mediace\ContentObject\MultimediaContentObject::class,
-    'TYPO3\\CMS\\Mediace\\ContentObject\\QuicktimeObjectContentObject' => \FoT3\Mediace\ContentObject\QuicktimeObjectContentObject::class,
-    'TYPO3\\CMS\\Mediace\\ContentObject\\ShockwaveFlashObjectContentObject' => \FoT3\Mediace\ContentObject\ShockwaveFlashObjectContentObject::class,
-    'TYPO3\\CMS\\Mediace\\Hooks\\PageLayoutView\\MultimediaPreviewRenderer' => \FoT3\Mediace\Hooks\PageLayoutView\MultimediaPreviewRenderer::class,
-    'TYPO3\\CMS\\Mediace\\MediaWizard\MediaWizardProvider' => \FoT3\Mediace\MediaWizard\MediaWizardProvider::class,
-    'TYPO3\\CMS\\Mediace\\MediaWizard\MediaWizardProviderInterface' => \FoT3\Mediace\MediaWizard\MediaWizardProviderInterface::class,
-    'TYPO3\\CMS\\Mediace\\MediaWizard\MediaWizardProviderManager' => \FoT3\Mediace\MediaWizard\MediaWizardProviderManager::class,
-    'tslib_content_FlowPlayer' => \FoT3\Mediace\ContentObject\FlowPlayerContentObject::class,
-    'tslib_content_Media' => \FoT3\Mediace\ContentObject\MediaContentObject::class,
-    'tslib_content_Multimedia' => \FoT3\Mediace\ContentObject\MultimediaContentObject::class,
-    'tslib_content_QuicktimeObject' => \FoT3\Mediace\ContentObject\QuicktimeObjectContentObject::class,
-    'tslib_content_ShockwaveFlashObject' => \FoT3\Mediace\ContentObject\ShockwaveFlashObjectContentObject::class,
-    'tslib_mediaWizardCoreProvider' => \FoT3\Mediace\MediaWizard\MediaWizardProvider::class,
-    'tslib_mediaWizardProvider' => \FoT3\Mediace\MediaWizard\MediaWizardProviderInterface::class,
-    'tslib_mediaWizardManager' => \FoT3\Mediace\MediaWizard\MediaWizardProviderManager::class,
-);
diff --git a/typo3/sysext/mediace/Migrations/Code/LegacyClassesForIde.php b/typo3/sysext/mediace/Migrations/Code/LegacyClassesForIde.php
deleted file mode 100644 (file)
index fe41608..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-die('Access denied');
-/**
- * @deprecated since 6.0, removed since 7.0
- */
-class tslib_content_FlowPlayer extends \FoT3\Mediace\ContentObject\FlowPlayerContentObject
-{
-}
-
-/**
- * @deprecated since 6.0, removed since 7.0
- */
-class tslib_content_Media extends \FoT3\Mediace\ContentObject\MediaContentObject
-{
-}
-
-/**
- * @deprecated since 6.0, removed since 7.0
- */
-class tslib_content_Multimedia extends \FoT3\Mediace\ContentObject\MultimediaContentObject
-{
-}
-
-/**
- * @deprecated since 6.0, removed since 7.0
- */
-class tslib_content_QuicktimeObject extends \FoT3\Mediace\ContentObject\QuicktimeObjectContentObject
-{
-}
-
-/**
- * @deprecated since 6.0, removed since 7.0
- */
-class tslib_content_ShockwaveFlashObject extends \FoT3\Mediace\ContentObject\ShockwaveFlashObjectContentObject
-{
-}
-
-/**
- * @deprecated since 6.0, removed since 7.0
- */
-class tslib_mediaWizardCoreProvider extends \FoT3\Mediace\MediaWizard\MediaWizardProvider
-{
-}
-
-/**
- * @deprecated since 6.0, removed since 7.0
- */
-interface tslib_mediaWizardProvider extends \FoT3\Mediace\MediaWizard\MediaWizardProviderInterface
-{
-}
-
-/**
- * @deprecated since 6.0, removed since 7.0
- */
-class tslib_mediaWizardManager extends \FoT3\Mediace\MediaWizard\MediaWizardProviderManager
-{
-}
diff --git a/typo3/sysext/mediace/Resources/Contrib/flashmedia/flvplayer.swf b/typo3/sysext/mediace/Resources/Contrib/flashmedia/flvplayer.swf
deleted file mode 100644 (file)
index 8e89470..0000000
Binary files a/typo3/sysext/mediace/Resources/Contrib/flashmedia/flvplayer.swf and /dev/null differ
diff --git a/typo3/sysext/mediace/Resources/Contrib/flashmedia/player.license.txt b/typo3/sysext/mediace/Resources/Contrib/flashmedia/player.license.txt
deleted file mode 100644 (file)
index c0fbd54..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2010 Martin Laine
-
-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
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
diff --git a/typo3/sysext/mediace/Resources/Contrib/flashmedia/player.readme.txt b/typo3/sysext/mediace/Resources/Contrib/flashmedia/player.readme.txt
deleted file mode 100644 (file)
index 6a36036..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-=== 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/sysext/mediace/Resources/Contrib/flashmedia/player.swf b/typo3/sysext/mediace/Resources/Contrib/flashmedia/player.swf
deleted file mode 100644 (file)
index bf05ee5..0000000
Binary files a/typo3/sysext/mediace/Resources/Contrib/flashmedia/player.swf and /dev/null differ
diff --git a/typo3/sysext/mediace/Resources/Contrib/flashmedia/qtobject/qtobject.js b/typo3/sysext/mediace/Resources/Contrib/flashmedia/qtobject/qtobject.js
deleted file mode 100644 (file)
index f5173c4..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * QTObject embed
- * http://blog.deconcept.com/2005/01/26/web-standards-compliant-javascript-quicktime-detect-and-embed/
- *
- * by Geoff Stearns (geoff@deconcept.com, http://www.deconcept.com/)
- *
- * v1.0.2 - 02-16-2005
- *
- * Embeds a quicktime movie to the page, includes plugin detection
- *
- * Usage:
- *
- *     myQTObject = new QTObject("path/to/mov.mov", "movid", "width", "height");
- *     myQTObject.altTxt = "Upgrade your Quicktime Player!";    // optional
-
- *  myQTObject.addParam("controller", "false");              // optional
- *     myQTObject.write();
- *
- */
-
-QTObject = function(mov, id, w, h) {
-       this.mov = mov;
-       this.id = id;
-       this.width = w;
-       this.height = h;
-       this.redirect = "";
-       this.sq = document.location.search.split("?")[1] || "";
-       this.altTxt = "This content requires the QuickTime Plugin. <a href='http://www.apple.com/quicktime/download/'>Download QuickTime Player</a>.";
-       this.bypassTxt = "<p>Already have QuickTime Player? <a href='?detectqt=false&"+ this.sq +"'>Click here.</a></p>";
-       this.params = new Object();
-       this.doDetect = getQueryParamValue('detectqt');
-}
-
-QTObject.prototype.addParam = function(name, value) {
-       this.params[name] = value;
-}
-
-QTObject.prototype.getParams = function() {
-    return this.params;
-}
-
-QTObject.prototype.getParam = function(name) {
-    return this.params[name];
-}
-
-QTObject.prototype.getParamTags = function() {
-    var paramTags = "";
-    for (var param in this.getParams()) {
-        paramTags += '<param name="' + param + '" value="' + this.getParam(param) + '" />';
-    }
-    if (paramTags == "") {
-        paramTags = null;
-    }
-    return paramTags;
-}
-
-QTObject.prototype.getHTML = function() {
-    var qtHTML = "";
-       if (navigator.plugins && navigator.plugins.length) { // not ie
-        qtHTML += '<embed type="video/quicktime" src="' + this.mov + '" width="' + this.width + '" height="' + this.height + '" id="' + this.id + '"';
-        for (var param in this.getParams()) {
-            qtHTML += ' ' + param + '="' + this.getParam(param) + '"';
-        }
-        qtHTML += '></embed>';
-    }
-    else { // pc ie
-        qtHTML += '<object classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" width="' + this.width + '" height="' + this.height + '" id="' + this.id + '">';
-        this.addParam("src", this.mov);
-        if (this.getParamTags() != null) {
-            qtHTML += this.getParamTags();
-        }
-        qtHTML += '</object>';
-    }
-    return qtHTML;
-}
-
-
-QTObject.prototype.getVariablePairs = function() {
-    var variablePairs = new Array();
-    for (var name in this.getVariables()) {
-        variablePairs.push(name + "=" + escape(this.getVariable(name)));
-    }
-    if (variablePairs.length > 0) {
-        return variablePairs.join("&");
-    }
-    else {
-        return null;
-    }
-}
-
-QTObject.prototype.write = function(elementId) {
-       if(isQTInstalled() || this.doDetect=='false') {
-               if (elementId) {
-                       document.getElementById(elementId).innerHTML = this.getHTML();
-               } else {
-                       document.write(this.getHTML());
-               }
-       } else {
-               if (this.redirect != "") {
-                       document.location.replace(this.redirect);
-               } else {
-                       if (elementId) {
-                               document.getElementById(elementId).innerHTML = this.altTxt +""+ this.bypassTxt;
-                       } else {
-                               document.write(this.altTxt +""+ this.bypassTxt);
-                       }
-               }
-       }
-}
-
-function isQTInstalled() {
-       var qtInstalled = false;
-       qtObj = false;
-       if (navigator.plugins && navigator.plugins.length) {
-               for (var i=0; i < navigator.plugins.length; i++ ) {
-         var plugin = navigator.plugins[i];
-         if (plugin.name.indexOf("QuickTime") > -1) {
-                       qtInstalled = true;
-         }
-      }
-       } else {
-               execScript('on error resume next: qtObj = IsObject(CreateObject("QuickTimeCheckObject.QuickTimeCheck.1"))','VBScript');
-               qtInstalled = qtObj;
-       }
-       return qtInstalled;
-}
-
-/* get value of querystring param */
-function getQueryParamValue(param) {
-       var q = document.location.search;
-       var detectIndex = q.indexOf(param);
-       var endIndex = (q.indexOf("&", detectIndex) != -1) ? q.indexOf("&", detectIndex) : q.length;
-       if(q.length > 1 && detectIndex != -1) {
-               return q.substring(q.indexOf("=", detectIndex)+1, endIndex);
-       } else {
-               return "";
-       }
-}
diff --git a/typo3/sysext/mediace/Resources/Contrib/flashmedia/src/doc_core_mediace.sxw b/typo3/sysext/mediace/Resources/Contrib/flashmedia/src/doc_core_mediace.sxw
deleted file mode 100644 (file)
index 889f037..0000000
Binary files a/typo3/sysext/mediace/Resources/Contrib/flashmedia/src/doc_core_mediace.sxw and /dev/null differ
diff --git a/typo3/sysext/mediace/Resources/Contrib/flashmedia/src/flvplayer.as b/typo3/sysext/mediace/Resources/Contrib/flashmedia/src/flvplayer.as
deleted file mode 100644 (file)
index 76497d3..0000000
+++ /dev/null
@@ -1,424 +0,0 @@
-//--------------------------------------------------------------------------
-// initial variables that might be useful to change
-//--------------------------------------------------------------------------
-
-// Stage variables
-
-Stage.scaleMode = "noScale";
-Stage.align = "TL";
-
-// Add link to rightclick menu
-
-var newMenu:ContextMenu = new ContextMenu();
-newMenu.hideBuiltInItems();
-newMenu.customItems.push(new ContextMenuItem("TYPO3 Media Player...",goTo));
-this.menu = newMenu;
-function goTo() { getURL("http://typo3.org"); };
-
-//_root.allowFullScreen = "true";
-var screenMode:String = 'normal';
-
-function fullScreen()
-{
-       if(screenMode == 'normal')
-       {
-      Stage["displayState"] = "fullScreen";
-         screenMode = 'full';
-       }
-       else
-       {
-               Stage["displayState"] = "normal";
-               screenMode = 'normal';
-       }
-}
-
-var stageSize:Object = new Object();
-stageSize.onResize = function()
-{
-    w = Stage.width;
- h = Stage.height;
- setDims(w,h);
-}
-Stage.addListener(stageSize);
-
-
-if(_root.previewSeek == 'true')
-{
- makePre = true;
-}
-else
-{
- makePre = false;
-}
-
-
-// toggle for which file to play if none was set in html
-// you can change the 'test.flv' in your filename
-if(!_root.file) {
-       file = "video.flv";
-} else {
-       file = _root.file;
-}
-
-// toggle for autostarting the video
-// you can change the 'true' in 'false'
-if(_root.autoPlay == "true") {
-       autoStart = true;
-} else {
-       autoStart = false;
-}
-
-if(!_root.smoothing) {
-       smoothing = true;
-} else {
-       smoothing = _root.smoothing;
-}
-if(!_root.deblocking) {
-       deblocking = 5;
-} else {
-       deblocking = _root.deblocking;
-}
-if(!_root.volume) {
-       volume = 80;
-} else {
-       volume = _root.volume;
-}
-if(!_root.prebuffer) {
-       prebuffer = 5;
-} else {
-       prebuffer = _root.prebuffer;
-}
-if(!_root.preview || _root.preview == "true") {
-       preview = true;
-}
-if(!_root.previewSeek) {
-       previewSeek = 0.1
-} else {
-       previewSeek = _root.previewSeek
-}
-
-if (!_root.clickAlpha) {
-       clickAlpha = 65;
-} else {
-       clickAlpha = _root.clickAlpha;
-}
-
-if (!_root.clickText) {
-       clickText = "";
-} else {
-       clickText = _root.clickText;
-}
-
-// toggle for the width and height of the video
-// you can change them to the width and height you want
-w = Stage.width;
-h = Stage.height;
-
-//--------------------------------------------------------------------------
-// stream setup and functions
-//--------------------------------------------------------------------------
-
-// create and set netstream
-nc = new NetConnection();
-nc.connect(null);
-ns = new NetStream(nc);
-ns.setBufferTime(2);
-
-// create and set sound object
-this.createEmptyMovieClip("snd", 0);
-snd.attachAudio(ns);
-audio = new Sound(snd);
-
-//attach videodisplay
-videoDisplay.attachVideo(ns);
-
-// Retrieve duration meta data from netstream
-ns.onMetaData = function(obj) {
-       this.totalTime = obj.duration;
-       // these three lines were used for automatically sizing
-       // it is now done by sizing the video to stage dimensions
-       // if(obj.height > 0 && obj.height < Stage.height-20) {
-       // setDims(obj.width, obj.height);
-       // }
-};
-
-// retrieve status messages from netstream
-ns.onStatus = function(object) {
-       if(object.code == "NetStream.Play.Stop") {
-               // rewind and pause on when movie is finished
-               ns.seek(0);
-               if(_root.repeat == "true") {
-                       return;
-               }
-               if(preview) {
-                       ns.seek(previewSeek);
-               }
-               ns.pause();
-               playBut._visible = true;
-               pauseBut._visible = false;
-               if (!preview) {
-                       videoDisplay._visible = false;
-               }
-               showClick(true);
-       }
-       if (info.code == "NetStream.Buffer.Full") {
-       if(makePre) {
-                       ns.seek(previewSeek);
-                       makePre = false;
-    }
-   }
-};
-
-
-//--------------------------------------------------------------------------
-// controlbar functionality
-//--------------------------------------------------------------------------
-
-function showClick(show) {
-       if (show) {
-               if (_root.click) {
-                       if (!alignedClick) {
-                               clickImage.loadMovie(_root.click);
-                               clickImage._alpha = clickAlpha;
-                       }
-                       clickImage._visible = true;
-               } else {
-                       playText.text = clickText;
-               }
-       } else {
-               if (playText.text.length) {
-                       playText.text = "";
-               }
-               if (clickImage._visible) {
-                       clickImage._visible = false;
-               }
-       }
-}
-
-// play the movie and hide playbutton
-function playMovie() {
-       if(!isStarted) {
-               audio.setVolume(volume);
-               ns.setBufferTime(prebuffer);
-               ns.play(file);
-               isStarted = true;
-       } else {
-               showClick(false);
-               ns.pause();
-       }
-       pauseBut._visible = true;
-       playBut._visible = false;
-       videoDisplay._visible = true;
-}
-
-// pause the movie and hide pausebutton
-function pauseMovie() {
-       ns.pause();
-       playBut._visible = true;
-       pauseBut._visible = false;
-};
-
-// video click action
-videoBg.onPress = function() {
-       if(pauseBut._visible == false) {
-               playMovie();
-       } else {
-               pauseMovie();
-       }
-};
-
-// pause button action
-pauseBut.onPress = function() {
-       pauseMovie();
-};
-
-// play button action
-playBut.onPress = function() {
-       playMovie();
-};
-
-// file load progress
-progressBar.onEnterFrame = function() {
-       if (isStarted) {
-               loaded = this._parent.ns.bytesLoaded;
-               total = this._parent.ns.bytesTotal;
-               if (loaded == total && loaded > 1000) {
-                       this.loa._xscale = 100;
-                       delete this.onEnterFrame;
-               } else {
-                       this.loa._xscale = int(loaded/total*100);
-               }
-       }
-};
-
-// play progress function
-progressBar.tme.onEnterFrame = function() {
-       if (isStarted) {
-               this._xscale = ns.time/ns.totalTime*100;
-
-               if (bufferPercent != -1) {
-                       if (!bufferPercent) {
-                               showClick(false);
-                       }
-                       bufferPercent = int(ns.bufferLength/ns.bufferTime*100);
-                       if (bufferPercent >= 100) {
-                               playText.text = "";
-                               bufferPercent = -1;
-                       } else {
-                               playText.text = "buffering .. " + bufferPercent + "%";
-                       }
-               }
-       } else if (inPreview && ns.time > 0) {
-               ns.close();
-               inPreview = false;
-       }
-
-       if (clickImage._width && !alignedClick) {
-               clickImage._x = (videoDisplay._width - clickImage._width) / 2;
-               clickImage._y = (videoDisplay._height - clickImage._height) / 2;
-               alignedClick = true;
-       }
-};
-
-// start playhead scrubbing
-progressBar.loa.onPress = function() {
-       this.onEnterFrame = function() {
-               scl = (this._xmouse/this._width)*(this._xscale/100)*(this._xscale/100);
-               if(scl < 0.02) { scl = 0; }
-               ns.seek(scl*ns.totalTime);
-               if (isStarted) {
-                       showClick(false);
-               }
-       };
-};
-
-// stop playhead scrubbing
-progressBar.loa.onRelease = progressBar.loa.onReleaseOutside = function () {
-       delete this.onEnterFrame;
-       pauseBut._visible == false ? videoDisplay.pause() : null;
-};
-
-
-// fullscreen
-if(_root.allowFullScreen == "true") {
-       FSBut.onPress = function() {
-               fullScreen();
-       };
-} else if (_root.fs == "true") {
-       FSBut.onPress = function() {
-               getURL("javascript: history.go(-1)");
-       };
-}
-
-
-
-// volume scrubbing
-volumeBar.back.onPress = function() {
-       this.onEnterFrame = function() {
-               var xm = this._xmouse;
-               if(xm>=0 && xm <= 20) {
-                       this._parent.mask._width = this._xmouse;
-                       this._parent._parent.audio.setVolume(this._xmouse*5);
-               }
-       };
-}
-volumeBar.back.onRelease = volumeBar.back.onReleaseOutside = function() {
-       delete this.onEnterFrame;
-}
-
-volumeBar.icn.onPress = function() {
-       if (volumeBar.mute._visible) {
-               setVolume(volume);
-       } else {
-               volume = audio.getVolume();
-               setVolume(0);
-       }
-}
-
-function setVolume(vol) {
-       audio.setVolume(vol);
-       volumeBar.mask._width = vol/5;
-       if (vol > 0 && volumeBar.mute._visible) {
-               volumeBar.mute._visible = false;
-       } else if (!vol && !volumeBar.mute._visible) {
-               volumeBar.mute._visible = true;
-       }
-}
-
-setVolume(volume);
-
-
-//--------------------------------------------------------------------------
-// resize and position all items
-//--------------------------------------------------------------------------
-function setDims(w,h) {
-       // set videodisplay dimensions
-       videoDisplay._width = videoBg._width = w;
-       videoDisplay._height = videoBg._height = h-20;
-       playText1._x = w/2-120;
-       playText1._y = h/2-20;
-       playText2._x = playText1._x + 1;
-       playText2._y = playText1._y + 1;
-
-       // resize the controlbar items ..
-       if(_root.fs == "true") {
-               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;
-               progressBar._x = w/2-133;
-               progressBar._width = 228;
-               FSBut._x = w/2+95;
-               volumeBar._x = w/2+112;
-               videoDisplay._height = h;
-       } else {
-               colorBar._y = playBut._y = pauseBut._y = progressBar._y = FSBut._y = volumeBar._y = h-18;
-               progressBar._width = w-56;
-               colorBar._width = w;
-               volumeBar._x = w-38;
-               if(_root.allowFullScreen == "true") {
-                       FSBut._visible = true;
-                       progressBar._width -=17;
-                       FSBut._x = w-55;
-               } else {
-                       FSBut._visible = false;
-               }
-       }
-}
-
-// here you can ovverride the dimensions of the video
-setDims(w,h);
-
-
-//--------------------------------------------------------------------------
-// all done ? start the movie !
-//--------------------------------------------------------------------------
-
-// start playing the movie
-// if no autoStart it searches for a placeholder jpg
-// and hides the pauseBut
-
-pauseBut._visible = false;
-videoDisplay.smoothing = smoothing;
-videoDisplay.deblocking = deblocking;
-if (autoStart == true) {
-       playMovie();
-} else {
-       showClick(true);
-       if (preview) {
-               inPreview = true;
-               audio.setVolume(0);
-               ns.play(file);
-               ns.seek(previewSeek);
-       } else {
-               if(_root.image) {
-                       imageStr = _root.image;
-               } else {
-                       imageStr = file.substring(0,file.length-3)+"jpg";
-                       if (imageStr.substring(0,2) == "..") {
-                               imageStr = imageStr.substring(3);
-                       }
-               }
-               imageClip.loadMovie(imageStr);
-       }
-}
diff --git a/typo3/sysext/mediace/Resources/Contrib/flashmedia/src/flvplayer.fla b/typo3/sysext/mediace/Resources/Contrib/flashmedia/src/flvplayer.fla
deleted file mode 100644 (file)
index 9c06714..0000000
Binary files a/typo3/sysext/mediace/Resources/Contrib/flashmedia/src/flvplayer.fla and /dev/null differ
diff --git a/typo3/sysext/mediace/Resources/Contrib/flashmedia/swfobject/expressInstall.swf b/typo3/sysext/mediace/Resources/Contrib/flashmedia/swfobject/expressInstall.swf
deleted file mode 100644 (file)
index 0fbf8fc..0000000
Binary files a/typo3/sysext/mediace/Resources/Contrib/flashmedia/swfobject/expressInstall.swf and /dev/null differ
diff --git a/typo3/sysext/mediace/Resources/Contrib/flashmedia/swfobject/swfobject.js b/typo3/sysext/mediace/Resources/Contrib/flashmedia/swfobject/swfobject.js
deleted file mode 100644 (file)
index acc7da4..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-/*     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/sysext/mediace/Resources/Contrib/flowplayer/LICENSE-exception.txt b/typo3/sysext/mediace/Resources/Contrib/flowplayer/LICENSE-exception.txt
deleted file mode 100644 (file)
index f166863..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-Return-Path: <anssip@gmail.com>
-Message-ID: <4EB24F4B.9010707@gmail.com>
-Date: Thu, 03 Nov 2011 10:22:35 +0200
-From: Anssi Piirainen <anssip@gmail.com>
-To: Oliver Hader <oliver.hader@typo3.org>
-CC: info@flowplayer.org
-Subject: Re: Flowplayer: Question on GPLv3/GPLv2 FLOSS Exception
-References: <4EB12708.8030406@typo3.org>
-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
-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
-Sencha does.
-
-Regards,
-Anssi
diff --git a/typo3/sysext/mediace/Resources/Contrib/flowplayer/LICENSE.txt b/typo3/sysext/mediace/Resources/Contrib/flowplayer/LICENSE.txt
deleted file mode 100644 (file)
index 2a00962..0000000
+++ /dev/null
@@ -1,721 +0,0 @@
-The Flowplayer Free version is released under the
-GNU GENERAL PUBLIC LICENSE Version 3 (GPL).
-
-The GPL requires that you not remove the Flowplayer copyright notices
-from the user interface. See section 5.d below.
-
-Commercial licenses are available. The commercial player version
-does not require any Flowplayer notices or texts and also provides
-some additional features.
-
-========================================================================
-
-ADDITIONAL TERM per GPL Section 7
-If you convey this program (or any modifications of it) and assume
-contractual liability for the program to recipients of it, you agree
-to indemnify Flowplayer, Ltd. for any liability that those contractual
-assumptions impose on Flowplayer, Ltd.
-
-Except as expressly provided herein, no trademark rights are granted in
-any trademarks of Flowplayer, Ltd. Licensees are granted a limited,
-non-exclusive right to use the mark Flowplayer and the Flowplayer logos
-in connection with unmodified copies of the Program and the copyright
-notices required by section 5.d of the GPL license. For the purposes
-of this limited trademark license grant, customizing the Flowplayer
-by skinning, scripting, or including PlugIns provided by Flowplayer, Ltd.
-is not considered modifying the Program.
-
-Licensees that do modify the Program, taking advantage of the open-source
-license, may not use the Flowplayer mark or Flowplayer logos and must
-change the fullscreen notice (and the non-fullscreen notice, if that
-option is enabled), the copyright notice in the dialog box, and the
-notice on the Canvas as follows:
-
-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. 
-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
-Program a new name that is not confusingly similar to Flowplayer and
-may not distribute it under the name Flowplayer.
-
-========================================================================
-
-
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program 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.
-
-    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
\ No newline at end of file
diff --git a/typo3/sysext/mediace/Resources/Contrib/flowplayer/LICENSE_COMMERCIAL.txt b/typo3/sysext/mediace/Resources/Contrib/flowplayer/LICENSE_COMMERCIAL.txt
deleted file mode 100644 (file)
index e3b5a2a..0000000
+++ /dev/null
@@ -1,166 +0,0 @@
-FLOWPLAYER COMMERCIAL LICENSE version 0.1
-==========================================
-Copyright (c) 2008 Flowplayer Ltd, all rights reserved
-
-Please read this License carefully before using, downloading or installing
-the Software (Flowplayer, as defined below). By using, downloading or
-installing the Software, Licensee is agreeing to be bound by this License
-and the licenses granted hereunder are subject to compliance with any and
-all terms of this License. IF YOU DO NOT ACCEPT THE TERMS AND CONDITIONS
-OF THIS LICENSE, DO NOT USE, DOWNLOAD, INSTALL OR DISTRIBUTE ANY OF THE
-LICENSED SOFTWARE.
-
-Terms and definitions
-=====================
-
-"Software" means the licensed Flowplayer software
-
-"Adaptation" means a derivative work based upon the Licensed Software resulting
-from any addition to, editing of or deletion from the substance or structure of the
-original source code or a compiled version of the Licensed Software or any previous
-Adaptations or a work that programmatically interacts with the Licensed Software.
-
-"Licensed Software" means the same as Software.
-
-"License" means this document.
-
-"Licensor" means Flowplayer Ltd.
-
-"License Key" means an alphanumeric key that is used to activate the Sofware. The License
-Key is provided by Licensor.
-
-"Licensee" means an individual or entity exercising rights under and complying with the
-terms of this License who has not previously violated the terms of this License with respect
-to the Software, or who has received express permission from the Licensor to exercise rights
-under this License despite a previous violation.
-
-License Grant
-=============
-Licensor hereby grants the Licensee a non-exclusive, non-transferable, non-assignable license,
-without the right to sublicense to: Access, display, integrate and use the Software in one
-(1) Internet domain that has been registered with Licensor. Licensor provides a license key
-that is tied to the domain name; and Make an Adaptation and access, display and integrate
-it in the one (1) Internet domain that has been registered with Licensor. The Adaptation must
-not remove the License Key logic from the Software so that the Adaptation only functions if a
-valid license key has been configured for it.
-
-Licensor hereby grants the Licensee a non-exclusive, worldwide, royalty-free, non-transferable,
-non-assignable patent license, without the right to sublicense, under any patent rights
-the Licensor holds in the Software to use, run, and modify the Software in the one (1) Internet
-domain that has been registered with Licensor, provided that any Adaptation made to the Software
-does not remove the License Key logic from the Software so that the Adaptation only functions
-if a valid license key has been configured for it.
-
-All rights not expressly granted by this Agreement are expressly reserved by Licensor.
-
-Applicability of License
-========================
-
-This License applies to the Software version purchased by the Licensee.
-Additional later versions released by the Licensor are not part of this License.
-
-Protection of Licensed Software
-===============================
-
-Except as specifically set forth herein or as otherwise agreed to between Licensor and Licensee,
-Licensee shall not have the right to copy, relicense, sell, lease, transfer, encumber, assign
-or make available for public use the Software. Any attempt to take any such actions is void,
-and will automatically terminate your rights under this License.
-
-Licensee shall use its best efforts to ensure that no unauthorized copy of the Licensed Programs
-shall be made, in whole or in part, in any form.  Licensee shall prohibit all users of the Software
-from modifying, reverse-engineering or disassembling any part of the Software.  All rights not
-expressly granted by Licensor are hereby reserved.
-
-Effective Date
-==============
-
-The rights and licenses granted hereunder shall commence on the date any of the Software are
-electronically delivered to Licensee.  Licensor agrees to make the Software available for
-electronic delivery to Licensee promptly after receipt by Licensor of the License Fee. For
-purposes of this Agreement, the License Fee means the amount of money required to be paid
-by Licensee to Licensor for legal usage of the Software under the terms of this agreement.
-
-Termination of the license
-==========================
-
-This license is subject to termination by Licensor at any time if (a) Licensee violates any terms
-of this License, (b) Licensor has a reasonable basis to believe that Licensee's business is
-impairing Licensor's business.
-
-Ownership of Intellectual Property
-==================================
-
-Licensor is the sole owner of all intellectual property rights pertaining to the Licensed Software.
-Licensor reserves all rights not expressly granted herein.
-
-NO WARRANTY
-===========
-
-TO THE FULLEST EXTENT PERMISSIBLE UNDER APPLICABLE LAW, THE LICENSED SOFTWARE IS PROVIDED TO YOU "AS IS,"
-WITH ALL FAULTS, WITHOUT WARRANTY OF ANY KIND, AND YOUR USE IS AT YOUR SOLE RISK. THE ENTIRE RISK
-OF SATISFACTORY QUALITY AND PERFORMANCE RESIDES WITH YOU. LICENSOR DISCLAIMS ANY AND ALL EXPRESS,
-IMPLIED OR STATUTORY WARRANTIES, INCLUDING IMPLIED WARRANTIES OF MERCHANTABILITY, SATISFACTORY QUALITY,
-FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT OF THIRD PARTY RIGHTS, ANY WARRANTIES OR CONDITIONS
-OF TITLE, AND WARRANTIES (IF ANY) ARISING FROM A COURSE OF DEALING, USAGE, OR TRADE PRACTICE. LICENSOR
-DOES NOT WARRANT AGAINST INTERFERENCE WITH YOUR ENJOYMENT OF THE PROGRAM; THAT THE PROGRAM WILL MEET
-YOUR REQUIREMENTS; THAT OPERATION OF THE PROGRAM WILL BE UNINTERRUPTED OR ERROR-FREE, OR THAT THE PROGRAM
-WILL BE COMPATIBLE WITH THIRD PARTY SOFTWARE OR THAT ANY ERRORS IN THE PROGRAM WILL BE CORRECTED. NO ORAL
-OR WRITTEN ADVICE PROVIDED BY LICENSOR OR ANY AUTHORIZED REPRESENTATIVE SHALL CREATE A WARRANTY. SOME
-JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF OR LIMITATIONS ON IMPLIED WARRANTIES OR THE LIMITATIONS
-ON THE APPLICABLE STATUTORY RIGHTS OF A CONSUMER, SO SOME OR ALL OF THE ABOVE EXCLUSIONS AND LIMITATIONS
-MAY NOT APPLY TO YOU. LICENSEE IS SOLELY RESPONSIBLE FOR DETERMINING THE APPROPRIATENESS OF USING AND
-DISTRIBUTING THE LICENSED SOFTWARE AND ASSUMES ALL RISKS ASSOCIATED WITH ITS EXERCISE OF RIGHTS UNDER
-THIS AGREEMENT, INCLUDING BUT NOT LIMITED TO THE RISKS AND COSTS OF PROGRAM ERRORS, COMPLIANCE WITH
-APPLICABLE LAWS, DAMAGE TO OR LOSS OF DATA, PROGRAMS OR EQUIPMENT, SUITABILITY FOR HOSTING AND
-UNAVAILABILITY OR INTERRUPTION OF OPERATIONS.
-
-Limitation of Liability
-=======================
-Except to the extent required by applicable law, THE CUMULATIVE, AGGREGATE LIABILITY OF LICENSOR
-TO LICENSEE FOR ALL CLAIMS RELATED TO THE LICENSED SOFTWARE AND THIS AGREEMENT, WILL NOT EXCEED
-THE TOTAL AMOUNT OF ALL LICENSE FEES PAID TO LICENSOR HEREUNDER. LICENSOR WILL NOT IN ANY CASE
-BE LIABLE FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, INDIRECT, PUNITIVE, OR EXEMPLARY DAMAGES
-ARISING IN ANY WAY OUT OF THE USE OF THE PRODUCT, THE SERVICES OR THIS AGREEMENT, INCLUDING
-WITHOUT LIMITATION, DAMAGES FOR LOST PROFIT, LOST REVENUE, LOSS OF USE, LOSS OF DATA, COSTS
-OF RECREATING LOST DATA, THE COST OF ANY SUBSTITUTE EQUIPMENT, PROGRAM, OR DATA, OR CLAIMS
-BY ANY THIRD PARTY, INCLUDING WITH LIMITATION THIRD PARTY CLAIMS OF INFRINGEMENT OF INTELLECTUAL
-PROPERTY RIGHTS, INFRINGEMENT OF COPYRIGHT, TRADEMARK, PATENT, OR TRADE SECRETS. LICENSEE'S
-SOLE AND EXCLUSIVE REMEDY IS SET FORTH IN THIS AGREEMENT. THE LIMITATION ON DAMAGES SET FORTH
-IN SECTION WILL NOT APPLY TO INDEMNIFICATION OBLIGATIONS OR BREACHES BY LICENSEE.
-
-Indemnity
-=========
-Licensee shall indemnify Licensor, its employees, officers, licensees and agents for all damages,
-costs and expenses, including, without limitation, attorneys’ fees, arising from any claims arising
-as a result of Licensee’s use of the Licensed Software, either as provided or as Adapted by Licensee.
-
-Export
-======
-Licensee agrees and certifies that it will not export or re-export, directly or indirectly, the Licensed
-Software contrary to the laws of the United States or any other country.
-
-Severability
-============
-If for any reason a court of competent jurisdiction finds any provision of this License or portion
-thereof, to be unenforceable, that provision of the License shall be enforced to the maximum extent
-permissible so as to affect the intent of the parties, and the remainder of this License shall
-continue in full force and effect.
-
-Governing Law
-=============
-This License shall be governed by the laws of Finland. Any disputes arising under this License
-shall be heard in the city of Espoo, Finland.
-
-Complete Agreement
-===================
-This License constitutes the entire agreement between Licensor and Licensee with respect to the
-use of the Licensed Software and supersedes all prior or contemporaneous understandings
-or agreements, written or oral, regarding such subject matter. No one other than Licensor
-has the right to modify or amend this License.
-
-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/sysext/mediace/Resources/Contrib/flowplayer/LICENSE_MULTIDOMAIN.txt b/typo3/sysext/mediace/Resources/Contrib/flowplayer/LICENSE_MULTIDOMAIN.txt
deleted file mode 100644 (file)
index 614a82d..0000000
+++ /dev/null
@@ -1,171 +0,0 @@
-FLOWPLAYER MULTIDOMAIN LICENSE version 0.1
-==========================================
-Copyright (c) 2008 Flowplayer Ltd, all rights reserved
-
-Please read this License carefully before using, downloading or installing
-the Software (Flowplayer, as defined below). By using, downloading or installing
-the Software, Licensee is agreeing to be bound by this License and the licenses
-granted hereunder are subject to compliance with any and all terms of this License.
-IF YOU DO NOT ACCEPT THE TERMS AND CONDITIONS OF THIS LICENSE, DO NOT USE, DOWNLOAD,
-INSTALL OR DISTRIBUTE ANY OF THE LICENSED SOFTWARE.
-
-Terms and definitions
-=====================
-
-"Software" means the licensed Flowplayer software
-
-"Adaptation" means a derivative work based upon the Licensed Software resulting from
-any addition to, editing of or deletion from the substance or structure of the original
-source code or a compiled version of the Licensed Software or any previous Adaptations
-or a work that programmatically interacts with the Licensed Software.
-
-"Licensed Software" means the same as Software.
-
-"License" means this document.
-
-"Licensor" means Flowplayer Ltd.
-
-"License Key" means an alphanumeric key that is used to activate the Sofware. The License
-Key is provided by Licensor.
-
-"Licensee" means an individual or entity exercising rights under and complying with the
-terms of this License who has not previously violated the terms of this License with respect
-to the Software, or who has received express permission from the Licensor to exercise rights
-under this License despite a previous violation.
-
-License Grant
-=============
-Licensor hereby grants the Licensee a non-exclusive, non-transferable, non-assignable
-license, without the right to sublicense to: Access, display, integrate and use the
-Software in one hundred (100) Internet domains that have been registered with Licensor.
-Licensor provides a license key that is tied to the domain names; and Make an Adaptation
-and access, display, and integrate it in the one hundred (100) Internet domains that have
-been registered with Licensor. The Adaptation must not remove the License Key logic from
-the Software so that the Adaptation only functions if a valid license key has been
-configured for it.
-
-Licensor hereby grants the Licensee a non-exclusive, worldwide, royalty-free,
-non-transferable, non-assignable patent license, without the right to sublicense,
-under any patent rights the Licensor holds in the Software to use, run, and modify
-the Software in the one hundred (100) Internet domains that have been registered
-with Licensor, provided that any Adaptation made to the Software does not remove
-the License Key logic from the Software so that the Adaptation only functions if a valid
-license key has been configured for it.
-
-All rights not expressly granted by this Agreement are expressly reserved by Licensor.
-
-
-Applicability of License
-========================
-
-This License applies to the Software version purchased by the Licensee.
-Additional later versions released by the Licensor are not part of this License.
-
-Protection of Licensed Software
-===============================
-
-Except as specifically set forth herein or as otherwise agreed to between Licensor
-and Licensee, Licensee shall not have the right to copy, relicense, sell, lease,
-transfer, encumber, assign or make available for public use the Software. Any attempt
-to take any such actions is void, and will automatically terminate your rights
-under this License.
-
-Licensee shall use its best efforts to ensure that no unauthorized copy of the Licensed
-Programs shall be made, in whole or in part, in any form.  Licensee shall prohibit all
-users of the Software from modifying, reverse-engineering or disassembling any part
-of the Software.  All rights not expressly granted by Licensor are hereby reserved.
-
-Effective Date
-==============
-
-The rights and licenses granted hereunder shall commence on the date any of the Software
-are electronically delivered to Licensee.  Licensor agrees to make the Software available
-for electronic delivery to Licensee promptly after receipt by Licensor of the License Fee.
-For purposes of this Agreement, the License Fee means the amount of money required to be
-paid by Licensee to Licensor for legal usage of the Software under the terms of this agreement.
-
-Termination of the license
-==========================
-This license is subject to termination by Licensor at any time if (a) Licensee violates an
-y terms of this License, (b) Licensor has a reasonable basis to believe that Licensee's
-business is impairing Licensor's business.
-
-
-Ownership of Intellectual Property
-==================================
-Licensor is the sole owner of all intellectual property rights pertaining to the Licensed
-Software.  Licensor reserves all rights not expressly granted herein.
-
-No Warranty
-===========
-TO THE FULLEST EXTENT PERMISSIBLE UNDER APPLICABLE LAW, THE LICENSED SOFTWARE IS PROVIDED
-TO YOU "AS IS," WITH ALL FAULTS, WITHOUT WARRANTY OF ANY KIND, AND YOUR USE IS AT YOUR
-SOLE RISK. THE ENTIRE RISK OF SATISFACTORY QUALITY AND PERFORMANCE RESIDES WITH YOU.
-LICENSOR DISCLAIMS ANY AND ALL EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING IMPLIED
-WARRANTIES OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR PURPOSE,
-NONINFRINGEMENT OF THIRD PARTY RIGHTS, ANY WARRANTIES OR CONDITIONS OF TITLE, AND WARRANTIES
-(IF ANY) ARISING FROM A COURSE OF DEALING, USAGE, OR TRADE PRACTICE. LICENSOR DOES NOT
-WARRANT AGAINST INTERFERENCE WITH YOUR ENJOYMENT OF THE PROGRAM; THAT THE PROGRAM WILL
-MEET YOUR REQUIREMENTS; THAT OPERATION OF THE PROGRAM WILL BE UNINTERRUPTED OR ERROR-FREE,
-OR THAT THE PROGRAM WILL BE COMPATIBLE WITH THIRD PARTY SOFTWARE OR THAT ANY ERRORS IN THE
-PROGRAM WILL BE CORRECTED. NO ORAL OR WRITTEN ADVICE PROVIDED BY LICENSOR OR ANY AUTHORIZED
-REPRESENTATIVE SHALL CREATE A WARRANTY. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
-OF OR LIMITATIONS ON IMPLIED WARRANTIES OR THE LIMITATIONS ON THE APPLICABLE STATUTORY
-RIGHTS OF A CONSUMER, SO SOME OR ALL OF THE ABOVE EXCLUSIONS AND LIMITATIONS MAY NOT
-APPLY TO YOU. LICENSEE IS SOLELY RESPONSIBLE FOR DETERMINING THE APPROPRIATENESS OF USING
-AND DISTRIBUTING THE LICENSED SOFTWARE AND ASSUMES ALL RISKS ASSOCIATED WITH ITS EXERCISE
-OF RIGHTS UNDER THIS AGREEMENT, INCLUDING BUT NOT LIMITED TO THE RISKS AND COSTS OF PROGRAM
-ERRORS, COMPLIANCE WITH APPLICABLE LAWS, DAMAGE TO OR LOSS OF DATA, PROGRAMS OR EQUIPMENT,
-SUITABILITY FOR HOSTING AND UNAVAILABILITY OR INTERRUPTION OF OPERATIONS.
-
-Limitation of Liability
-=======================
-Except to the extent required by applicable law, THE CUMULATIVE, AGGREGATE LIABILITY OF
-LICENSOR TO LICENSEE FOR ALL CLAIMS RELATED TO THE LICENSED SOFTWARE AND THIS AGREEMENT,
-WILL NOT EXCEED THE TOTAL AMOUNT OF ALL LICENSE FEES PAID TO LICENSOR HEREUNDER. LICENSOR
-WILL NOT IN ANY CASE BE LIABLE FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, INDIRECT, PUNITIVE,
-OR EXEMPLARY DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PRODUCT, THE SERVICES OR
-THIS AGREEMENT, INCLUDING WITHOUT LIMITATION, DAMAGES FOR LOST PROFIT, LOST REVENUE,
-LOSS OF USE, LOSS OF DATA, COSTS OF RECREATING LOST DATA, THE COST OF ANY SUBSTITUTE EQUIPMENT,
-PROGRAM, OR DATA, OR CLAIMS BY ANY THIRD PARTY, INCLUDING WITH LIMITATION THIRD PARTY CLAIMS
-OF INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS, INFRINGEMENT OF COPYRIGHT, TRADEMARK,
-PATENT, OR TRADE SECRETS. LICENSEE'S SOLE AND EXCLUSIVE REMEDY IS SET FORTH IN THIS AGREEMENT.
-THE LIMITATION ON DAMAGES SET FORTH IN SECTION WILL NOT APPLY TO INDEMNIFICATION OBLIGATIONS
-OR BREACHES BY LICENSEE.
-
-
-Indemnity
-=========
-Licensee shall indemnify Licensor, its employees, officers, licensees and agents for
-all damages, costs and expenses, including, without limitation, attorneys\89Ûª fees, arising from
-any claims arising as a result of Licensee\89Ûªs use of the Licensed Software, either as provided
-or as Adapted by Licensee.
-
-Export
-======
-Licensee agrees and certifies that it will not export or re-export, directly or indirectly,
-the Licensed Software contrary to the laws of the United States or any other country.
-
-Severability
-============
-If for any reason a court of competent jurisdiction finds any provision of this License or portion
-thereof, to be unenforceable, that provision of the License shall be enforced to the maximum extent
-permissible so as to affect the intent of the parties, and the remainder of this License shall
-continue in full force and effect.
-
-Governing Law
-=============
-This License shall be governed by the laws of Finland. Any disputes arising under this License
-shall be heard in the city of Espoo, Finland.
-
-Complete Agreement
-===================
-This License constitutes the entire agreement between Licensor and Licensee with respect to the
-use of the Licensed Software and supersedes all prior or contemporaneous understandings or agreements,
-written or oral, regarding such subject matter. No one other than Licensor has the right to modify
-or amend this License.
-
-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/sysext/mediace/Resources/Contrib/flowplayer/LICENSE_UNLIMITED.txt b/typo3/sysext/mediace/Resources/Contrib/flowplayer/LICENSE_UNLIMITED.txt
deleted file mode 100644 (file)
index 60bb839..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Flowplayer Unlimited license terms are available in this page:
-
-http://flowplayer.org/license/unlimited.html
\ No newline at end of file
diff --git a/typo3/sysext/mediace/Resources/Contrib/flowplayer/README.txt b/typo3/sysext/mediace/Resources/Contrib/flowplayer/README.txt
deleted file mode 100644 (file)
index 62e9422..0000000
+++ /dev/null
@@ -1,504 +0,0 @@
-Version history:
-
-3.2.17
-------
-- #75 set the child display list different when a gradient is set.
-- The clip property 'bufferLength' now accepts decimal values, for example bufferLength: 0.2
-- #121 XSS fix: Only load plugins and external config from the same domain as the player swf is loaded from
-- Made it possible to tab out of the player and into the HTML page using the keyboard alone.
-- Change links in the context menu and in the logos to point to http://flash.flowplayer.org
-- Pausing a live stream now leaves the video frame visible #81
-- Audio plugin is not loaded nor used when the the provider is set excplicitly in the clip to a non-audio value, for
- example to 'http'
-- Allow playing another instream clip while already playing one. Issue #131
-- Fixed memory leaks related to repeatedly starting playback with the play() API method. #163
-
-3.2.16
-------
-- new clip event onMetadataChange, dispatched for example when switching bitrate
-
-Fixes:
-
-- Shows logo in accelerated mode #20
-- mid-rolls freeze if multiple providers are used #42
-- onFire fired twice on replay #52
-- rtmp + hw accel + instream clips lose video, or aspect ratio #44
-- URL name parts containing semi-colons (;) should pass validation through linkUrl usage #53
-- cuepoints fired multiple times with the bitrateselect plugin #50
-- fix for dispatching onBegin in certain situations
-- if onStart has been dispatched already prevent dispatching many onBegin events
-
-
-3.2.15
-------
-- #15 fixes for #627, handle the display init on startup.
-- #615 dispatch begin if in paused mode too early.
-- #629 if start has been dispatched already prevent dispatching many begin events.
-- #20 for the free player swap the logo with the stage video mask to display underneath not on top.
-- #42 pass in stream clips through and close the stream before returning to the parent clip.
-- #52 when replaying flag start has dispatched on the current clip.
-- #44 fixes for #627 check if the stagevideo dimensions and positioning has changed to update the stage video mask with.
-- unbinding and binding stage video events caused issues with instream playlists therefore has to be kept binded.
-- unbinded stage video events during seeking to prevent the mask repositioning.
-- #53 update url filter to accomodate for pretty urls with semi colons.
-- #50 if we have metadata already set it is being updated during seeks and switching, dispatch metadata change events instead.
-
-3.2.14
-------
-- #614 when the clip ends if the next clip in the provider has a different provider close the provider stream.
-- #627 only detach / attach the display on start events which causes issues in buffering events after a seek in stagevideo.
-- #627 re-enable stagevideo state change listeners if stagevideo is available or detach the fullscreen events on first call.
-- #9 when replaying from stopping, connection does not receive callbacks anymore.
-
-
-
-
-3.2.13
-------
-- Updated to automatically load the latest controls and audio plugins
-- #612 add some logging for the stagevideo render state to determine what mode the hardware acceleration is in for various systems.
-- #628 opera browsers do not return filesize correctly for latest flash players so require to use load completion instead which may help with gzipped files also.
-
-3.2.12
-------
-- new flowplayer.js version 3.2.11,
-   fixes removing the player in fullscreen mode leaves Android locked in landscape orientation (#511)
-- #586 add a bitrate label with a new namespace attribute fp:bitratelabel.
-- #583 fixes for handling the fullscreenOnly property better
-- #494 with relative filenames with a root path strip the baseurl of paths first.
-
-3.2.11
-------
-- new flowplayer.js, now requires Flash 10.1 as the minimum flash version
-- #526 allow click through event for flash installation message when using div containers.
-- #508 disabling the stagevideo screen mask, canvas is visible without it, this was causing issues with the display list.
-- #443 adding accessibility option to the playbuttonoverlay.
-
-
-3.2.10
-------
-- Fixed #514, scrubbing was broken
-- new flowplayer.js version 3.2.9, fixes #510
-
-3.2.9
------
-- Fixed #490, controlbar background, buffer bar and progress bar colors were all reset to white
-- #503 Update viewport when stage is added to obtain the coordnates correctly. Update viewport when in and out of fullscreen.
-- #508 stage video mask was being added to the top layer and hiding all children.
-
-3.2.8
------
-- Added new property clip.backBufferLength, to be used with FMS 3.5
-- Adds support for StageVideo. To enable it set clip.accelerated to true.
-- Tries to reload two times if the stream is not initially found. Also does 3 connection attempts if the connection fails with RTMP.
-- Support for FMS slow motion
-- Support for thumbnails in RSS files
-- Added onPlayStatus clip event handler on NetStreamClient.
-- Added new clip events for stream switching onSwitchFailed and onSwitchComplete
-- made it possible to replay a clip using play(<current_clip's_index>)
-
-Fixes:
-- fixed to dispatch onStart also when replaying the previous clip, now the JS controlbar again works when replaying
-- cuepoints were fired multiple times when there is a playlist with several clips. Issue #150.
-- fixed XML parsing error when metadata's keys contains dashes
-- backgroundImage css property can now be set to "none" to be removed
-- fixed the facts that clips in a playlist were cut off by a fraction in the end
-- fullScreenOnly now works in conjunction with displayTime
-- JS plugins now handles grouped syntax like flowplayer("a.player" /*...*/ )
-- JS function setClip can now be used to add listeners on the new Clip
-- different players with the same configuration stored in a variable can now use JS plugins
-- using linkUrl now works when calling JS function setClip
-- zIndex for plugins works fine now, issue #302
-- onLastSecond was fired twice, issue #300
-- fixed license key verification on subdomains, issue #318
-- fixed XSS vulnerability with linkUrls. Thank you Szymon Gruszecki for discovering and reporting this to us. Issue #329.
-- fixed switch stream api support in paused state. #279.
-- added switching state properties. #339
-- fixed the stopBuffering() API method to close the NetConnection and to clear the screen
-- Issue #355 setup targeting for Flash 10.0 and 10.1 to provide support for Flash 10.0 without Stagevideo requirements.
-- fixed #364, NetConnection unnecessary closed/reconnected when the netConnection does not change from clip to clip
-- xss fix for flashembed #357
-- Issue #384 added links support in context menus with configuration { url: "domain.com", target: "_blank"} which will work in embedded players.
-- #378, javascript method loadPluginWithConfig is unavailable and non existant. Documentation updated required to remove this and updates for loadPlugin like so
-this.loadPlugin("content","../flowplayer.content.swf", { html: "test", top: 30  }); or
-this.loadPlugin("content","../flowplayer.content.swf", { html: "test"  }, function() {
-                        this.css({ top: 30 });
-                    });
-- #191 send the resume event, and no stop event first before reconnecting due to a connection timeout so the player comes out of a paused state correctly.
-- #363 pause stream after metadata not beforehand or else no metadata is sent for rtmp clips .
-- #363 silent seek and force to seek to a keyframe or else video frame will not display initially when paused.
-- #375 clearing the event listeners when adding new video displays prevents new events being added when the playlist is replaced.
-- #391 add message argument to connection failure callback required by some connection providers.
-- #363 add overridable pause to frame for different seek functionality between http and rtmp.
-- #392 possible fix for extensions with no filetypes like rtmp flv clips, require positive index check.
-- #395 apply buffer animation status to VOD streams only.
-- #375 possible fix when replacing the playlist in onBeforeFinish, move replay button to onFinish.
-- #390 correct seek back to a valid time on invalid seeking while seeking in the buffer.
-- #404 implement netstreamplayoptions for http streams, resets the stream or start loading a new stream.
-- fixed an issue in parsing JSON config that contains several comments separated by whitespace
-- new clip property 'stopLiveOnPause'
-- #415 regression issue with #395, stop the buffering animation correctly.
-- #414 problem appears again for very short clips with invalid seek times, make it step back 1 second from the invalid seek time to seek the buffer correctly.
-- #416 enable seekableOnBegin to enable the scrubbar correctly when autobuffering.
-- #423 add the . to clip type extension checks or else files with known extension postfixes within them will be chosen instead.
-- #426 when a plugin width is set to a percentage, x/y is required to be floored or else it will affect the animation engine. specifically for the autohide function.
-- #430 adding event listeners for netconnection to obtain certain events.
-- #430 clear buffering status on connection failure.
-- #430 clear buffering status on stream failure.
-- #412 check for empty baseurl or else player url is appended and affects the url parsing.
-- #439 check for all rtmp streaming protocols when checking for rtmp urls.
-- #442 fix for code error in the javascript api.
-- #461 when we have a clip base url set, we need the complete clip url sent to play2 for http streams.
-- #470 check for a playlist when replacing the playlist with an rss feed.
-- #494 regression issued caused by #412, enable base url correctly.
-- #30 regression caused by character replacements, removing for now and let end user deal with them.
-
-3.2.7
------
-- Loads the new controlbar plugin version 3.2.5.
-Fixes:
-- Fixed 'orig' scaling in fullscreen: http://flowplayer.org/forum/2/10274#post-52646
-
-3.2.6
------
-- linkUrl should now work better with popup blockers: http://code.google.com/p/flowplayer-core/issues/detail?id=31
-- new linkWindow value "_popup" opens the linked page in a popup browser window
-- added new onClipResized event
-- Added new onUnload event, can be only listened in Flash and not triggered to JS
-- API: Added new url property to plugin objects
-Fixes:
-- it was not possible to call play() in an onFinish listener
-- fix to preserve the infoObject for custom netStream and netConnection clients in cases where the infoObject is a
-  primitive object without properties
-- does not show the error dialog in the debugger player when showErrors: false
-- fixed to correctly handle xx.ca subdomains when validating the license key
-- a custom logo is now sized correctly according to the configured size
-- does not show the buffer animation any more when the player receives the onBufferEmpty message from the netStream.
-  The animation was unnecessarily shown in some situations.
-- fixed #155. added new urlEncoding property to Clip for url ncoding ut8 urls
-
-3.2.5
------
-- added new scaling option 'crop' that resizes to fill all available space, cropping on top/bottom or left/right
-- improvements to RSS file parsing
-- Now displays a hand cursor when a linkUrl is used in clips
-
-3.2.4
------
-- new flowplayer.js version, with Apple iDevice fixes
-
-3.2.3
------
-- a new 'type' clip property exposed to JS
-- changed the clip type property to better work as a read-write property. Now accepts 'video', 'audio',
-  'image' and 'api' as configuration values.
-- moved parallel rtmp connection mechanism from the RTMP plugin to Core so other plugins can use it (ie: securestreaming)
-Fixes:
-- fixed #112, wrong URL computation when using clip with relative URL on a page with a / after a # in its url
-- fixed #111, wrong behavior of pre/post roll images with duration 0
-- fixed multiple license keys logic
-Fixes:
-- correct verification of license keys in *.ca domains
-- fix to make playback to always reach end of video
-- fixed resuming of live streams
-
-3.2.2
------
-Fixes:
-- Now recognizes following kind of urls as audio clips: 'mp3:audiostreamname' (ulrs with mp3 prefix and no extension)
-- Now ignores the duration from metadata if we already got one. Fix required for pseudostreaming
-- Fix to reuse buffered data when replaying a clip
-
-3.2.1
----------
-- Support for RTMP redirects (tested with Wowza loadbalancing)
-- Fixed video size when no size info available in clip metadata
-
-Fixes:
-- Fix to correctly detect if the player SWF name contains a version number and if it does also use the version number
-when it automatically loads the controls plugin.
-
-3.2.0
------
-- 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. 
-- 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
-Fixes:
-- onSeek() was not fired when seeking while paused and when using RTMP. An extra onStart was fired too.
-- fireErrorExternal() was not working properly with an error PlayerEvent
-- countPlugins() was throwing an error when a plugin was not found
-- external swf files were not scaled properly
-- the logo was unnecessary shown when going fullscreen if logo.displayTime was being used
-- added a loadPluginWithConfig method to FlowplayerBase, accessible from javascript. Fixed double onload callback call.
-- now handles cuepoint parameters injected using the Adobe Media Encoder
-- showPlugin was not working when config.play was null
-- handles 3-part duration values included in FLV metadata, like "500.123.123"
-- player wasn't always reaching end of video
-- fixed broken buffering: false
-- fixed event dispatching when embedding flowplayer without flowplayer.js (=without playlist config field)
-- fixed safari crashes when unloading player
-- fixed scrubber behaviour with a playlist containing 2 images (or swf) in a row
-- fixed errors in logs when using an RSS playlist
-- fixed OverlayPlayButton that was showing even if it shouldn't on some cases
-- fixed wrong behavior when onBeforeFinish was returning false within playlists
-- /!\ Don't use the fadeIn / fadeOut controlbar's API while using autoHide.
-- fixed play state button with images
-- fixed splash image flickering
-
-3.1.5
------
-Fixes:
-- The player went to a locked state when resuming playback after a period that was long enought to send the
-netConnection to an invalid state. Now when resuming playback on an invalid connection the clip starts again from
-the beginning. This is only when using RTMP connections and does not affect progressive download playback.
-- Custom netConnect and netStream events did not pass the info object to JS listeners
-
-3.1.4
------
-Fixes:
-- player did not initialize if the controlbar plugin was disabled and if the play button overlay was disabled with play: null
-- works properly without cachebusting on IE
-- RSS playlist parsing now respects the isDefault attribute used in mRSS media group items
-- Fixed passing of connection arguments
-
-3.1.3
------
-- enhancements to RSS playlist parsing: Now skips all media:content that have unsupported types. Now the type attribute
-of the media:content element is mandatory and has to be present in the RSS file
-- Possibility to pass a RSS file name with playFeed("playlist.rss") and setPlaylist("playlist.rss") calls.
-- changes to the ConnectionProvider and URLResolver APIs
-- Now automatically uses a plugin that is called 'rtmp' for all clips that have the rtmp-protocol in their URLs.
-- Added possibility to specify all clip properties in an RSS playlist
-
-Fixes:
-- the result of URL resolvers in now cached, and the resolvers will not be used again when a clip is replayed
-- some style properties like 'backgroundGradient' had no effect in config
-- video goes tiny on Firefox: http://flowplayer.org/forum/8/23226
-- RSS playlists: The 'type' attribute value 'audio/mp3' in the media:content element caused an error.
-- Dispatches onMetadata() if an URL resolver changes the clip URL (changes to a different file)
-- error codes and error message were not properly passed to onEvent JS listeners
-
-3.1.2
------
-- The domain of the logo url must the same domain from where the player SWF is loaded from.
-- Fullscreen can be toggled by doublclick on the video area.
-Fixes:
-- Player was not initialized correctly when instream playlists were used and the provider used in the instream clips was defined in the common clip.
-- A separator in the Context Menu made the callbacks in the following menu items out of order. Related forum post: http://flowplayer.org/forum/8/22541
-- the width and height settings of a logo were ignored if the logo was a sWF file
-- volume control and mute/unmute were not working after an instream clip had been played
-- now possible to use RTMP for mp3 files
-- Issue 12: cuepointMultiplier was undefined in the clip object set to JS event listeners
-- Issue 14: onBeforeStop was unnecessarily fired when calling setPlaylist() and the player was not playing,
-            additionally onStop was never fired even if onBeforeStop was
-- fixed screen vertical placement problems that reappeared with 3.1.1
-- The rotating animation now has the same size and position as it has after initialized
-
-3.1.1
------
-- External configuration files
-- Instream playback
-- Added toggleFullscreen() the API
-- Possibility to specify controls configuration in clips
-- Seek target position is now sent in the onBeforeSeek event
-Fixes:
-- The screen size was initially too small on Firefox (Mac)
-- Did not persist a zero volume value: http://www.flowplayer.org/forum/8/18413
-
-3.1.0
------
-New features:
-- clip's can have urlResolvers and connectionProviders
-- Added new configuration options 'connectionCallbacks' and 'streamCallbacks'. Both accept an Array of event names as a value.
-  When these events get fired on the connection or stream object, corresponding Clip events will be fired by the player.
-  This can be used for example when firing custom events from RTMP server apps
-- Added new clip event types: 'onConnectionEvent' and 'onStreamEvent' these get fired when the predefined events happen on the connection and stream objects.
-- Added Security.allowDomain() to allow loaded plugins to script the player
-- Added addClip(clip, index) to the API, index is optional
-- Possibility to view videos without metadata, using clip.metaData: false
-- Now the player's preloader uses the rotating animation instead of a percent text to indicate the progress
-  of loading the player SWF. You can disable the aninamtion by setting buffering: false
-- calling close() now does not send the onStop event
-- Clip's custom properties are now present in the root of the clip argument in all clip events that are sent to JS.
-
-Bug fixes:
-- The preloader sometimes failed to initialize the player
-- Allow seeking while in buffering state: http://flowplayer.org/forum/8/16505
-- Replay of a RTMP stream was failing after the connection had expired
-- Security error when clicking on the screen if there is an image in the playlist loaded from a foreign domain
-- loadPlugin() was not working
-- now fullscreen works with Flash versions older than 9.0.115, in versions that do not support hardware scaling
-- replaying a RTMP stream with an image in front of the stream in the playlist was not working (video stayed hidden). Happened
-  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.  
-
-3.0.6
------
-- added possibility to associate a linkUrl and linkWindow to the canvas
-Fixes:
-- fix for entering fullscreen for Flash versions that don't support the hardware scaled fullscreen-mode
-- when showing images the duration tracking starts only after the image has been completely loaded: http://flowplayer.org/forum/2/15301
-- fix for verifying license keys for domains that have more than 4 labels in them
-- if plugin loading failis because of a IO error, the plugin will be discarded and the player initialization continues:
-
-3.0.4
------
-- The "play" pseudo-plugin now supports fadeIn(), fadeOut(), showPlugin(), hidePlugin() and
-  additionally you can configure it like this:
-  // make only the play button invisible (buffering animation is still used)
-  play: { display: 'none' }
-  // disable the play button and the buffering animation
-  play: null
-  // disable the buffering animation
-  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
-
-Fixes:
-- clip urls were not resolved correctly if the HTML page URL had a query string starting with a question mark (http://flowplayer.org/forum/8/14016#post-14016)
-- Fixed context menu for with IE (commercial version)
-- a cuepoint at time zero was fired several times
-- screen is now arranged correctly even when only bottom or top is defined for it in the configuration
-- Fixed context menu for with IE (commercial version)
-- a cuepoint at time zero was fired several times
-- screen is now arranged correctly even when only bottom or top is defined for it in the configuration
-- Now possible to call play() in an onError handler: http://flowplayer.org/forum/8/12939
-- Does not throw an error if the player cannot persist the volume on the client computer: http://flowplayer.org/forum/8/13286#post-13495
-- Triggering fullscreen does not pause the player in IE
-- The play button overlay no longer has a gap between it's pieces when a label is used: http://flowplayer.org/forum/8/14250
-- clip.update() JS call now resets the duration
-- a label configured for the play button overlay did not work in the commercial version
-
-3.0.3
------
-- fixed cuepoint firing: Does not skip cuepoints any more
-- Plugins can now be loaded from a different domain to the flowplayer.swf
-- Specifying a clip to play by just using the 'clip' node in the configuration was not working, a playlist definition was required. This is now fixed.
-- Fixed: A playlist with different providers caused the onMetadata event to fire events with metadata from the previous clip in the playlist. Occurred when moving in the playlist with next() and prev()
-- the opacity setting now works with the logo
-- fadeOut() call to the "screen" plugin was sending the listenerId and pluginName arguments in wrong order
-- stop(), pause(), resume(), close() no longer return the flowplayer object to JS
-- changing the size of the screen in a onFullscreen listener now always works, there was a bug that caused this to fail occasionally
-- fixed using arbitrary SWFs as plugins
-- the API method setPlaylist() no longer starts playing if autoPlay: true, neither it starts buffering if autoBuffering: true
-- the API method play() now accepts an array of clip objects as an argument, the playlist is replaced with the specified clips and playback starts from the 1st clip
-
-3.0.2
------
-- setting play: null now works again
-- pressing the play again button overlay does not open a linkUrl associated with a clip
-- 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) 
-- 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
-
-3.0.1
------
-- Fixed negative cuepoints from common clip. Now these are properly propagated to the clips in playlist.
-- buffering animation is now the same size as the play button overlay
-- commercial version now supports license keys that allows the use of subdomains
-- error messages are now automatically hidden after a 4 second delay. They are also hidden when a new clips
-  starts playing (when onBeforeBegin is fired)
-- added possibility to disable the buffering animation like so: buffering: false
-- pressing the play button overlay does not open a linkUrl associated with a clip
-- license key verification failed if a port number was used in the URL (like in this url: http://mydomain.com:8080/video.html)
-- added audio support, clip has a new "image" property
-- workaround for missing "NetStream.Play.Start" notfication that was happending with Red5. Because of this issue the video was not shown.
-- commercial version has the possibility to change the zIndex of the logo
-
-3.0.0
------
-- Removed security errors that happened when loading images from foreign domains (domains other than the domain of the core SWF).
-  Using a backgroundImage on canvas, in the content plugin, and for the controls is also possible to be loaded
-  from a foreign domain - BUT backgroundRepeat cannot be used for foreign images.
-- Now allows the embedding HTML to script the player even if the player is loaded from another domain.
-- Added a 'live' property to Clips, used for live streams.
-- A player embedded to a foreign domain now loads images, css files and other resources from the domain where the palyer SWF was loaded from. This is to generate shorter embed-codes.
-- Added linkUrl and linkWindow properties to the logo, in commercial version you can set these to point to a linked page. The linked page gets opened
-  when the logo is clicked.  Possible values for linkWindow:
-    * "_self" specifies the current frame in the current window.
-    * "_blank" specifies a new window.
-    * "_parent" specifies the parent of the current frame.
-    * "_top" specifies the top-level frame in the current window.
-- Added linkUrl and linkWindow properties to clips. The linked page is opened when the video are is clicked and the corresponding clip has a linkUrl specified.
-- Made the play button overlay and the "Play again" button slightly bigger.
-
-RC4
----
-- Now shows a "Play again" button at the end of the video/playlist
-- Commercial version shows a Flowplayer logo if invalidKey was supplied, but the otherwise the player works
-- setting play: null in configuration will disable the play button overlay
-- setting opacity for "play" also sets it for the buffering animation
-- Fixed firing of cuepoints too early. Cuepoint firing is now based on stream time and does not rely on timers
-- added onXMPData event listener
-- 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. 
-
-RC3
----
-- stopBuffering() now dispatches the onStop event first if the player is playing/paused/buffering at the time of calling it
-- fixed detection of images based on file extensions
-- fixed some issues with having images in the playlist
-- made it possible to autoBuffer next video while showing an image (image without a duration)
-
-RC2
----
-- fixed: setting the screen height in configuration did not have any effect
-
-RC1
------
-- better error message if plugin loading fails, shows the URL used
-- validates our redesigned multidomain license key correctly
-- fix to prevent the play button going visible when the onBufferEmpty event occurs
-- the commercial swf now correctly loads the controls using version information
-- fixed: the play button overlay became invisible with long fadeOutSpeeds
-
-beta6
------
-- removed the onFirstFramePause event
-- playing a clip for the second time caused a doubled sound
-- pausing on first frame did not work on some FLV files
-
-beta5
------
-- logo only uses percentage scaling if it's a SWF file (there is ".swf" in it's url)
-- context menu now correctly builds up from string entries in configuration
--always closes the previous connection before starting a new clip
-
-beta4
------
-- now it's possible to load a plugin into the panel without specifying any position/dimensions
- information, the plugin is placed to left: "50%", top: "50%" and using the plugin DisplayObject's width & height
-- The Flowplayer API was not fully initialized when onLoad was invoked on Flash plugins
-
-beta3
------
-- tweaking logo placement
-- "play" did not show up after repeated pause/resume
-- player now loads the latest controls SWF version, right now the latest SWF is called 'flowplayer.controls-3.0.0-beta2.swf'
-
-beta2
------
-- fixed support for RTMP stream groups
-- changed to loop through available fonts in order to find a suitable font also in IE
-- Preloader was broken on IE: When the player SWf was in browser's cache it did not initialize properly
-- Context menu now correctly handles menu items that are configured by their string labels only (not using json objects)
-- fixed custom logo positioning (was moved to the left edge of screen in fullscreen)
-- "play" now always follows the position and size of the screen
-- video was stretched below the controls in fullscreen when autoHide: 'never'
-- logo now takes 6.5% of the screen height, width is scaled so that the aspect ratio is preserved
-
-beta1
------
-- First public beta release
diff --git a/typo3/sysext/mediace/Resources/Contrib/flowplayer/express-install/express-install.css b/typo3/sysext/mediace/Resources/Contrib/flowplayer/express-install/express-install.css
deleted file mode 100644 (file)
index ea0fc66..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Selector for Flash express install div section*/
-
-.flash-install-info div {
-       padding-top: 105px;
-       background-image: url("flashplayerlogo.jpg");
-       background-repeat: no-repeat;
-}
\ No newline at end of file
diff --git a/typo3/sysext/mediace/Resources/Contrib/flowplayer/express-install/flashplayerlogo.jpg b/typo3/sysext/mediace/Resources/Contrib/flowplayer/express-install/flashplayerlogo.jpg
deleted file mode 100644 (file)
index 594a8bb..0000000
Binary files a/typo3/sysext/mediace/Resources/Contrib/flowplayer/express-install/flashplayerlogo.jpg and /dev/null differ
diff --git a/typo3/sysext/mediace/Resources/Contrib/flowplayer/expressinstall.swf b/typo3/sysext/mediace/Resources/Contrib/flowplayer/expressinstall.swf
deleted file mode 100644 (file)
index bdc3437..0000000
Binary files a/typo3/sysext/mediace/Resources/Contrib/flowplayer/expressinstall.swf and /dev/null differ
diff --git a/typo3/sysext/mediace/Resources/Contrib/flowplayer/flowplayer-3.2.13.min.js b/typo3/sysext/mediace/Resources/Contrib/flowplayer/flowplayer-3.2.13.min.js
deleted file mode 100644 (file)
index eba9487..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * flowplayer.js 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/>.
- *
- */
-!function(){function h(p){console.log("$f.fireEvent",[].slice.call(p))}function l(r){if(!r||typeof r!="object"){return r}var p=new r.constructor();for(var q in r){if(r.hasOwnProperty(q)){p[q]=l(r[q])}}return p}function n(u,r){if(!u){return}var p,q=0,s=u.length;if(s===undefined){for(p in u){if(r.call(u[p],p,u[p])===false){break}}}else{for(var t=u[0];q<s&&r.call(t,q,t)!==false;t=u[++q]){}}return u}function c(p){return document.getElementById(p)}function j(r,q,p){if(typeof q!="object"){return r}if(r&&q){n(q,function(s,t){if(!p||typeof t!="function"){r[s]=t}})}return r}function o(t){var r=t.indexOf(".");if(r!=-1){var q=t.slice(0,r)||"*";var p=t.slice(r+1,t.length);var s=[];n(document.getElementsByTagName(q),function(){if(this.className&&this.className.indexOf(p)!=-1){s.push(this)}});return s}}function g(p){p=p||window.event;if(p.preventDefault){p.stopPropagation();p.preventDefault()}else{p.returnValue=false;p.cancelBubble=true}return false}function k(r,p,q){r[p]=r[p]||[];r[p].push(q)}function e(p){return p.replace(/&amp;/g,"%26").replace(/&/g,"%26").replace(/=/g,"%3D")}function f(){return"_"+(""+Math.random()).slice(2,10)}var i=function(u,s,t){var r=this,q={},v={};r.index=s;if(typeof u=="string"){u={url:u}}j(this,u,true);n(("Begin*,Start,Pause*,Resume*,Seek*,Stop*,Finish*,LastSecond,Update,BufferFull,BufferEmpty,BufferStop").split(","),function(){var w="on"+this;if(w.indexOf("*")!=-1){w=w.slice(0,w.length-1);var x="onBefore"+w.slice(2);r[x]=function(y){k(v,x,y);return r}}r[w]=function(y){k(v,w,y);return r};if(s==-1){if(r[x]){t[x]=r[x]}if(r[w]){t[w]=r[w]}}});j(this,{onCuepoint:function(y,x){if(arguments.length==1){q.embedded=[null,y];return r}if(typeof y=="number"){y=[y]}var w=f();q[w]=[y,x];if(t.isLoaded()){t._api().fp_addCuepoints(y,s,w)}return r},update:function(x){j(r,x);if(t.isLoaded()){t._api().fp_updateClip(x,s)}var w=t.getConfig();var y=(s==-1)?w.clip:w.playlist[s];j(y,x,true)},_fireEvent:function(w,z,x,B){if(w=="onLoad"){n(q,function(C,D){if(D[0]){t._api().fp_addCuepoints(D[0],s,C)}});return false}B=B||r;if(w=="onCuepoint"){var A=q[z];if(A){return A[1].call(t,B,x)}}if(z&&"onBeforeBegin,onMetaData,onMetaDataChange,onStart,onUpdate,onResume".indexOf(w)!=-1){j(B,z);if(z.metaData){if(!B.duration){B.duration=z.metaData.duration}else{B.fullDuration=z.metaData.duration}}}var y=true;n(v[w],function(){y=this.call(t,B,z,x)});return y}});if(u.onCuepoint){var p=u.onCuepoint;r.onCuepoint.apply(r,typeof p=="function"?[p]:p);delete u.onCuepoint}n(u,function(w,x){if(typeof x=="function"){k(v,w,x);delete u[w]}});if(s==-1){t.onCuepoint=this.onCuepoint}};var m=function(q,s,r,u){var p=this,t={},v=false;if(u){j(t,u)}n(s,function(w,x){if(typeof x=="function"){t[w]=x;delete s[w]}});j(this,{animate:function(z,A,y){if(!z){return p}if(typeof A=="function"){y=A;A=500}if(typeof z=="string"){var x=z;z={};z[x]=A;A=500}if(y){var w=f();t[w]=y}if(A===undefined){A=500}s=r._api().fp_animate(q,z,A,w);return p},css:function(x,y){if(y!==undefined){var w={};w[x]=y;x=w}s=r._api().fp_css(q,x);j(p,s);return p},show:function(){this.display="block";r._api().fp_showPlugin(q);return p},hide:function(){this.display="none";r._api().fp_hidePlugin(q);return p},toggle:function(){this.display=r._api().fp_togglePlugin(q);return p},fadeTo:function(z,y,x){if(typeof y=="function"){x=y;y=500}if(x){var w=f();t[w]=x}this.display=r._api().fp_fadeTo(q,z,y,w);this.opacity=z;return p},fadeIn:function(x,w){return p.fadeTo(1,x,w)},fadeOut:function(x,w){return p.fadeTo(0,x,w)},getName:function(){return q},getPlayer:function(){return r},_fireEvent:function(x,w,y){if(x=="onUpdate"){var A=r._api().fp_getPlugin(q);if(!A){return}j(p,A);delete p.methods;if(!v){n(A.methods,function(){var C=""+this;p[C]=function(){var D=[].slice.call(arguments);var E=r._api().fp_invoke(q,C,D);return E==="undefined"||E===undefined?p:E}});v=true}}var B=t[x];if(B){var z=B.apply(p,w);if(x.slice(0,1)=="_"){delete t[x]}return z}return p}})};function b(r,H,u){var x=this,w=null,E=false,v,t,G=[],z={},y={},F,s,q,D,p,B;j(x,{id:function(){return F},isLoaded:function(){return(w!==null&&w.fp_play!==undefined&&!E)},getParent:function(){return r},hide:function(I){if(I){r.style.height="0px"}if(x.isLoaded()){w.style.height="0px"}return x},show:function(){r.style.height=B+"px";if(x.isLoaded()){w.style.height=p+"px"}return x},isHidden:function(){return x.isLoaded()&&parseInt(w.style.height,10)===0},load:function(K){if(!x.isLoaded()&&x._fireEvent("onBeforeLoad")!==false){var I=function(){if(v&&!flashembed.isSupported(H.version)){r.innerHTML=""}if(K){K.cached=true;k(y,"onLoad",K)}flashembed(r,H,{config:u})};var J=0;n(a,function(){this.unload(function(L){if(++J==a.length){I()}})})}return x},unload:function(K){if(v.replace(/\s/g,"")!==""){if(x._fireEvent("onBeforeUnload")===false){if(K){K(false)}return x}E=true;try{if(w){if(w.fp_isFullscreen()){w.fp_toggleFullscreen()}w.fp_close();x._fireEvent("onUnload")}}catch(I){}var J=function(){w=null;r.innerHTML=v;E=false;if(K){K(true)}};if(/WebKit/i.test(navigator.userAgent)&&!/Chrome/i.test(navigator.userAgent)){setTimeout(J,0)}else{J()}}else{if(K){K(false)}}return x},getClip:function(I){if(I===undefined){I=D}return G[I]},getCommonClip:function(){return t},getPlaylist:function(){return G},getPlugin:function(I){var K=z[I];if(!K&&x.isLoaded()){var J=x._api().fp_getPlugin(I);if(J){K=new m(I,J,x);z[I]=K}}return K},getScreen:function(){return x.getPlugin("screen")},getControls:function(){return x.getPlugin("controls")._fireEvent("onUpdate")},getLogo:function(){try{return x.getPlugin("logo")._fireEvent("onUpdate")}catch(I){}},getPlay:function(){return x.getPlugin("play")._fireEvent("onUpdate")},getConfig:function(I){return I?l(u):u},getFlashParams:function(){return H},loadPlugin:function(L,K,N,M){if(typeof N=="function"){M=N;N={}}var J=M?f():"_";x._api().fp_loadPlugin(L,K,N,J);var I={};I[J]=M;var O=new m(L,null,x,I);z[L]=O;return O},getState:function(){return x.isLoaded()?w.fp_getState():-1},play:function(J,I){var K=function(){if(J!==undefined){x._api().fp_play(J,I)}else{x._api().fp_play()}};if(x.isLoaded()){K()}else{if(E){setTimeout(function(){x.play(J,I)},50)}else{x.load(function(){K()})}}return x},getVersion:function(){var J="flowplayer.js @VERSION";if(x.isLoaded()){var I=w.fp_getVersion();I.push(J);return I}return J},_api:function(){if(!x.isLoaded()){throw"Flowplayer "+x.id()+" not loaded when calling an API method"}return w},setClip:function(I){n(I,function(J,K){if(typeof K=="function"){k(y,J,K);delete I[J]}else{if(J=="onCuepoint"){$f(r).getCommonClip().onCuepoint(I[J][0],I[J][1])}}});x.setPlaylist([I]);return x},getIndex:function(){return q},bufferAnimate:function(I){w.fp_bufferAnimate(I===undefined||I);return x},_swfHeight:function(){return w.clientHeight}});n(("Click*,Load*,Unload*,Keypress*,Volume*,Mute*,Unmute*,PlaylistReplace,ClipAdd,Fullscreen*,FullscreenExit,Error,MouseOver,MouseOut").split(","),function(){var I="on"+this;if(I.indexOf("*")!=-1){I=I.slice(0,I.length-1);var J="onBefore"+I.slice(2);x[J]=function(K){k(y,J,K);return x}}x[I]=function(K){k(y,I,K);return x}});n(("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 I=this;x[I]=function(K,J){if(!x.isLoaded()){return x}var L=null;if(K!==undefined&&J!==undefined){L=w["fp_"+I](K,J)}else{L=(K===undefined)?w["fp_"+I]():w["fp_"+I](K)}return L==="undefined"||L===undefined?x:L}});x._fireEvent=function(R){if(typeof R=="string"){R=[R]}var S=R[0],P=R[1],N=R[2],M=R[3],L=0;if(u.debug){h(R)}if(!x.isLoaded()&&S=="onLoad"&&P=="player"){w=w||c(s);p=x._swfHeight();n(G,function(){this._fireEvent("onLoad")});n(z,function(T,U){U._fireEvent("onUpdate")});t._fireEvent("onLoad")}if(S=="onLoad"&&P!="player"){return}if(S=="onError"){if(typeof P=="string"||(typeof P=="number"&&typeof N=="number")){P=N;N=M}}if(S=="onContextMenu"){n(u.contextMenu[P],function(T,U){U.call(x)});return}if(S=="onPluginEvent"||S=="onBeforePluginEvent"){var I=P.name||P;var J=z[I];if(J){J._fireEvent("onUpdate",P);return J._fireEvent(N,R.slice(3))}return}if(S=="onPlaylistReplace"){G=[];var O=0;n(P,function(){G.push(new i(this,O++,x))})}if(S=="onClipAdd"){if(P.isInStream){return}P=new i(P,N,x);G.splice(N,0,P);for(L=N+1;L<G.length;L++){G[L].index++}}var Q=true;if(typeof P=="number"&&P<G.length){D=P;var K=G[P];if(K){Q=K._fireEvent(S,N,M)}if(!K||Q!==false){Q=t._fireEvent(S,N,M,K)}}n(y[S],function(){Q=this.call(x,P,N);if(this.cached){y[S].splice(L,1)}if(Q===false){return false}L++});return Q};function C(){if($f(r)){$f(r).getParent().innerHTML="";q=$f(r).getIndex();a[q]=x}else{a.push(x);q=a.length-1}B=parseInt(r.style.height,10)||r.clientHeight;F=r.id||"fp"+f();s=H.id||F+"_api";H.id=s;v=r.innerHTML;if(typeof u=="string"){u={clip:{url:u}}}u.playerId=F;u.clip=u.clip||{};if(r.getAttribute("href",2)&&!u.clip.url){u.clip.url=r.getAttribute("href",2)}if(u.clip.url){u.clip.url=e(u.clip.url)}t=new i(u.clip,-1,x);u.playlist=u.playlist||[u.clip];var J=0;n(u.playlist,function(){var M=this;if(typeof M=="object"&&M.length){M={url:""+M}}if(M.url){M.url=e(M.url)}n(u.clip,function(N,O){if(O!==undefined&&M[N]===undefined&&typeof O!="function"){M[N]=O}});u.playlist[J]=M;M=new i(M,J,x);G.push(M);J++});n(u,function(M,N){if(typeof N=="function"){if(t[M]){t[M](N)}else{k(y,M,N)}delete u[M]}});n(u.plugins,function(M,N){if(N){z[M]=new m(M,N,x)}});if(!u.plugins||u.plugins.controls===undefined){z.controls=new m("controls",null,x)}z.canvas=new m("canvas",null,x);v=r.innerHTML;function L(M){if(/iPad|iPhone|iPod/i.test(navigator.userAgent)&&!/.flv$/i.test(G[0].url)&&!K()){return true}if(!x.isLoaded()&&x._fireEvent("onBeforeClick")!==false){x.load()}return g(M)}function K(){return x.hasiPadSupport&&x.hasiPadSupport()}function I(){if(v.replace(/\s/g,"")!==""){if(r.addEventListener){r.addEventListener("click",L,false)}else{if(r.attachEvent){r.attachEvent("onclick",L)}}}else{if(r.addEventListener&&!K()){r.addEventListener("click",g,false)}x.load()}}setTimeout(I,0)}if(typeof r=="string"){var A=c(r);if(!A){throw"Flowplayer cannot access element: "+r}r=A;C()}else{C()}}var a=[];function d(p){this.length=p.length;this.each=function(r){n(p,r)};this.size=function(){return p.length};var q=this;for(name in b.prototype){q[name]=function(){var r=arguments;q.each(function(){this[name].apply(this,r)})}}}window.flowplayer=window.$f=function(){var q=null;var p=arguments[0];if(!arguments.length){n(a,function(){if(this.isLoaded()){q=this;return false}});return q||a[0]}if(arguments.length==1){if(typeof p=="number"){return a[p]}else{if(p=="*"){return new d(a)}n(a,function(){if(this.id()==p.id||this.id()==p||this.getParent()==p){q=this;return false}});return q}}if(arguments.length>1){var u=arguments[1],r=(arguments.length==3)?arguments[2]:{};if(typeof u=="string"){u={src:u}}u=j({bgcolor:"#000000",version:[10,1],expressInstall:"http://releases.flowplayer.org/swf/expressinstall.swf",cachebusting:false},u);if(typeof p=="string"){if(p.indexOf(".")!=-1){var t=[];n(o(p),function(){t.push(new b(this,l(u),l(r)))});return new d(t)}else{var s=c(p);return new b(s!==null?s:l(p),l(u),l(r))}}else{if(p){return new b(p,l(u),l(r))}}}return null};j(window.$f,{fireEvent:function(){var q=[].slice.call(arguments);var r=$f(q[0]);return r?r._fireEvent(q.slice(1)):null},addPlugin:function(p,q){b.prototype[p]=q;return $f},each:n,extend:j});if(typeof jQuery=="function"){jQuery.fn.flowplayer=function(r,q){if(!arguments.length||typeof arguments[0]=="number"){var p=[];this.each(function(){var s=$f(this);if(s){p.push(s)}});return arguments.length?p[arguments[0]]:new d(p)}return this.each(function(){$f(this,l(r),q?l(q):{})})}}}();!function(){var h=document.all,j="http://get.adobe.com/flashplayer",c=typeof jQuery=="function",e=/(\d+)[^\d]+(\d+)[^\d]*(\d*)/,b={width:"100%",height:"100%",id:"_"+(""+Math.random()).slice(9),allowfullscreen:true,allowscriptaccess:"always",quality:"high",version:[3,0],onFail:null,expressInstall:null,w3c:false,cachebusting:false};if(window.attachEvent){window.attachEvent("onbeforeunload",function(){__flash_unloadHandler=function(){};__flash_savedUnloadHandler=function(){}})}function i(m,l){if(l){for(var f in l){if(l.hasOwnProperty(f)){m[f]=l[f]}}}return m}function a(f,n){var m=[];for(var l in f){if(f.hasOwnProperty(l)){m[l]=n(f[l])}}return m}window.flashembed=function(f,m,l){if(typeof f=="string"){f=document.getElementById(f.replace("#",""))}if(!f){return}if(typeof m=="string"){m={src:m}}return new d(f,i(i({},b),m),l)};var g=i(window.flashembed,{conf:b,getVersion:function(){var m,f,o;try{o=navigator.plugins["Shockwave Flash"];if(o[0].enabledPlugin!=null){f=o.description.slice(16)}}catch(p){try{m=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");f=m&&m.GetVariable("$version")}catch(n){try{m=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");f=m&&m.GetVariable("$version")}catch(l){}}}f=e.exec(f);return f?[1*f[1],1*f[(f[1]*1>9?2:3)]*1]:[0,0]},asString:function(l){if(l===null||l===undefined){return null}var f=typeof l;if(f=="object"&&l.push){f="array"}switch(f){case"string":l=l.replace(new RegExp('(["\\\\])',"g"),"\\$1");l=l.replace(/^\s?(\d+\.?\d*)%/,"$1pct");return'"'+l+'"';case"array":return"["+a(l,function(o){return g.asString(o)}).join(",")+"]";case"function":return'"function()"';case"object":var m=[];for(var n in l){if(l.hasOwnProperty(n)){m.push('"'+n+'":'+g.asString(l[n]))}}return"{"+m.join(",")+"}"}return String(l).replace(/\s/g," ").replace(/\'/g,'"')},getHTML:function(o,l){o=i({},o);var n='<object width="'+o.width+'" height="'+o.height+'" id="'+o.id+'" name="'+o.id+'"';if(o.cachebusting){o.src+=((o.src.indexOf("?")!=-1?"&":"?")+Math.random())}if(o.w3c||!h){n+=' data="'+o.src+'" type="application/x-shockwave-flash"'}else{n+=' classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"'}n+=">";if(o.w3c||h){n+='<param name="movie" value="'+o.src+'" />'}o.width=o.height=o.id=o.w3c=o.src=null;o.onFail=o.version=o.expressInstall=null;for(var m in o){if(o[m]){n+='<param name="'+m+'" value="'+o[m]+'" />'}}var p="";if(l){for(var f in l){if(l[f]){var q=l[f];p+=f+"="+(/function|object/.test(typeof q)?g.asString(q):q)+"&"}}p=p.slice(0,-1);n+='<param name="flashvars" value=\''+p+"' />"}n+="</object>";return n},isSupported:function(f){return k[0]>f[0]||k[0]==f[0]&&k[1]>=f[1]}});var k=g.getVersion();function d(f,n,m){if(g.isSupported(n.version)){f.innerHTML=g.getHTML(n,m)}else{if(n.expressInstall&&g.isSupported([6,65])){f.innerHTML=g.getHTML(i(n,{src:n.expressInstall}),{MMredirectURL:encodeURIComponent(location.href),MMplayerType:"PlugIn",MMdoctitle:document.title})}else{if(!f.innerHTML.replace(/\s/g,"")){f.innerHTML="<h2>Flash version "+n.version+" or greater is required</h2><h3>"+(k[0]>0?"Your version is "+k:"You have no flash plugin installed")+"</h3>"+(f.tagName=="A"?"<p>Click here to download latest version</p>":"<p>Download latest version from <a href='"+j+"'>here</a></p>");if(f.tagName=="A"||f.tagName=="DIV"){f.onclick=function(){location.href=j}}}if(n.onFail){var l=n.onFail.call(this);if(typeof l=="string"){f.innerHTML=l}}}}if(h){window[n.id]=document.getElementById(n.id)}i(this,{getRoot:function(){return f},getOptions:function(){return n},getConf:function(){return m},getApi:function(){return f.firstChild}})}if(c){jQuery.tools=jQuery.tools||{version:"@VERSION"};jQuery.tools.flashembed={conf:b};jQuery.fn.flashembed=function(l,f){return this.each(function(){$(this).data("flashembed",flashembed(this,l,f))})}}}();
\ No newline at end of file
diff --git a/typo3/sysext/mediace/Resources/Contrib/flowplayer/flowplayer-3.2.18.swf b/typo3/sysext/mediace/Resources/Contrib/flowplayer/flowplayer-3.2.18.swf
deleted file mode 100644 (file)
index aed1fcb..0000000
Binary files a/typo3/sysext/mediace/Resources/Contrib/flowplayer/flowplayer-3.2.18.swf and /dev/null differ
diff --git a/typo3/sysext/mediace/Resources/Contrib/flowplayer/flowplayer.controls-3.2.16.swf b/typo3/sysext/mediace/Resources/Contrib/flowplayer/flowplayer.controls-3.2.16.swf
deleted file mode 100644 (file)
index eacc8c0..0000000
Binary files a/typo3/sysext/mediace/Resources/Contrib/flowplayer/flowplayer.controls-3.2.16.swf and /dev/null differ
diff --git a/typo3/sysext/mediace/Resources/Contrib/videojs/video-js/LICENSE.txt b/typo3/sysext/mediace/Resources/Contrib/videojs/video-js/LICENSE.txt
deleted file mode 100644 (file)
index 65c5ca8..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
diff --git a/typo3/sysext/mediace/Resources/Contrib/videojs/video-js/README.markdown b/typo3/sysext/mediace/Resources/Contrib/videojs/video-js/README.markdown
deleted file mode 100644 (file)
index 91df923..0000000
+++ /dev/null
@@ -1,202 +0,0 @@
-VideoJS - [HTML5 Video Player](http://videojs.com)
-==================================================
-Version 2.0.2
-
-View [VideoJS.com](http://videojs.com) for a demo and overview.
-
-VideoJS is an HTML5 video player that uses the HTML5 video tag built into modern browsers, and uses javascript to add custom controls, new functionality, and to fix cross browser bugs.
-
-The base of VideoJS is Kroc Camen's [Video for Everybody](http://camendesign.com/code/video_for_everybody), which is a video embed code that falls back to a Flash video player or download links for browsers and devices that don't support HTML5 video.
-
-View demo.html for an example of how to use it.
-
-Originally based on [this tutorial](http://blog.steveheffernan.com/2010/04/how-to-build-an-html5-video-player/).
-
-Contributors (Github Username)
-------------------------------
-heff, dz0ny, sentientbit, tvdeyen, brandonarbini, gordonbrander, Shraymonks, albertogasparin, sandaru1, nicholasbs, majornista, Fredust85, @wonderboymusic
-
-
-Getting Started
----------------
-
-### Step 1: Include VideoJS Javascript and CSS files in your page.
-Change the src/href to the appropriate location on your server.
-
-    <script src="video.js" type="text/javascript" charset="utf-8"></script>
-    <link rel="stylesheet" href="video-js.css" type="text/css" media="screen" title="Video JS" charset="utf-8">
-
-
-### Step 2: Add the VideoJS setup code to your page or another script.
-Must run after the VideoJS javascript file has been included
-
-    <script type="text/javascript" charset="utf-8">
-
-      // Add VideoJS to all video tags on the page when the DOM is ready
-      VideoJS.setupAllWhenReady();
-
-    </script>
-
-
-### Step 3: Add the VideoJS embed code to your page (grab the latest version for demo.html).
-Change the video and image files to your own. You can even swap out the Flash Fallback for your own, just maintain the "vjs-flash-fallback" class on the object. I know, seems like a lot of HTML, but it's super compatible. [Check it](http://camendesign.com/code/video_for_everybody/test.html).
-
-    <!-- Begin VideoJS -->
-    <div class="video-js-box">
-      <!-- Using the Video for Everybody Embed Code http://camendesign.com/code/video_for_everybody -->
-      <video id="example_video_1" class="video-js" width="640" height="264" poster="http://video-js.zencoder.com/oceans-clip.png" controls preload>
-        <source src="http://video-js.zencoder.com/oceans-clip.mp4" type='video/mp4; codecs="avc1.42E01E, mp4a.40.2"' />
-        <source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm; codecs="vp8, vorbis"' />
-        <source src="http://video-js.zencoder.com/oceans-clip.ogv" type='video/ogg; codecs="theora, vorbis"' />
-        <!-- Flash Fallback. Use any flash video player here. Make sure to keep the vjs-flash-fallback class. -->
-        <object id="flash_fallback_1" class="vjs-flash-fallback" width="640" height="264" type="application/x-shockwave-flash"
-          data="http://releases.flowplayer.org/swf/flowplayer-3.2.1.swf">
-          <param name="movie" value="http://releases.flowplayer.org/swf/flowplayer-3.2.1.swf" />
-          <param name="allowfullscreen" value="true" />
-          <param name="flashvars" value='config={"playlist":["http://video-js.zencoder.com/oceans-clip.png", {"url": "http://video-js.zencoder.com/oceans-clip.mp4","autoPlay":false,"autoBuffering":true}]}' />
-          <!-- Image Fallback. Typically the same as the poster image. -->
-          <img src="http://video-js.zencoder.com/oceans-clip.png" width="640" height="264" alt="Poster Image"
-            title="No video playback capabilities." />
-        </object>
-      </video>
-      <!-- Download links provided for devices that can't play video in the browser. -->
-      <p class="vjs-no-video"><strong>Download Video:</strong>
-        <a href="http://video-js.zencoder.com/oceans-clip.mp4">MP4</a>,
-        <a href="http://video-js.zencoder.com/oceans-clip.webm">WebM</a>,
-        <a href="http://video-js.zencoder.com/oceans-clip.ogv">Ogg</a><br>
-        <!-- Support VideoJS by keeping this link. -->
-        <a href="http://videojs.com">HTML5 Video Player</a> by VideoJS
-      </p>
-    </div>
-    <!-- End VideoJS -->
-
-
-Storing a Reference to the Player(s)
-------------------------------------
-You can set up the player(s) in a way that allows you to access it later, and control things like the video playback. In this case, the setup has to happen after the DOM has been loaded. You can use any library's DOM Ready method, or the one built into VideoJS.
-
-### Using a Video's ID or Element
-
-    VideoJS.DOMReady(function(){
-      var myPlayer = VideoJS.setup("example_video_1");
-    });
-
-
-### Using an array of video elements/IDs
-Note: It returns an array of players
-
-    VideoJS.DOMReady(function(){
-      var myManyPlayers = VideoJS.setup(["example_video_1", "example_video_2", video3Element]);
-    });
-
-
-### All videos on the page with the "video-js" class
-
-    VideoJS.DOMReady(function(){
-      var myManyPlayers = VideoJS.setup("All");
-    });
-
-
-### After you have references to your players you can...(example)
-
-    VideoJS.DOMReady(function(){
-      var myPlayer = VideoJS.setup("example_video_1");
-      myPlayer.play(); // Starts playing the video for this player.
-    });
-
-
-Setting Options
----------------
-Set options when setting up the videos. The defaults are shown here.
-
-    VideoJS.setupAllWhenReady({
-      controlsBelow: false, // Display control bar below video instead of in front of
-      controlsHiding: true, // Hide controls when mouse is not over the video
-      defaultVolume: 0.85, // Will be overridden by user's last volume if available
-      flashPlayerVersion: 9, // Required flash version for fallback
-    });
-
-### Or as the second option of VideoJS.setup
-
-    VideoJS.DOMReady(function(){
-      var myPlayer = VideoJS.setup("example_video_1", {
-        // Same options
-      });
-    });
-
-
-Coming Next
------------
-- API to Flash fallback
-
-Changelog
----------
-2.0.2 (2010-12-10)
-
-- Feature: Rewrote and optimized subtitle code.
-- Feature: Protecting against volume ranges outside of 1 and 0.
-- Fix: Bug in Safari for Mac OS 10.5 (Leopard) that was breaking fullscreen.
-
-2.0.1 (2010-11-22)
-
-- Fix: Issue with big play button when multiple videos are on the page.
-- Fix: Optimized play progress tracking.
-- Fix: Optimized buffer progress checking.
-- Fix: Firefox not showing Flash fallback object.
-
-2.0.0 (2010-11-21)
-
-- Feature: Created "behaviors" concept for adding behaviors to elements
-- Feature: Switched back to divs for controls, for more portable styles
-- Feature: Created playerFallbackOrder array option. ["html5", "flash", "links"]
-- Feature: Created playerType concept, for initializing different platforms
-- Feature: Added play button for Android
-- Feature: Added spinner for iPad (non-fullscreen)
-- Feature: Split into multiple files for easier development
-- Feature: Combined VideoJS & _V_ into the same variable to reduce confusion
-- Fix: Checking for m3u8 files (Apple HTTP Streaming)
-- Fix: Catching error on localStorage full that safari seems to randomly throw
-- Fix: Scrubbing to end doesn't trigger onEnded
-
-1.1.5 (2010-11-09)
-
-- Feature: Switched to track method for setting subtitles. Now works like spec.
-- Feature: Created "players" concept for defining fallbacks and fallback order
-- Fix: Android playback bug.
-- Fix: Massive reorganization of code to make easier to navigate
-
-1.1.4 (2010-11-06)
-
-- Feature: Added loading spinner.
-- Feature: Improved styles loaded checking.
-- Feature: Added volume() function to get and set volume through the player.
-- Fix: Fix issue where FF would loop video in background when ended.
-- Fix: Bug in Chrome that shows poster & plays audio if you set currentTime too quickly.
-- Fix: Bug in Safari where waiting is triggered and shows spinner when not needed
-- Fix: Updated to show links if only unplayable sources and no Flash.
-- Fix: Issue where if play button was loaded after play, it wouldn't hide.
-
-1.1.3 (2010-10-19)
-
-- Feature: Width/Height functions for resizing the player
-- Feature: Made initial click & hold trigger new value on progress and volume
-- Feature: Made controls not hide when hovering over them
-- Feature: Added big play button as default starting control.
-- Fix: Removed trailing comma that was breaking IE7
-- Fix: Removed some vars from global scope
-- Fix: Changed a document.onmousemove to an eventListener to prevent conflicts
-- Fix: Added a unique ID to FlowPlayer demo object to fix a FlowPlayer bug. Thanks @emirpprime.
-- Fix: Safari error on unloaded video
-
-1.1.2 (2010-09-20)
-
-- Added a fix for the poster bug in iPad/iPhone
-- Added more specificity to styles
-
-1.1.1 (2010-09-14)
-
-- First Formally Versioned Release
-
-1.0.0 (2010-05-18)
-
-- First released
diff --