streaming functionality is back again :-)

git-svn-id: http://manut.eu/svn/yalp/trunk@9 f059d3a0-6783-47b7-97ff-1fe0bbf25129

2 files changed, 16 insertions, 53 deletions

diff --git a/src/YalpClients/SwtClient/Model.java b/src/YalpClients/SwtClient/Model.java
index 111d1ca..1c2bf48 100755
--- a/src/YalpClients/SwtClient/Model.java
+++ b/src/YalpClients/SwtClient/Model.java
@@ -500,13 +500,14 @@ public class Model {
  */

 	private boolean startVLC(){

 

-		String vlcCmd = "/usr/bin/vlc" + //settings.vlcCommand +

-			" --reset-config --video-on-top -I telnet --telnet-port 12345 ";

+		String vlcCmd = "/usr/bin/vlc" + 

+			" --ignore-config --no-qt-privacy-ask --video-on-top --qt-display-mode=2";

+			//settings.vlcCommand 

 /*

 		switch (this.actualStream.getAccess()){

 			case UDP:

 			*/

-				vlcCmd += "udp:@";

+				vlcCmd += " udp://@localhost:";

 				/*

 				break;

 			case HTTP:

diff --git a/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java b/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java
index fee8de5..f95324e 100644
--- a/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java
+++ b/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java
@@ -184,21 +184,15 @@ public class YalpOutputPluginImpl extends OutputPluginInterfacePOA {
 		String input = "";
 		TelnetInterface telnet = new TelnetInterface(hostIP, 4212, "admin");
 
-		input += "new "+howtoStream.info.name+" broadcast";
+		input += "new "+howtoStream.info.name+" broadcast enabled";
 
 		for(int i=0; i < howtoStream.playlist.length; i++){
-			input += " input ";
+			input += " input file://";
 			input += howtoStream.playlist[i].path + "/";
 			input += howtoStream.playlist[i].fileName;
 		}
-		telnet.exec(input);
-
-		input = "setup " + howtoStream.info.name + " enabled";
-		telnet.exec(input);
 
-		input = "setup " + howtoStream.info.name + " loop";
 		telnet.exec(input);
-
 		telnet.close();
 }
 
@@ -236,57 +230,25 @@ public class YalpOutputPluginImpl extends OutputPluginInterfacePOA {
 
 		switch (howtoStream.info.type.value()) {
 			case AccessType._STREAM:
-				newString  = "control "+howtoStream.info.name+" vod enabled";
-				break;
-			/*
-			case AccessType._BROADCAST:
-				newString  = "new "+howtoStream.info.name+" broadcast enabled";
+				newString  = "control "+howtoStream.info.name+" broadcast enabled";
 				break;
-			*/
+
 			default:
-				newString ="";
 				System.out.println("server.VlcStreamer.start: unsupported Type");
-				break;
+				return;
 		}
 
-		String comp = "#transcode{vcodec=mp2v,vb=1024,scale=1,acodec=mpga,ab=192,channels=2}:duplicate{dst=";
+		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{";
-/*
-		switch (howtoStream.access_type.value()){
-			case Access._STREAM:
-				setup2 += "access=http,";
-				break;
-			case Access._UDP:
-*/
-				setup2 += "access=udp,";
-/*
-				break;
-			default:
-				System.out.println("server.VlcStreamer.start: unsupported Accesstype");
-				break;
-		}
-
-		switch (howtoStream.mux_type.value()){
-			case Mux._TS:
-*/
-				setup2 += "mux=es,url=" + howtoStream.destIp + ":";
-				setup2 += /*howtoStream.info.params +*/ "9993}";
-/*			break;
-			case Mux._ES:
-				setup2 += "mux=es,url="+howtoStream.ip+":"+howtoStream.port+"}";
-				break;
-			case Mux._OGG:
-				setup2 += "mux=ogg,url="+howtoStream.ip+":"+howtoStream.port+"}";
-				break;
-			default:
-				System.out.println("server.VlcStreamer.start: unsupported Muxer");
-				break;
-		}
-*/
+		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";
+
 		TelnetInterface telnet = new TelnetInterface(hostIP, 4212, "admin");
 		telnet.exec(newString);
 		telnet.exec(setup2);