Revert "openolat#46: change stream1/2 to presenter/presentation to fix defaultProfile problem"

This reverts commit 09df9307.

src/main/java/org/olat/course/nodes/livestream/paella/PaellaFactory.java

@@ -22,31 +22,41 @@ package org.olat.course.nodes.livestream.paella;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.olat.core.CoreSpringFactory;
+import org.olat.core.util.StringHelper;
+import org.olat.course.nodes.livestream.LiveStreamModule;
+
 /**
- *
+ * 
  * Initial date: 13 Dec 2019<br>
  * @author uhensler, urs.hensler@frentix.com, http://www.frentix.com
  *
  */
 public class PaellaFactory {
-
-	public static Streams createStreams(String[] urls) {
+	
+	public static Streams createStreams(String url) {
 		Streams streams = new Streams();
-		if (urls.length > 0) {
+		if (StringHelper.containsNonWhitespace(url)) {
+			String[] urls = splitUrls(url);
 			addStreams(streams, urls);
 		}
 		return streams;
 	}
 
+	private static String[] splitUrls(String url) {
+		String urlSeparator = CoreSpringFactory.getImpl(LiveStreamModule.class).getUrlSeparator();
+		return url.split(urlSeparator);
+	}
+	
 	private static void addStreams(Streams streams, String[] urls) {
 		List<Stream> streamList = new ArrayList<>(2);
 		if (urls.length > 0) {
-			Stream presenter = createStream("presenter", urls[0]);
-			streamList.add(presenter);
+			Stream stream1 = createStream("stream1", urls[0]);
+			streamList.add(stream1);
 		}
 		if (urls.length > 1) {
-			Stream presenter = createStream("presentation", urls[1]);
-			streamList.add(presenter);
+			Stream stream1 = createStream("stream2", urls[1]);
+			streamList.add(stream1);
 		}
 		Stream[] streamArray = streamList.toArray(new Stream[streamList.size()]);
 		streams.setStreams(streamArray);
@@ -65,11 +75,11 @@ public class PaellaFactory {
 		addSource(sources, url);
 		return sources;
 	}
-
+	
 	private static void addSource(Sources sources, String url) {
 		String suffix = getSuffix(url);
 		if (suffix == null) return;
-
+	
 		switch (suffix) {
 		case "m3u8":
 			addM3U8Source(sources, url);
@@ -86,7 +96,7 @@ public class PaellaFactory {
 		Source source = createSource(url);
 		sources.setHls(new Source[] {source});
 	}
-
+	
 	private static void addMP4Source(Sources sources, String url) {
 		Source source = createSource(url);
 		sources.setMp4(new Source[] {source});

src/main/java/org/olat/course/nodes/livestream/paella/PlayerProfile.java

@@ -22,53 +22,53 @@ package org.olat.course.nodes.livestream.paella;
 import org.olat.core.gui.render.StringOutput;
 
 /**
- *
+ * 
  * Initial date: 17 Dec 2019<br>
  * @author uhensler, urs.hensler@frentix.com, http://www.frentix.com
  *
  */
 public enum PlayerProfile {
-
+	
 	both("player.profile.both") {
 		@Override
 		public void appendPlayerConfig(StringOutput sb) {
 			sb.append("      'es.upv.paella.singleStreamProfilePlugin': {");
 			sb.append("          'enabled': true,");
 			sb.append("          'videoSets': [");
-			sb.append("            { 'icon':'professor_icon.svg', 'id':'professor', 'content':['presenter']},");
-			sb.append("            { 'icon':'slide_icon.svg', 'id':'slide', 'content':['presentation']}");
+			sb.append("            { 'icon':'professor_icon.svg', 'id':'professor', 'content':['stream1']},");
+			sb.append("            { 'icon':'slide_icon.svg', 'id':'slide', 'content':['stream2']}");
 			sb.append("          ]");
 			sb.append("      },");
 			sb.append("      'es.upv.paella.dualStreamProfilePlugin': { 'enabled':true,");
 			sb.append("        'videoSets': [");
-			sb.append("          { 'icon':'slide_professor_icon.svg', 'id':'slide_over_professor', 'content':['presenter','presentation'] }");
+			sb.append("          { 'icon':'slide_professor_icon.svg', 'id':'slide_over_professor', 'content':['stream1','stream2'] }");
 			sb.append("        ]");
 			sb.append("      },");
 		}
 	},
-	presenter("player.profile.presenter") {
+	stream1("player.profile.stream1") {
 		@Override
 		public void appendPlayerConfig(StringOutput sb) {
 			sb.append("      'es.upv.paella.singleStreamProfilePlugin': {");
 			sb.append("          'enabled': true,");
 			sb.append("          'videoSets': [");
-			sb.append("            { 'icon':'professor_icon.svg', 'id':'professor', 'content':['presenter']}");
+			sb.append("            { 'icon':'professor_icon.svg', 'id':'professor', 'content':['stream1']}");
 			sb.append("          ]");
 			sb.append("      },");
 		}
 	},
-	presentation("player.profile.presentation") {
+	stream2("player.profile.stream2") {
 		@Override
 		public void appendPlayerConfig(StringOutput sb) {
 			sb.append("      'es.upv.paella.singleStreamProfilePlugin': {");
 			sb.append("          'enabled': true,");
 			sb.append("          'videoSets': [");
-			sb.append("            { 'icon':'slide_icon.svg', 'id':'slide', 'content':['presentation']}");
+			sb.append("            { 'icon':'slide_icon.svg', 'id':'slide', 'content':['stream2']}");
 			sb.append("          ]");
 			sb.append("      },");
 		}
 	};
-
+	
 	private final String i18nKey;
 
 	private PlayerProfile(String i18nKey) {

src/main/java/org/olat/course/nodes/livestream/ui/LiveStreamViewersController.java

@@ -142,7 +142,7 @@ public class LiveStreamViewersController extends BasicController {
 	}
 	
 	private PlayerProfile getPlayerProfile(ModuleConfiguration moduleConfiguration) {
-		PlayerProfile playerProfile = PlayerProfile.presentation;
+		PlayerProfile playerProfile = PlayerProfile.stream1;
 		
 		if (liveStreamModule.isMultiStreamEnabled()) {
 			String nodePlayerProfile = moduleConfiguration.getStringValue(LiveStreamCourseNode.CONFIG_PLAYER_PROFILE);

src/main/java/org/olat/course/nodes/livestream/ui/_i18n/LocalStrings_de.properties

@@ -25,8 +25,8 @@ peekview.open.upcoming=Alle anzeigen
 peekview.title.live=Jetzt live: {0}
 peekview.title.upcoming=Demn\u00E4chst: {0}
 player.profile.both=Beide Streams anzeigen
-player.profile.presenter=Vortragende anzeigen
-player.profile.presentation=Content anzeigen
+player.profile.stream1=Stream 1 anzeigen
+player.profile.stream2=Stream 2 anzeigen
 run.edit.events=Termine bearbeiten
 run.statistic=Statistik
 run.streams=Live Streams

src/main/java/org/olat/course/nodes/livestream/ui/_i18n/LocalStrings_en.properties

@@ -26,8 +26,8 @@ peekview.open.upcoming=Show all
 peekview.title.live=Live: {0}
 peekview.title.upcoming=Upcoming: {0}
 player.profile.both=Show both streams
-player.profile.presenter=Show presenter stream
-player.profile.presentation=Show content stream
+player.profile.stream1=Show stream 1
+player.profile.stream2=Show stream 2
 run.edit.events=Edit events
 run.statistic=Statistic
 run.streams=Livestreams

src/main/java/org/olat/course/nodes/livestream/ui/_i18n/LocalStrings_fr.properties

@@ -27,8 +27,8 @@ peekview.open.upcoming=Tout afficher
 peekview.title.live=En direct\: {0}
 peekview.title.upcoming=Prochainement\: {0}
 player.profile.both=Montrer les deux flux
-player.profile.presenter=Montrer le flux de lecture
-player.profile.presentation=Montrer le flux de presentation
+player.profile.stream1=Montrer le flux 1
+player.profile.stream2=Montrer le flux 2
 run.edit.events=Editer les rendez-vous
 run.statistic=Statistique
 run.streams=Diffusions en direct