Merge branch '4.0.x' into bugfix_27298_play_hls_videos

teltek · Dec 4, 2024 · 84459de · 84459de
2 parents e7e654c + 9bd24d4
commit 84459de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 344 deletions.
diff --git a/Services/StreamsManifest.php b/Services/StreamsManifest.php
@@ -66,16 +66,16 @@ public function createStreamsForVoD(MultimediaObject $multimediaObject, ?string
             $dataStream = $this->buildDataStream($tracks['display']);
             $pic = $this->getPreview($multimediaObject);
             $dataStream['preview'] = $pic;
-            $dataStream['language'] = $tracks['display'][0]->getLanguage();
+            $dataStream['language'] = $tracks['display'][0]->language();
             $dataStream['content'] = 'presenter';
-            $dataStream['audioTag'] = $tracks['display'][0]->getLanguage();
+            $dataStream['audioTag'] = $tracks['display'][0]->language();
             $data['streams'][] = $dataStream;
         }
 
         // Presentation tracks
         if ($tracks['presentation']) {
             $dataStream = $this->buildDataStream($tracks['presentation']);
-            $dataStream['language'] = $tracks['presentation'][0]->getLanguage();
+            $dataStream['language'] = $tracks['presentation'][0]->language();
             $dataStream['content'] = 'presentation';
             $data['streams'][] = $dataStream;
         }

diff --git a/Tests/Controller/PaellaRepositoryControllerTest.php b/Tests/Controller/PaellaRepositoryControllerTest.php