Merge remote branch 'origin/damba' into damba

1 files changed, 29 insertions, 10 deletions

diff --git a/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java b/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java
index f95324e..88bfbf8 100644
--- a/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java
+++ b/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java
@@ -238,21 +238,40 @@ public class YalpOutputPluginImpl extends OutputPluginInterfacePOA {
 				return;
 		}
 
-		String comp = "#transcode{vcodec=DIV3,vb=256,scale=1,";
-		comp += "acodec=mpga,ab=192,channels=2}";
-		comp += ":duplicate{dst=";
-
-		setup2 = "setup "+howtoStream.info.name+" output "+comp+"std{access=udp,";
-		setup2 +="mux=ts,";
-		setup2 +="dst=" + howtoStream.destIp + ":9993";// + howtoStream.info.params;
-		setup2 += "}";
-
-		String control = "control "+howtoStream.info.name+" play";
+		String comp, control;
+
+		if (howtoStream.info.params == "openmoko")
+		{
+			comp = "#transcode{vcodec=DIV3,vb=256,scale=1,";
+			comp += "acodec=mpga,ab=192,channels=2}";
+			comp += ":duplicate{dst=";
+			setup2 = "setup "+howtoStream.info.name+" output "+comp+"std{access=udp,";
+			setup2 +="mux=ts,";
+			setup2 +="dst=" + howtoStream.destIp + ":9993";// + howtoStream.info.params;
+			setup2 += "}";
+			control = "control "+howtoStream.info.name+" play";
+
+		} else {
+
+			comp = "#transcode{vcodec=DIV3,vb=256,scale=1,";
+			comp += "acodec=mpga,ab=192,channels=2}";
+			comp += ":duplicate{dst=";
+
+			setup2 = "setup "+howtoStream.info.name+" output "+comp+"std{access=udp,";
+			setup2 +="mux=ts,";
+			setup2 +="dst=" + howtoStream.destIp + ":9993";// + howtoStream.info.params;
+			setup2 += "}";
+
+			control = "control "+howtoStream.info.name+" play";
+		}
 
 		TelnetInterface telnet = new TelnetInterface(hostIP, 4212, "admin");
 		telnet.exec(newString);
+		logger.debug ("exec1 done: "+newString);
 		telnet.exec(setup2);
+		logger.debug ("exec2 done: "+setup2);
 		telnet.exec(control);
+		logger.debug ("exec3 done: "+control);
 		telnet.close();
 	}