Skip to content
Snippets Groups Projects
Commit 9ddad80e authored by srosse's avatar srosse
Browse files

Merge with 70f4832a7aa0765167940ad9b420a129b94d3589

parents e2c671a7 73e73630
No related branches found
No related tags found
No related merge requests found
...@@ -28,6 +28,7 @@ import org.olat.core.util.Formatter; ...@@ -28,6 +28,7 @@ import org.olat.core.util.Formatter;
import org.olat.core.util.StringHelper; import org.olat.core.util.StringHelper;
import org.olat.modules.video.VideoManager; import org.olat.modules.video.VideoManager;
import org.olat.modules.video.VideoMetadata; import org.olat.modules.video.VideoMetadata;
import org.olat.repository.RepositoryEntry;
import org.olat.resource.OLATResource; import org.olat.resource.OLATResource;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -40,11 +41,11 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -40,11 +41,11 @@ import org.springframework.beans.factory.annotation.Autowired;
public class VideoMetaDataEditFormController extends FormBasicController { public class VideoMetaDataEditFormController extends FormBasicController {
@Autowired @Autowired
private VideoManager videoManager; 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); super(ureq, wControl);
videoResource = re; this.repoEntry = repoEntry;
initForm(ureq); initForm(ureq);
} }
...@@ -53,7 +54,11 @@ public class VideoMetaDataEditFormController extends FormBasicController { ...@@ -53,7 +54,11 @@ public class VideoMetaDataEditFormController extends FormBasicController {
UserRequest ureq) { UserRequest ureq) {
setFormTitle("tab.video.metaDataConfig"); setFormTitle("tab.video.metaDataConfig");
OLATResource videoResource = repoEntry.getOlatResource();
VideoMetadata videoMetadata = videoManager.readVideoMetadataFile(videoResource); 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.width", String.valueOf(videoMetadata.getWidth()) + "px", formLayout);
uifactory.addStaticTextElement("video.config.height", String.valueOf(videoMetadata.getHeight()) + "px", formLayout); uifactory.addStaticTextElement("video.config.height", String.valueOf(videoMetadata.getHeight()) + "px", formLayout);
......
...@@ -104,7 +104,7 @@ public class VideoSettingsController extends BasicController { ...@@ -104,7 +104,7 @@ public class VideoSettingsController extends BasicController {
private void doOpenMetaDataConfig(UserRequest ureq) { private void doOpenMetaDataConfig(UserRequest ureq) {
if(metaDataController == null) { if(metaDataController == null) {
metaDataController = new VideoMetaDataEditFormController(ureq, getWindowControl(), entry.getOlatResource()); metaDataController = new VideoMetaDataEditFormController(ureq, getWindowControl(), entry);
listenTo(metaDataController); listenTo(metaDataController);
} }
mainVC.put("segmentCmp", metaDataController.getInitialComponent()); mainVC.put("segmentCmp", metaDataController.getInitialComponent());
......
...@@ -42,8 +42,9 @@ track.upload.error.nofile=Bitte w\u00E4hlen Sie eine Datei aus. ...@@ -42,8 +42,9 @@ track.upload.error.nofile=Bitte w\u00E4hlen Sie eine Datei aus.
track.upload.error.nolang=Bitte w\u00E4hlen Sie eine Sprache aus dieser Liste aus track.upload.error.nolang=Bitte w\u00E4hlen Sie eine Sprache aus dieser Liste aus
transcoding.processing=In Bearbeitung transcoding.processing=In Bearbeitung
transcoding.waiting=In Warteschlange transcoding.waiting=In Warteschlange
video.config.creationDate=Erstellungs Datum video.config.creationDate=Erstellungsdatum
video.config.description=Beschreibung video.config.description=Beschreibung
video.config.duration=L\u00E4nge
video.config.fileSize=Gr\u00F6sse der Videodatei video.config.fileSize=Gr\u00F6sse der Videodatei
video.config.filename=Dateinamen video.config.filename=Dateinamen
video.config.height=H\u00F6he video.config.height=H\u00F6he
......
...@@ -44,6 +44,7 @@ transcoding.processing=Processing ...@@ -44,6 +44,7 @@ transcoding.processing=Processing
transcoding.waiting=Queuing transcoding.waiting=Queuing
video.config.creationDate=Creation Date video.config.creationDate=Creation Date
video.config.description=Description video.config.description=Description
video.config.duration=Running time
video.config.fileSize=Size of videofile video.config.fileSize=Size of videofile
video.config.filename=Filename video.config.filename=Filename
video.config.height=Height video.config.height=Height
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment