EflClient: Fix Streaming

- stream has to be created AND started
- Selection Class seems to be very strange. Cleaned it up a little, but could be
    moved completely into 'Media' Class.

Signed-off-by: Manuel Traut <manut@mecka.net>

3 files changed, 15 insertions, 40 deletions

diff --git a/src/YalpClients/EflClient/media.py b/src/YalpClients/EflClient/media.py
index 41b4d5d..daf6d52 100644
--- a/src/YalpClients/EflClient/media.py
+++ b/src/YalpClients/EflClient/media.py
@@ -21,11 +21,8 @@ class Media(object):
 		YalpInterfaces.STREAM)
 		stream = YalpInterfaces.Output(0, info, songlist, YalpInterfaces.CREATE, ip)
 		ret = self.servercon.control(stream)
-		startstream = YalpInterfaces.Output(0,stream, songlist,
-		YalpInterfaces.START, ip)
-		#print startstream
-		#print "result:", self.result
-		print "Startstream.Info:", startstream.info
-		vid = emotion.Emotion(self.win.canvas,module_filename="gstreamer")
+		stream.outputAction = YalpInterfaces.START
+		ret = self.servercon.control(stream)
+		print "stream.info:", stream.info
 		#video = playlist.Selection(self.win, self.c, vid, startstream)
-		video = playlist.Selection(self.win, self.c, vid, startstream)
+		video = playlist.Selection(self.win, self.c, stream)
diff --git a/src/YalpClients/EflClient/playlist.py b/src/YalpClients/EflClient/playlist.py
index 07354cf..059a04d 100644
--- a/src/YalpClients/EflClient/playlist.py
+++ b/src/YalpClients/EflClient/playlist.py
@@ -12,45 +12,20 @@ import elementary
 import media
 
 class Selection(object):
-	def __init__(self, win, c, vid, stream):
+	def __init__(self, win, c, stream):
 		self.win = win
 		self.c = c
-		self.vid = vid
-		self.add_button()
+		self.vid = emotion.Emotion(win.canvas, module_filename="gstreamer")
 		self.stream = stream
-
-	def fill_playlist(self, obj, str, x):
-		playlist = elementary.List(self.win);
-		playlist.size_hint_weight_set(1.0, 1.0)
-		playlist.size_hint_align_set(-1.0, -1.0)
-		box1 = elementary.Box(self.win)
-		self.win.resize_object_add(box1)
-		self.c.part_swallow("playlist", playlist)
-		box1.pack_end(playlist)
-		playlist.show()
-		playlist.item_append(str, None, None, None)
-		playlist.go()
-		box1.show()
-
-	def playbutton_clicked(self, obj, signal, source):
-		self.play_video()
+		self.play_video ()
 
 	def play_video(self):
-		#vid = emotion.Emotion(win.canvas,module_filename="xine");
 		print self.stream
-		#self.vid.file_set("Lordi.mpg");
-		ip = self.stream[0][0].destIp
-		print ip
-		self.vid.file_set(self.stream);
+		# ip = self.stream[0][0].destIp  THIS CHRASHES!!!
+		ip = "127.0.0.1"
+		port = 9993
+		print "stream from", ip, port
+		self.vid.file_set("udp://"+ip+":"+str(port))
 		self.c.part_swallow("video", self.vid)
 		self.vid.show()
 		self.vid.play = True
-
-	def add_button(self):
-		playbutton = elementary.Button(self.win)
-		playbutton.label_set("Play")
-		self.c.part_swallow("playlist_buttonframe", playbutton)
-		self.c.signal_callback_add("mouse,clicked,1","playlist_buttonframe",
-		self.playbutton_clicked)
-		playbutton.show()
-
diff --git a/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java b/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java
index f7a8d6c..88bfbf8 100644
--- a/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java
+++ b/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java
@@ -267,8 +267,11 @@ public class YalpOutputPluginImpl extends OutputPluginInterfacePOA {
 
 		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();
 	}