diff options
Diffstat (limited to 'src')
51 files changed, 21 insertions, 16 deletions
diff --git a/src/YalpAuth/YalpPGSqlAuth/DatabaseDefines.java b/src/YalpAuth/YalpPGSqlAuth/DatabaseDefines.java index 5ff92c7..5ff92c7 100644..100755 --- a/src/YalpAuth/YalpPGSqlAuth/DatabaseDefines.java +++ b/src/YalpAuth/YalpPGSqlAuth/DatabaseDefines.java diff --git a/src/YalpAuth/YalpPGSqlAuth/PGSqlAuth.java b/src/YalpAuth/YalpPGSqlAuth/PGSqlAuth.java index ba88ad4..ba88ad4 100644..100755 --- a/src/YalpAuth/YalpPGSqlAuth/PGSqlAuth.java +++ b/src/YalpAuth/YalpPGSqlAuth/PGSqlAuth.java diff --git a/src/YalpAuth/YalpPGSqlAuth/YalpAuthPluginImpl.java b/src/YalpAuth/YalpPGSqlAuth/YalpAuthPluginImpl.java index d7c7a21..d7c7a21 100644..100755 --- a/src/YalpAuth/YalpPGSqlAuth/YalpAuthPluginImpl.java +++ b/src/YalpAuth/YalpPGSqlAuth/YalpAuthPluginImpl.java diff --git a/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java b/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java index d497c3d..d497c3d 100644..100755 --- a/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java +++ b/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java 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 diff --git a/src/YalpInputs/YalpPGSqlInput/DatabaseDefines.java b/src/YalpInputs/YalpPGSqlInput/DatabaseDefines.java index b6ee2ce..b6ee2ce 100644..100755 --- a/src/YalpInputs/YalpPGSqlInput/DatabaseDefines.java +++ b/src/YalpInputs/YalpPGSqlInput/DatabaseDefines.java diff --git a/src/YalpInputs/YalpPGSqlInput/PGSqlInput.java b/src/YalpInputs/YalpPGSqlInput/PGSqlInput.java index 339ee4c..339ee4c 100644..100755 --- a/src/YalpInputs/YalpPGSqlInput/PGSqlInput.java +++ b/src/YalpInputs/YalpPGSqlInput/PGSqlInput.java diff --git a/src/YalpInputs/YalpPGSqlInput/YalpInputPluginImpl.java b/src/YalpInputs/YalpPGSqlInput/YalpInputPluginImpl.java index ef18b31..ef18b31 100644..100755 --- a/src/YalpInputs/YalpPGSqlInput/YalpInputPluginImpl.java +++ b/src/YalpInputs/YalpPGSqlInput/YalpInputPluginImpl.java diff --git a/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/Browser.java b/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/Browser.java index 4ab592f..4ab592f 100644..100755 --- a/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/Browser.java +++ b/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/Browser.java diff --git a/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/FileBrowser.java b/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/FileBrowser.java index d622eec..d622eec 100644..100755 --- a/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/FileBrowser.java +++ b/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/FileBrowser.java diff --git a/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/FileFinder.java b/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/FileFinder.java index 2d6527c..2d6527c 100644..100755 --- a/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/FileFinder.java +++ b/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/FileFinder.java diff --git a/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/FileInfoManager.java b/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/FileInfoManager.java index 47dd62a..47dd62a 100644..100755 --- a/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/FileInfoManager.java +++ b/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/FileInfoManager.java diff --git a/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/YalpPGSQLIndexer.java b/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/YalpPGSQLIndexer.java index c5cedaa..c5cedaa 100644..100755 --- a/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/YalpPGSQLIndexer.java +++ b/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/YalpPGSQLIndexer.java diff --git a/src/YalpInputs/YalpPGSqlInput/YalpPGSqlInput.java b/src/YalpInputs/YalpPGSqlInput/YalpPGSqlInput.java index 4ee06e6..4ee06e6 100644..100755 --- a/src/YalpInputs/YalpPGSqlInput/YalpPGSqlInput.java +++ b/src/YalpInputs/YalpPGSqlInput/YalpPGSqlInput.java diff --git a/src/YalpInputs/YalpPGSqlInput/db-design-sql.backup b/src/YalpInputs/YalpPGSqlInput/db-design-sql.backup index 941e6a7..941e6a7 100644..100755 --- a/src/YalpInputs/YalpPGSqlInput/db-design-sql.backup +++ b/src/YalpInputs/YalpPGSqlInput/db-design-sql.backup diff --git a/src/YalpOutputs/YalpVlcTelnetOutput/TelnetInterface.java b/src/YalpOutputs/YalpVlcTelnetOutput/TelnetInterface.java index cafa0b8..cafa0b8 100644..100755 --- a/src/YalpOutputs/YalpVlcTelnetOutput/TelnetInterface.java +++ b/src/YalpOutputs/YalpVlcTelnetOutput/TelnetInterface.java diff --git a/src/YalpOutputs/YalpVlcTelnetOutput/VlcStreamer.java b/src/YalpOutputs/YalpVlcTelnetOutput/VlcStreamer.java index 568bfb8..568bfb8 100644..100755 --- a/src/YalpOutputs/YalpVlcTelnetOutput/VlcStreamer.java +++ b/src/YalpOutputs/YalpVlcTelnetOutput/VlcStreamer.java diff --git a/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java b/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java index 88bfbf8..0ff1387 100644..100755 --- a/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java +++ b/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java @@ -242,12 +242,12 @@ public class YalpOutputPluginImpl extends OutputPluginInterfacePOA { if (howtoStream.info.params == "openmoko") { - comp = "#transcode{vcodec=DIV3,vb=256,scale=1,"; - comp += "acodec=mpga,ab=192,channels=2}"; + comp = "#transcode{vcodec=theo,vb=256,scale=1,"; + comp += "acodec=vorb,ab=64,channels=2}"; comp += ":duplicate{dst="; - setup2 = "setup "+howtoStream.info.name+" output "+comp+"std{access=udp,"; - setup2 +="mux=ts,"; - setup2 +="dst=" + howtoStream.destIp + ":9993";// + howtoStream.info.params; + setup2 = "setup "+howtoStream.info.name+" output "+comp+"std{access=http,"; + setup2 +="mux=ogg,"; + setup2 +="dst=0.0.0.0:9993";// + howtoStream.info.params; setup2 += "}"; control = "control "+howtoStream.info.name+" play"; diff --git a/src/YalpOutputs/YalpVlcTelnetOutput/YalpVlcTelnetOutput.java b/src/YalpOutputs/YalpVlcTelnetOutput/YalpVlcTelnetOutput.java index 766936d..766936d 100644..100755 --- a/src/YalpOutputs/YalpVlcTelnetOutput/YalpVlcTelnetOutput.java +++ b/src/YalpOutputs/YalpVlcTelnetOutput/YalpVlcTelnetOutput.java diff --git a/src/YalpServer/AuthPlugin.java b/src/YalpServer/AuthPlugin.java index 4c505e3..4c505e3 100644..100755 --- a/src/YalpServer/AuthPlugin.java +++ b/src/YalpServer/AuthPlugin.java diff --git a/src/YalpServer/AuthPluginHandler.java b/src/YalpServer/AuthPluginHandler.java index 1011b69..1011b69 100644..100755 --- a/src/YalpServer/AuthPluginHandler.java +++ b/src/YalpServer/AuthPluginHandler.java diff --git a/src/YalpServer/InputPlugin.java b/src/YalpServer/InputPlugin.java index 97c0d76..97c0d76 100644..100755 --- a/src/YalpServer/InputPlugin.java +++ b/src/YalpServer/InputPlugin.java diff --git a/src/YalpServer/InputPluginHandler.java b/src/YalpServer/InputPluginHandler.java index 40c6208..40c6208 100644..100755 --- a/src/YalpServer/InputPluginHandler.java +++ b/src/YalpServer/InputPluginHandler.java diff --git a/src/YalpServer/OutputPlugin.java b/src/YalpServer/OutputPlugin.java index 605aa5f..605aa5f 100644..100755 --- a/src/YalpServer/OutputPlugin.java +++ b/src/YalpServer/OutputPlugin.java diff --git a/src/YalpServer/OutputPluginHandler.java b/src/YalpServer/OutputPluginHandler.java index 4a12f2b..4a12f2b 100644..100755 --- a/src/YalpServer/OutputPluginHandler.java +++ b/src/YalpServer/OutputPluginHandler.java diff --git a/src/yalp.idl b/src/yalp.idl index 4c56fbb..4c56fbb 100644..100755 --- a/src/yalp.idl +++ b/src/yalp.idl |