diff --git a/src/main/java/org/olat/modules/video/ui/VideoMetaDataEditFormController.java b/src/main/java/org/olat/modules/video/ui/VideoMetaDataEditFormController.java index 77b12466943882a8339ea68ba04c43c6f2958a1f..cb0e145a27fe2db1a1e60376c8d8b2d0ea3d7bc7 100644 --- a/src/main/java/org/olat/modules/video/ui/VideoMetaDataEditFormController.java +++ b/src/main/java/org/olat/modules/video/ui/VideoMetaDataEditFormController.java @@ -28,6 +28,7 @@ import org.olat.core.util.Formatter; import org.olat.core.util.StringHelper; import org.olat.modules.video.VideoManager; import org.olat.modules.video.VideoMetadata; +import org.olat.repository.RepositoryEntry; import org.olat.resource.OLATResource; import org.springframework.beans.factory.annotation.Autowired; @@ -40,11 +41,11 @@ import org.springframework.beans.factory.annotation.Autowired; public class VideoMetaDataEditFormController extends FormBasicController { @Autowired private VideoManager videoManager; - private OLATResource videoResource; + private RepositoryEntry repoEntry; - public VideoMetaDataEditFormController(UserRequest ureq, WindowControl wControl, OLATResource re) { + public VideoMetaDataEditFormController(UserRequest ureq, WindowControl wControl, RepositoryEntry repoEntry) { super(ureq, wControl); - videoResource = re; + this.repoEntry = repoEntry; initForm(ureq); } @@ -53,7 +54,11 @@ public class VideoMetaDataEditFormController extends FormBasicController { UserRequest ureq) { setFormTitle("tab.video.metaDataConfig"); + OLATResource videoResource = repoEntry.getOlatResource(); + VideoMetadata videoMetadata = videoManager.readVideoMetadataFile(videoResource); + uifactory.addStaticTextElement("video.config.duration", repoEntry.getExpenditureOfWork(), formLayout); + uifactory.addStaticTextElement("video.config.width", String.valueOf(videoMetadata.getWidth()) + "px", formLayout); uifactory.addStaticTextElement("video.config.height", String.valueOf(videoMetadata.getHeight()) + "px", formLayout); diff --git a/src/main/java/org/olat/modules/video/ui/VideoSettingsController.java b/src/main/java/org/olat/modules/video/ui/VideoSettingsController.java index 51e181852db86280a565f0b98cdab601ae755018..96bda434c380e40d64d94e57b956529fa473e354 100644 --- a/src/main/java/org/olat/modules/video/ui/VideoSettingsController.java +++ b/src/main/java/org/olat/modules/video/ui/VideoSettingsController.java @@ -104,7 +104,7 @@ public class VideoSettingsController extends BasicController { private void doOpenMetaDataConfig(UserRequest ureq) { if(metaDataController == null) { - metaDataController = new VideoMetaDataEditFormController(ureq, getWindowControl(), entry.getOlatResource()); + metaDataController = new VideoMetaDataEditFormController(ureq, getWindowControl(), entry); listenTo(metaDataController); } mainVC.put("segmentCmp", metaDataController.getInitialComponent()); diff --git a/src/main/java/org/olat/modules/video/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/modules/video/ui/_i18n/LocalStrings_de.properties index 4a014e9c1988517c543433419618c2354cd90dd9..feab462ca0cc8f4e1216fd87b4c2b40e17d3c8d9 100644 --- a/src/main/java/org/olat/modules/video/ui/_i18n/LocalStrings_de.properties +++ b/src/main/java/org/olat/modules/video/ui/_i18n/LocalStrings_de.properties @@ -44,6 +44,7 @@ transcoding.processing=In Bearbeitung transcoding.waiting=In Warteschlange video.config.creationDate=Erstellungsdatum video.config.description=Beschreibung +video.config.duration=L\u00E4nge video.config.fileSize=Gr\u00F6sse der Videodatei video.config.filename=Dateinamen video.config.height=H\u00F6he diff --git a/src/main/java/org/olat/modules/video/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/modules/video/ui/_i18n/LocalStrings_en.properties index 11258cdb39d094337ddc241e301e8f05920df6a6..54bccbdb98c466e934fae6a6113024489f7de235 100644 --- a/src/main/java/org/olat/modules/video/ui/_i18n/LocalStrings_en.properties +++ b/src/main/java/org/olat/modules/video/ui/_i18n/LocalStrings_en.properties @@ -44,6 +44,7 @@ transcoding.processing=Processing transcoding.waiting=Queuing video.config.creationDate=Creation Date video.config.description=Description +video.config.duration=Running time video.config.fileSize=Size of videofile video.config.filename=Filename video.config.height=Height