copy suckz :))

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

26 files changed, 16 insertions, 11 deletions

diff --git a/src/YalpClients/EflClient/corba_example/huhu.idl b/src/YalpClients/EflClient/corba_example/huhu.idl
index e455509..e455509 100644..100755
--- a/src/YalpClients/EflClient/corba_example/huhu.idl
+++ b/src/YalpClients/EflClient/corba_example/huhu.idl
diff --git a/src/YalpClients/EflClient/corba_test.py b/src/YalpClients/EflClient/corba_test.py
index e432499..e432499 100644..100755
--- a/src/YalpClients/EflClient/corba_test.py
+++ b/src/YalpClients/EflClient/corba_test.py
diff --git a/src/YalpClients/EflClient/list_test.edc b/src/YalpClients/EflClient/list_test.edc
index eb5762f..eb5762f 100644..100755
--- a/src/YalpClients/EflClient/list_test.edc
+++ b/src/YalpClients/EflClient/list_test.edc
diff --git a/src/YalpClients/EflClient/main.py b/src/YalpClients/EflClient/main.py
index dadbc53..973f287 100755
--- a/src/YalpClients/EflClient/main.py
+++ b/src/YalpClients/EflClient/main.py
@@ -36,7 +36,7 @@ def gui():
 	#video = playlist.Selection(win, c, vid)
 
 	c.show()
-	win.resize(800,600)
+	win.resize(480,620)
 	win.show()
 	#ecore.main_loop_begin();
 	elementary.run();
diff --git a/src/YalpClients/EflClient/media.py b/src/YalpClients/EflClient/media.py
index 692b27b..692b27b 100644..100755
--- a/src/YalpClients/EflClient/media.py
+++ b/src/YalpClients/EflClient/media.py
diff --git a/src/YalpClients/EflClient/medialist.py b/src/YalpClients/EflClient/medialist.py
index ff1a48b..ff1a48b 100644..100755
--- a/src/YalpClients/EflClient/medialist.py
+++ b/src/YalpClients/EflClient/medialist.py
diff --git a/src/YalpClients/EflClient/playlist.py b/src/YalpClients/EflClient/playlist.py
index 475b39e..58f2919 100644..100755
--- a/src/YalpClients/EflClient/playlist.py
+++ b/src/YalpClients/EflClient/playlist.py
@@ -15,17 +15,17 @@ class Selection(object):
 	def __init__(self, win, c, stream):
 		self.win = win
 		self.c = c
-		#self.vid = emotion.Emotion(win.canvas, module_filename="gstreamer")
+		self.vid = emotion.Emotion(self.win.canvas, module_filename="xine")
 		self.stream = stream
 		self.add_button()
-		self.play_video ()
+		self.play_video()
 		self.c.signal_callback_add("mouse,clicked,1", "medialist_buttonframe", self.huhu)
 	
 	def add_button(self):
-    		addbutton = elementary.Button(self.win)
-    		addbutton.label_set("Play")
-    		self.c.part_swallow("medialist_buttonframe", addbutton)
-    		addbutton.show()
+		addbutton = elementary.Button(self.win)
+		addbutton.label_set("Play")
+		self.c.part_swallow("medialist_buttonframe", addbutton)
+		addbutton.show()
 	
 	def huhu(self):
 		print "huhu"
@@ -35,8 +35,10 @@ class Selection(object):
 		ip = "127.0.0.1"
 		port = 9993
 		print "stream from", ip, port
-		self.vid.file_set("udp://"+ip+":"+str(port))
+		self.vid.file_set("http://"+ip+":"+str(port))
+		#self.vid.file_set("/home/manut/test.avi")
+		print "self.vid", self.vid
 		self.c.part_swallow("video", self.vid)
-		self.vid.show()
-		self.vid.play = True
+		#self.vid.show()
+		#self.vid.play = True
 	
