Python-EFL-GUI: added Streaming Functions

- prepared files for streaming
- changed medialist to dynamic list

Signed-off-by: Nicole Vreden <damba@mecka.net>

4 files changed, 24 insertions, 33 deletions

diff --git a/src/YalpClients/EflClient/main.py b/src/YalpClients/EflClient/main.py
index 790e49d..dadbc53 100755
--- a/src/YalpClients/EflClient/main.py
+++ b/src/YalpClients/EflClient/main.py
@@ -13,6 +13,7 @@ import elementary
 import searchframe
 import medialist
 import playlist
+import YalpInterfaces
 
 def destroy(obj, event, data):
 	print "Bye bye"
@@ -27,14 +28,13 @@ def gui():
 	win.autodel_set(True)
 	#win.destroy = destroy
 
-	vid = emotion.Emotion(win.canvas,module_filename="xine");
+	#vid = emotion.Emotion(win.canvas,module_filename="xine");
 	edje_file = os.path.join(os.path.dirname(sys.argv[0]),"yalp_gui.edj")
 	c = edje.Edje(win.canvas, file=edje_file, group = "yalp")
-	m = medialist.Medias(win, c)
 	s = searchframe.Search(win, c)
-	video = playlist.Selection(win, c, vid)
+	
+	#video = playlist.Selection(win, c, vid)
 
-	m.fill_medialist(win, c)
 	c.show()
 	win.resize(800,600)
 	win.show()
diff --git a/src/YalpClients/EflClient/medialist.py b/src/YalpClients/EflClient/medialist.py
index c3a3e70..13132d2 100644
--- a/src/YalpClients/EflClient/medialist.py
+++ b/src/YalpClients/EflClient/medialist.py
@@ -14,34 +14,16 @@ class Medias(object):
 		self.win = win
 		self.c = c
 		self.add_button()
-	
-	def huhu(self, obj, str, x):
-		print "guck guck"
+		self.medialist = elementary.List(self.win);
+		self.medialist.size_hint_weight_set(1.0, 1.0)
+		self.medialist.size_hint_align_set(-1.0, -1.0)
+		self.c.part_swallow("medialist", self.medialist)
 
-	def fill_medialist(self, win, c):
-		items = [("huhu", self.huhu),
-						("haha", self.huhu),
-						("hoho", self.huhu),
-						("hehe", self.huhu),
-						("hihi", self.huhu),
-						("12345", self.huhu),
-						("abcde", self.huhu),
-						("fghij", self.huhu),
-						("klmno", self.huhu),
-						("pqrst", self.huhu),
-						("uvwxyz", self.huhu)]
+	def add_media(self, media):
+		self.medialist.item_append(media.result.name, None, None, media.callback)
+		self.medialist.show()
+		self.medialist.go()
 
-		medialist = elementary.List(win);
-		medialist.size_hint_weight_set(1.0, 1.0)
-		medialist.size_hint_align_set(-1.0, -1.0)
-		c.part_swallow("medialist", medialist)
-
-		for item in items:
-			#print item[0]
-			medialist.item_append(item[0], None, None, item[1])
-
-		medialist.show()
-		medialist.go()
 
 	def add_button(self):
 		addbutton = elementary.Button(self.win)
diff --git a/src/YalpClients/EflClient/playlist.py b/src/YalpClients/EflClient/playlist.py
index 69f3ba3..7352a67 100644
--- a/src/YalpClients/EflClient/playlist.py
+++ b/src/YalpClients/EflClient/playlist.py
@@ -9,12 +9,15 @@ import emotion
 import evas
 import elementary
 
+import media
+
 class Selection(object):
-	def __init__(self, win, c, vid):
+	def __init__(self, win, c, vid, stream):
 		self.win = win
 		self.c = c
 		self.vid = vid
 		self.add_button()
+		self.stream = stream
 
 	def fill_playlist(self, obj, str, x):
 		playlist = elementary.List(self.win);
@@ -34,7 +37,9 @@ class Selection(object):
 
 	def play_video(self):
 		#vid = emotion.Emotion(win.canvas,module_filename="xine");
-		self.vid.file_set("Lordi.mpg");
+		print self.stream
+		#self.vid.file_set("Lordi.mpg");
+		self.vid.file_set(self.stream);
 		self.c.part_swallow("video", self.vid)
 		self.vid.show()
 		self.vid.play = True
diff --git a/src/YalpClients/EflClient/searchframe.py b/src/YalpClients/EflClient/searchframe.py
index 79e3fc6..8f97923 100644
--- a/src/YalpClients/EflClient/searchframe.py
+++ b/src/YalpClients/EflClient/searchframe.py
@@ -9,6 +9,8 @@ import emotion
 import evas
 import elementary
 
+import client
+
 class Search(object):
 	def __init__(self, win, c):
 		self.win = win
@@ -18,9 +20,11 @@ class Search(object):
 		c.signal_callback_add("mouse,clicked,1","find_buttonframe",
 		self.findbutton_clicked)
 	def findbutton_clicked(self, obj, signal,source):
-		print "Huhu"
 		searchentry = textfield.entry_get()
 		print searchentry
+		co = client.Corba(self.win, self.c)
+		co.corba_search(searchentry)
+		
 
 	def add_button(self):
 		findbutton = elementary.Button(self.win)