Refactor: Update file paths for DlfMediaPlayer JavaScript files

Build/package.json

@@ -46,10 +46,10 @@
     "less": "4.1.0",
     "less-loader": "^12.2.0",
     "mini-css-extract-plugin": "^2.9.0",
-    "typescript": "^5.4.5",
+    "typescript": "^5.6",
     "webpack": "^5.91.0",
     "webpack-cli": "^5.1.4",
-    "webpack-dev-server": "^5.0.4",
+    "webpack-dev-server": "^5.1.0",
     "webpack-remove-empty-scripts": "^1.0.4"
   },
   "dependencies": {
@@ -60,7 +60,7 @@
     "peaks.js": "^3.4.0",
     "piexifjs": "^1.0.6",
     "qrcode": "^1.5.3",
-    "shaka-player": "^4.9.2",
+    "shaka-player": "^4.11.2",
     "tslib": "^2.6.3",
     "waveform-data": "^4.5.0",
     "wavesurfer.js": "^7.7.15"

Build/webpack.config.js

@@ -29,7 +29,7 @@ module.exports = (env, argv) => {
       'DlfMediaPlayerStyles': path.resolve(PRIVATE_PATH, `Less/DlfMediaPlayer.less`),
     },
     output: {
-      filename: 'JavaScript/[name].js',
+      filename: 'JavaScript/DlfMediaPlayer/[name].js',
       path: PUBLIC_PATH,
     },
     plugins: [

Classes/Controller/MediaPlayerController.php

@@ -267,12 +267,12 @@ protected function addPlayerAssets(): void
         );
         $assetCollector->addJavaScript(
             'DlfMediaPlayerJs',
-            'EXT:dlf/Resources/Public/JavaScript/DlfMediaPlayer.js',
+            'EXT:dlf/Resources/Public/JavaScript/DlfMediaPlayer/DlfMediaPlayer.js',
             ['type' => 'text/javascript']
         );
         $assetCollector->addJavaScript(
             'DlfMediaVendorJs',
-            'EXT:dlf/Resources/Public/JavaScript/DlfMediaVendor.js',
+            'EXT:dlf/Resources/Public/JavaScript/DlfMediaPlayer/DlfMediaVendor.js',
             ['type' => 'text/javascript']
         );
     }

Documentation/Features/MediaPlayer/Developers.rst

@@ -128,7 +128,7 @@ The Dev Server is intended for developing and testing the media player in a well
 
    .. code-block:: html
 
-      <script src="/JavaScript/DlfMediaPlayer.js"></script>
+      <script src="/JavaScript/DlfMediaPlayer/DlfMediaPlayer.js"></script>
 
 *  The server is configured in the ``devServer`` key in ``/Build/webpack.config.js``.
 

Resources/Private/DevServer/audio.html

@@ -7,8 +7,8 @@
         <title>Document</title>
 
         <script src="/Resources/Public/JavaScript/jQuery/jquery-3.6.0.min.js"></script>
-        <script src="/JavaScript/DlfMediaVendor.js"></script>
-        <script src="/JavaScript/DlfMediaPlayer.js"></script>
+        <script src="/JavaScript/DlfMediaPlayer/DlfMediaVendor.js"></script>
+        <script src="/JavaScript/DlfMediaPlayer/DlfMediaPlayer.js"></script>
 
         <script src="/app-config.js"></script>
 

Resources/Private/DevServer/disposable.html

@@ -88,7 +88,7 @@
 
         <div id="players"></div>
 
-        <script src="/JavaScript/DlfMediaVendor.js"></script>
-        <script src="/JavaScript/DlfMediaPlayer.js"></script>
+        <script src="/JavaScript/DlfMediaPlayer/DlfMediaVendor.js"></script>
+        <script src="/JavaScript/DlfMediaPlayer/DlfMediaPlayer.js"></script>
     </body>
 </html>

Resources/Private/DevServer/equalizer.html

@@ -57,8 +57,8 @@ <h1>Equalizer Test</h1>
             </dlf-media-controls>
         </slub-media>
 
-        <script src="/JavaScript/DlfMediaVendor.js"></script>
-        <script src="/JavaScript/DlfMediaPlayer.js"></script>
+        <script src="/JavaScript/DlfMediaPlayer/DlfMediaVendor.js"></script>
+        <script src="/JavaScript/DlfMediaPlayer/DlfMediaPlayer.js"></script>
 
         <script>
             const equalizer = document.querySelector('dlf-equalizer');

Resources/Private/DevServer/maximal-beispiel.html

@@ -53,7 +53,7 @@
             <dlf-meta key="title" value="Wolfgang H Scholz „Schattensucher“ (1994)"></dlf-meta>
         </slub-media>
 
-        <script src="/JavaScript/DlfMediaVendor.js"></script>
-        <script src="/JavaScript/DlfMediaPlayer.js"></script>
+        <script src="/JavaScript/DlfMediaPlayer/DlfMediaVendor.js"></script>
+        <script src="/JavaScript/DlfMediaPlayer/DlfMediaPlayer.js"></script>
     </body>
 </html>

Resources/Private/DevServer/player-mode.html

@@ -40,8 +40,8 @@
             };
         </script>
 
-        <script src="/JavaScript/DlfMediaVendor.js"></script>
-        <script src="/JavaScript/DlfMediaPlayer.js"></script>
+        <script src="/JavaScript/DlfMediaPlayer/DlfMediaVendor.js"></script>
+        <script src="/JavaScript/DlfMediaPlayer/DlfMediaPlayer.js"></script>
 
         <h3>This player should always be in audio mode</h3>
 

Resources/Private/DevServer/schattensucher.html

@@ -58,7 +58,7 @@
             </dlf-media-controls>
         </slub-media>
 
-        <script src="/JavaScript/DlfMediaVendor.js"></script>
-        <script src="/JavaScript/DlfMediaPlayer.js"></script>
+        <script src="/JavaScript/DlfMediaPlayer/DlfMediaVendor.js"></script>
+        <script src="/JavaScript/DlfMediaPlayer/DlfMediaPlayer.js"></script>
     </body>
 </html>

Resources/Public/JavaScript/DlfMediaPlayer/DlfMediaPlayer.js.LICENSE.txt

@@ -0,0 +1,35 @@
+/** @preserve
+This is based upon VideoFrame (see below). Changes:
+- export default
+- Slightly refine JSDoc/typings
+
+Source: https://raw.githubusercontent.com/allensarkisyan/VideoFrame/master/VideoFrame.js
+
+---
+
+VideoFrame: HTML5 Video - SMTPE Time Code capturing and Frame Seeking API
+@version 0.2.2
+@author Allen Sarkisyan
+@copyright (c) 2013 Allen Sarkisyan
+@license Released under the Open Source MIT License
+
+Contributors:
+Allen Sarkisyan - Lead engineer
+Paige Raynes - Product Development
+Dan Jacinto - Video Asset Quality Analyst
+
+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, and/or distribute 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.
+- Attribution must be credited to the original authors in derivative works.
+
+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.
+*/