diff --git a/src/YalpClients/EflClient/searchframe.py b/src/YalpClients/EflClient/searchframe.py
index faa0799..faa0799 100644..100755
--- a/src/YalpClients/EflClient/searchframe.py
+++ b/src/YalpClients/EflClient/searchframe.py
diff --git a/src/YalpClients/EflClient/yalp_gui.edc b/src/YalpClients/EflClient/yalp_gui.edc
index 70427af..c73d70d 100644..100755
--- a/src/YalpClients/EflClient/yalp_gui.edc
+++ b/src/YalpClients/EflClient/yalp_gui.edc
@@ -3,7 +3,7 @@ collections
 	group
 	{
 		name: "yalp";
-		min: 800 600;
+		min:  480 620;
 		parts
 		{
 			part
@@ -252,6 +252,7 @@ collections
 				action: STATE_SET "default" 1.0;
 				target: "searchframe";
 				target: "find_buttonframe";
+				target: "medialist_buttonframe";
 				target: "medialist";
 				target: "searcharea";
 				transition:SINUSOIDAL 1;
@@ -264,6 +265,8 @@ collections
 				signal: "mouse,clicked,1";
 				action: STATE_SET "default" 0.0;
 				target: "find_buttonframe";
+				target: "searchframe";
+				target: "medialist_buttonframe";
 				target: "medialist";
 				target: "searcharea";
 				transition:SINUSOIDAL 1;
diff --git a/src/YalpClients/SwtClient/GUI/GUI.java b/src/YalpClients/SwtClient/GUI/GUI.java
index 475f09b..475f09b 100644..100755
--- a/src/YalpClients/SwtClient/GUI/GUI.java
+++ b/src/YalpClients/SwtClient/GUI/GUI.java
diff --git a/src/YalpClients/SwtClient/GUI/InitGUI.java b/src/YalpClients/SwtClient/GUI/InitGUI.java
index 6b1fa51..6b1fa51 100644..100755
--- a/src/YalpClients/SwtClient/GUI/InitGUI.java
+++ b/src/YalpClients/SwtClient/GUI/InitGUI.java
diff --git a/src/YalpClients/SwtClient/GUI/LoadDialog.java b/src/YalpClients/SwtClient/GUI/LoadDialog.java
index dcdc4a8..dcdc4a8 100644..100755
--- a/src/YalpClients/SwtClient/GUI/LoadDialog.java
+++ b/src/YalpClients/SwtClient/GUI/LoadDialog.java
diff --git a/src/YalpClients/SwtClient/GUI/SWTResourceManager.java b/src/YalpClients/SwtClient/GUI/SWTResourceManager.java
index 87dffc3..87dffc3 100644..100755
--- a/src/YalpClients/SwtClient/GUI/SWTResourceManager.java
+++ b/src/YalpClients/SwtClient/GUI/SWTResourceManager.java
diff --git a/src/YalpClients/SwtClient/GUI/SortListener.java b/src/YalpClients/SwtClient/GUI/SortListener.java
index a2ff35a..a2ff35a 100644..100755
--- a/src/YalpClients/SwtClient/GUI/SortListener.java
+++ b/src/YalpClients/SwtClient/GUI/SortListener.java
diff --git a/src/YalpClients/SwtClient/GUI/StartDialog.java b/src/YalpClients/SwtClient/GUI/StartDialog.java
index 11ecc7f..11ecc7f 100644..100755
--- a/src/YalpClients/SwtClient/GUI/StartDialog.java
+++ b/src/YalpClients/SwtClient/GUI/StartDialog.java
diff --git a/src/YalpClients/WebClient/App.xaml b/src/YalpClients/WebClient/App.xaml
index 4919f98..4919f98 100644..100755
--- a/src/YalpClients/WebClient/App.xaml
+++ b/src/YalpClients/WebClient/App.xaml
diff --git a/src/YalpClients/WebClient/App.xaml.cs b/src/YalpClients/WebClient/App.xaml.cs
index f377355..f377355 100644..100755
--- a/src/YalpClients/WebClient/App.xaml.cs
+++ b/src/YalpClients/WebClient/App.xaml.cs
diff --git a/src/YalpClients/WebClient/Default.aspx.cs b/src/YalpClients/WebClient/Default.aspx.cs
index dbb34a1..dbb34a1 100644..100755
--- a/src/YalpClients/WebClient/Default.aspx.cs
+++ b/src/YalpClients/WebClient/Default.aspx.cs
diff --git a/src/YalpClients/WebClient/Default.aspx.designer.cs b/src/YalpClients/WebClient/Default.aspx.designer.cs
index 68788e8..68788e8 100644..100755
--- a/src/YalpClients/WebClient/Default.aspx.designer.cs
+++ b/src/YalpClients/WebClient/Default.aspx.designer.cs
diff --git a/src/YalpClients/WebClient/MainPage.xaml b/src/YalpClients/WebClient/MainPage.xaml
index bbda7d3..bbda7d3 100644..100755
--- a/src/YalpClients/WebClient/MainPage.xaml
+++ b/src/YalpClients/WebClient/MainPage.xaml
diff --git a/src/YalpClients/WebClient/MainPage.xaml.cs b/src/YalpClients/WebClient/MainPage.xaml.cs
index 37ccd83..37ccd83 100644..100755
--- a/src/YalpClients/WebClient/MainPage.xaml.cs
+++ b/src/YalpClients/WebClient/MainPage.xaml.cs
diff --git a/src/YalpClients/WebClient/Properties/AppManifest.xml b/src/YalpClients/WebClient/Properties/AppManifest.xml
index 31a38be..31a38be 100644..100755
--- a/src/YalpClients/WebClient/Properties/AppManifest.xml
+++ b/src/YalpClients/WebClient/Properties/AppManifest.xml
diff --git a/src/YalpClients/WebClient/Properties/AssemblyInfo.cs b/src/YalpClients/WebClient/Properties/AssemblyInfo.cs
index 3e7c95d..3e7c95d 100644..100755
--- a/src/YalpClients/WebClient/Properties/AssemblyInfo.cs
+++ b/src/YalpClients/WebClient/Properties/AssemblyInfo.cs
diff --git a/src/YalpClients/WebClient/VideoPlayer.csproj b/src/YalpClients/WebClient/VideoPlayer.csproj
index 4cbfec1..4cbfec1 100644..100755
--- a/src/YalpClients/WebClient/VideoPlayer.csproj
+++ b/src/YalpClients/WebClient/VideoPlayer.csproj
diff --git a/src/YalpClients/WebClient/VideoPlayer.csproj.user b/src/YalpClients/WebClient/VideoPlayer.csproj.user
index 00b6274..00b6274 100644..100755
--- a/src/YalpClients/WebClient/VideoPlayer.csproj.user
+++ b/src/YalpClients/WebClient/VideoPlayer.csproj.user
diff --git a/src/YalpClients/WebClient/VideoPlayer.sln b/src/YalpClients/WebClient/VideoPlayer.sln
index 2057756..2057756 100644..100755
--- a/src/YalpClients/WebClient/VideoPlayer.sln
+++ b/src/YalpClients/WebClient/VideoPlayer.sln