summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/YalpClients/EflClient/client.py1
-rwxr-xr-xsrc/YalpClients/EflClient/medialist.py6
-rwxr-xr-xsrc/YalpClients/EflClient/playlist.py4
-rwxr-xr-xsrc/YalpClients/EflClient/searchframe.py2
-rwxr-xr-xsrc/YalpClients/EflClient/yalp_gui.edc4
5 files changed, 8 insertions, 9 deletions
diff --git a/src/YalpClients/EflClient/client.py b/src/YalpClients/EflClient/client.py
index 86e3232..c8923ba 100755
--- a/src/YalpClients/EflClient/client.py
+++ b/src/YalpClients/EflClient/client.py
@@ -40,7 +40,6 @@ class Corba(object):
m = medialist.Medialist(self.win, self.c)
video = playlist.Selection(self.win, self.c)
- print deps[0]
for dep in deps[0]:
current = media.Media(dep, video, self.blubb, self.win, self.c)
m.add_media(current)
diff --git a/src/YalpClients/EflClient/medialist.py b/src/YalpClients/EflClient/medialist.py
index dc75e4f..f767da3 100755
--- a/src/YalpClients/EflClient/medialist.py
+++ b/src/YalpClients/EflClient/medialist.py
@@ -19,9 +19,9 @@ class Medialist(object):
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)
-
+ self.medialist.show()
+
def add_media(self, media):
+ print media
self.medialist.item_append(media.result.name, None, None, media.callback)
- self.medialist.show()
self.medialist.go()
-
diff --git a/src/YalpClients/EflClient/playlist.py b/src/YalpClients/EflClient/playlist.py
index 234994f..03e88cc 100755
--- a/src/YalpClients/EflClient/playlist.py
+++ b/src/YalpClients/EflClient/playlist.py
@@ -17,7 +17,7 @@ class Selection(object):
def __init__(self, win, c):
self.win = win
self.c = c
- self.vid = emotion.Emotion(self.win.canvas, module_filename="gstreamer")
+ self.vid = emotion.Emotion(self.win.canvas, module_filename="xine")
self.add_button()
self.c.signal_callback_add("mouse,clicked,1", "medialist_buttonframe",
self.play_video)
@@ -35,7 +35,7 @@ class Selection(object):
def play_video(self, dummy, dumm, duemmer):
- ip = "127.0.0.1"
+ ip = "10.0.3.180"
port = 9993
info = YalpInterfaces.AccessInfo("huhu", "huhu", "xine", "openmoko",
YalpInterfaces.STREAM)
diff --git a/src/YalpClients/EflClient/searchframe.py b/src/YalpClients/EflClient/searchframe.py
index faa0799..c787ada 100755
--- a/src/YalpClients/EflClient/searchframe.py
+++ b/src/YalpClients/EflClient/searchframe.py
@@ -36,7 +36,7 @@ class Search(object):
searchframe = elementary.Frame(self.win)
textfield = elementary.Entry(self.win)
textfield.single_line_set(True)
- textfield.entry_set("Enter Title")
+ textfield.entry_set("")
self.c.part_swallow("searcharea", searchframe)
textfield.editable_set(True)
diff --git a/src/YalpClients/EflClient/yalp_gui.edc b/src/YalpClients/EflClient/yalp_gui.edc
index c73d70d..85ab93e 100755
--- a/src/YalpClients/EflClient/yalp_gui.edc
+++ b/src/YalpClients/EflClient/yalp_gui.edc
@@ -260,8 +260,8 @@ collections
program
{
name: "show_frames";
- //source: "video";
- source: "main";
+ source: "video";
+ //source: "main";
signal: "mouse,clicked,1";
action: STATE_SET "default" 0.0;
target: "find_buttonframe";