From 3cfdb235df1ee164181d89e7a30877e637c422f7 Mon Sep 17 00:00:00 2001 From: Nicole Vreden Date: Thu, 25 Feb 2010 17:50:17 +0100 Subject: copy suckz :)) Signed-off-by: Nicole Vreden --- ClientConfiguration.xml | 0 ServerSettings.xml | 12 ++++++------ bashrc_example | 0 build-java.bat | 0 build-tools/UmlGraph-5.2.jar | Bin build.bat | 0 build.xml | 0 client.policy | 0 doc/EFL/edjebook.pdf | 0 doc/asciidoc/content.txt | 0 doc/asciidoc/efl.txt | 0 doc/asciidoc/img/diagram-efl-simple-small.png | Bin doc/asciidoc/img/yalp_efl_gui.dia | Bin doc/asciidoc/task.txt | 0 doc/asciidoc/title.txt | 0 doc/asciidoc/yalp_efl_gui.png | Bin doc/img/diagram-efl-simple-small.png | Bin doc/img/yalp_efl_gui.dia | Bin efl-gui.sh | 2 +- lib/win-swt.jar | Bin log4j_input_plugin.conf | 0 log4j_output_plugin.conf | 0 log4j_server.conf | 0 postgresql_autodoc/Makefile | 0 postgresql_autodoc/config.log | 0 postgresql_autodoc/config.mk | 0 postgresql_autodoc/config.mk.in | 0 postgresql_autodoc/configure.ac | 0 postgresql_autodoc/dia.tmpl | 0 postgresql_autodoc/dot.tmpl | 0 postgresql_autodoc/html.tmpl | 0 postgresql_autodoc/neato.tmpl | 0 postgresql_autodoc/xml.tmpl | 0 postgresql_autodoc/zigzag.dia.tmpl | 0 removed-code/Browser.java | 0 server.bat | 0 server.policy | 0 server.sh | 5 +++-- src/YalpAuth/YalpPGSqlAuth/DatabaseDefines.java | 0 src/YalpAuth/YalpPGSqlAuth/PGSqlAuth.java | 0 src/YalpAuth/YalpPGSqlAuth/YalpAuthPluginImpl.java | 0 src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java | 0 src/YalpClients/EflClient/corba_example/huhu.idl | 0 src/YalpClients/EflClient/corba_test.py | 0 src/YalpClients/EflClient/list_test.edc | 0 src/YalpClients/EflClient/main.py | 2 +- src/YalpClients/EflClient/media.py | 0 src/YalpClients/EflClient/medialist.py | 0 src/YalpClients/EflClient/playlist.py | 20 +++++++++++--------- src/YalpClients/EflClient/searchframe.py | 0 src/YalpClients/EflClient/yalp_gui.edc | 5 ++++- src/YalpClients/SwtClient/GUI/GUI.java | 0 src/YalpClients/SwtClient/GUI/InitGUI.java | 0 src/YalpClients/SwtClient/GUI/LoadDialog.java | 0 .../SwtClient/GUI/SWTResourceManager.java | 0 src/YalpClients/SwtClient/GUI/SortListener.java | 0 src/YalpClients/SwtClient/GUI/StartDialog.java | 0 src/YalpClients/WebClient/App.xaml | 0 src/YalpClients/WebClient/App.xaml.cs | 0 src/YalpClients/WebClient/Default.aspx.cs | 0 src/YalpClients/WebClient/Default.aspx.designer.cs | 0 src/YalpClients/WebClient/MainPage.xaml | 0 src/YalpClients/WebClient/MainPage.xaml.cs | 0 .../WebClient/Properties/AppManifest.xml | 0 .../WebClient/Properties/AssemblyInfo.cs | 0 src/YalpClients/WebClient/VideoPlayer.csproj | 0 src/YalpClients/WebClient/VideoPlayer.csproj.user | 0 src/YalpClients/WebClient/VideoPlayer.sln | 0 src/YalpInputs/YalpPGSqlInput/DatabaseDefines.java | 0 src/YalpInputs/YalpPGSqlInput/PGSqlInput.java | 0 .../YalpPGSqlInput/YalpInputPluginImpl.java | 0 .../YalpPGSqlInput/YalpPGSQLIndexer/Browser.java | 0 .../YalpPGSQLIndexer/FileBrowser.java | 0 .../YalpPGSqlInput/YalpPGSQLIndexer/FileFinder.java | 0 .../YalpPGSQLIndexer/FileInfoManager.java | 0 .../YalpPGSQLIndexer/YalpPGSQLIndexer.java | 0 src/YalpInputs/YalpPGSqlInput/YalpPGSqlInput.java | 0 src/YalpInputs/YalpPGSqlInput/db-design-sql.backup | 0 .../YalpVlcTelnetOutput/TelnetInterface.java | 0 .../YalpVlcTelnetOutput/VlcStreamer.java | 0 .../YalpVlcTelnetOutput/YalpOutputPluginImpl.java | 10 +++++----- .../YalpVlcTelnetOutput/YalpVlcTelnetOutput.java | 0 src/YalpServer/AuthPlugin.java | 0 src/YalpServer/AuthPluginHandler.java | 0 src/YalpServer/InputPlugin.java | 0 src/YalpServer/InputPluginHandler.java | 0 src/YalpServer/OutputPlugin.java | 0 src/YalpServer/OutputPluginHandler.java | 0 src/yalp.idl | 0 start-java.sh | 6 +++--- start.bat | 0 winidlj.bat | 0 yalp.doxy | 0 yalp.sql | Bin 94 files changed, 34 insertions(+), 28 deletions(-) mode change 100644 => 100755 ClientConfiguration.xml mode change 100644 => 100755 ServerSettings.xml mode change 100644 => 100755 bashrc_example mode change 100644 => 100755 build-java.bat mode change 100644 => 100755 build-tools/UmlGraph-5.2.jar mode change 100644 => 100755 build.bat mode change 100644 => 100755 build.xml mode change 100644 => 100755 client.policy mode change 100644 => 100755 doc/EFL/edjebook.pdf mode change 100644 => 100755 doc/asciidoc/content.txt mode change 100644 => 100755 doc/asciidoc/efl.txt mode change 100644 => 100755 doc/asciidoc/img/diagram-efl-simple-small.png mode change 100644 => 100755 doc/asciidoc/img/yalp_efl_gui.dia mode change 100644 => 100755 doc/asciidoc/task.txt mode change 100644 => 100755 doc/asciidoc/title.txt mode change 100644 => 100755 doc/asciidoc/yalp_efl_gui.png mode change 100644 => 100755 doc/img/diagram-efl-simple-small.png mode change 100644 => 100755 doc/img/yalp_efl_gui.dia mode change 100644 => 100755 lib/win-swt.jar mode change 100644 => 100755 log4j_input_plugin.conf mode change 100644 => 100755 log4j_output_plugin.conf mode change 100644 => 100755 log4j_server.conf mode change 100644 => 100755 postgresql_autodoc/Makefile mode change 100644 => 100755 postgresql_autodoc/config.log mode change 100644 => 100755 postgresql_autodoc/config.mk mode change 100644 => 100755 postgresql_autodoc/config.mk.in mode change 100644 => 100755 postgresql_autodoc/configure.ac mode change 100644 => 100755 postgresql_autodoc/dia.tmpl mode change 100644 => 100755 postgresql_autodoc/dot.tmpl mode change 100644 => 100755 postgresql_autodoc/html.tmpl mode change 100644 => 100755 postgresql_autodoc/neato.tmpl mode change 100644 => 100755 postgresql_autodoc/xml.tmpl mode change 100644 => 100755 postgresql_autodoc/zigzag.dia.tmpl mode change 100644 => 100755 removed-code/Browser.java mode change 100644 => 100755 server.bat mode change 100644 => 100755 server.policy mode change 100644 => 100755 src/YalpAuth/YalpPGSqlAuth/DatabaseDefines.java mode change 100644 => 100755 src/YalpAuth/YalpPGSqlAuth/PGSqlAuth.java mode change 100644 => 100755 src/YalpAuth/YalpPGSqlAuth/YalpAuthPluginImpl.java mode change 100644 => 100755 src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java mode change 100644 => 100755 src/YalpClients/EflClient/corba_example/huhu.idl mode change 100644 => 100755 src/YalpClients/EflClient/corba_test.py mode change 100644 => 100755 src/YalpClients/EflClient/list_test.edc mode change 100644 => 100755 src/YalpClients/EflClient/media.py mode change 100644 => 100755 src/YalpClients/EflClient/medialist.py mode change 100644 => 100755 src/YalpClients/EflClient/playlist.py mode change 100644 => 100755 src/YalpClients/EflClient/searchframe.py mode change 100644 => 100755 src/YalpClients/EflClient/yalp_gui.edc mode change 100644 => 100755 src/YalpClients/SwtClient/GUI/GUI.java mode change 100644 => 100755 src/YalpClients/SwtClient/GUI/InitGUI.java mode change 100644 => 100755 src/YalpClients/SwtClient/GUI/LoadDialog.java mode change 100644 => 100755 src/YalpClients/SwtClient/GUI/SWTResourceManager.java mode change 100644 => 100755 src/YalpClients/SwtClient/GUI/SortListener.java mode change 100644 => 100755 src/YalpClients/SwtClient/GUI/StartDialog.java mode change 100644 => 100755 src/YalpClients/WebClient/App.xaml mode change 100644 => 100755 src/YalpClients/WebClient/App.xaml.cs mode change 100644 => 100755 src/YalpClients/WebClient/Default.aspx.cs mode change 100644 => 100755 src/YalpClients/WebClient/Default.aspx.designer.cs mode change 100644 => 100755 src/YalpClients/WebClient/MainPage.xaml mode change 100644 => 100755 src/YalpClients/WebClient/MainPage.xaml.cs mode change 100644 => 100755 src/YalpClients/WebClient/Properties/AppManifest.xml mode change 100644 => 100755 src/YalpClients/WebClient/Properties/AssemblyInfo.cs mode change 100644 => 100755 src/YalpClients/WebClient/VideoPlayer.csproj mode change 100644 => 100755 src/YalpClients/WebClient/VideoPlayer.csproj.user mode change 100644 => 100755 src/YalpClients/WebClient/VideoPlayer.sln mode change 100644 => 100755 src/YalpInputs/YalpPGSqlInput/DatabaseDefines.java mode change 100644 => 100755 src/YalpInputs/YalpPGSqlInput/PGSqlInput.java mode change 100644 => 100755 src/YalpInputs/YalpPGSqlInput/YalpInputPluginImpl.java mode change 100644 => 100755 src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/Browser.java mode change 100644 => 100755 src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/FileBrowser.java mode change 100644 => 100755 src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/FileFinder.java mode change 100644 => 100755 src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/FileInfoManager.java mode change 100644 => 100755 src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/YalpPGSQLIndexer.java mode change 100644 => 100755 src/YalpInputs/YalpPGSqlInput/YalpPGSqlInput.java mode change 100644 => 100755 src/YalpInputs/YalpPGSqlInput/db-design-sql.backup mode change 100644 => 100755 src/YalpOutputs/YalpVlcTelnetOutput/TelnetInterface.java mode change 100644 => 100755 src/YalpOutputs/YalpVlcTelnetOutput/VlcStreamer.java mode change 100644 => 100755 src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java mode change 100644 => 100755 src/YalpOutputs/YalpVlcTelnetOutput/YalpVlcTelnetOutput.java mode change 100644 => 100755 src/YalpServer/AuthPlugin.java mode change 100644 => 100755 src/YalpServer/AuthPluginHandler.java mode change 100644 => 100755 src/YalpServer/InputPlugin.java mode change 100644 => 100755 src/YalpServer/InputPluginHandler.java mode change 100644 => 100755 src/YalpServer/OutputPlugin.java mode change 100644 => 100755 src/YalpServer/OutputPluginHandler.java mode change 100644 => 100755 src/yalp.idl mode change 100644 => 100755 start.bat mode change 100644 => 100755 winidlj.bat mode change 100644 => 100755 yalp.doxy mode change 100644 => 100755 yalp.sql diff --git a/ClientConfiguration.xml b/ClientConfiguration.xml old mode 100644 new mode 100755 diff --git a/ServerSettings.xml b/ServerSettings.xml old mode 100644 new mode 100755 index 11dd45d..ca5dc9b --- a/ServerSettings.xml +++ b/ServerSettings.xml @@ -1,6 +1,6 @@ - - - jdbc:postgresql://localhost:5432/yalp - huhu - yalp - + + + jdbc:postgresql://localhost:5432/yalp + huhu + yalp + diff --git a/bashrc_example b/bashrc_example old mode 100644 new mode 100755 diff --git a/build-java.bat b/build-java.bat old mode 100644 new mode 100755 diff --git a/build-tools/UmlGraph-5.2.jar b/build-tools/UmlGraph-5.2.jar old mode 100644 new mode 100755 diff --git a/build.bat b/build.bat old mode 100644 new mode 100755 diff --git a/build.xml b/build.xml old mode 100644 new mode 100755 diff --git a/client.policy b/client.policy old mode 100644 new mode 100755 diff --git a/doc/EFL/edjebook.pdf b/doc/EFL/edjebook.pdf old mode 100644 new mode 100755 diff --git a/doc/asciidoc/content.txt b/doc/asciidoc/content.txt old mode 100644 new mode 100755 diff --git a/doc/asciidoc/efl.txt b/doc/asciidoc/efl.txt old mode 100644 new mode 100755 diff --git a/doc/asciidoc/img/diagram-efl-simple-small.png b/doc/asciidoc/img/diagram-efl-simple-small.png old mode 100644 new mode 100755 diff --git a/doc/asciidoc/img/yalp_efl_gui.dia b/doc/asciidoc/img/yalp_efl_gui.dia old mode 100644 new mode 100755 diff --git a/doc/asciidoc/task.txt b/doc/asciidoc/task.txt old mode 100644 new mode 100755 diff --git a/doc/asciidoc/title.txt b/doc/asciidoc/title.txt old mode 100644 new mode 100755 diff --git a/doc/asciidoc/yalp_efl_gui.png b/doc/asciidoc/yalp_efl_gui.png old mode 100644 new mode 100755 diff --git a/doc/img/diagram-efl-simple-small.png b/doc/img/diagram-efl-simple-small.png old mode 100644 new mode 100755 diff --git a/doc/img/yalp_efl_gui.dia b/doc/img/yalp_efl_gui.dia old mode 100644 new mode 100755 diff --git a/efl-gui.sh b/efl-gui.sh index aa92c43..f85f5e5 100755 --- a/efl-gui.sh +++ b/efl-gui.sh @@ -1,4 +1,4 @@ #!/bin/bash cd src/YalpClients/EflClient -python2.5 ./main.py -ORBInitRef NameService=corbaloc:iiop:192.168.178.20:1050/NameService +python2.5 ./main.py -ORBInitRef NameService=corbaloc:iiop:10.0.3.222:1050/NameService cd - diff --git a/lib/win-swt.jar b/lib/win-swt.jar old mode 100644 new mode 100755 diff --git a/log4j_input_plugin.conf b/log4j_input_plugin.conf old mode 100644 new mode 100755 diff --git a/log4j_output_plugin.conf b/log4j_output_plugin.conf old mode 100644 new mode 100755 diff --git a/log4j_server.conf b/log4j_server.conf old mode 100644 new mode 100755 diff --git a/postgresql_autodoc/Makefile b/postgresql_autodoc/Makefile old mode 100644 new mode 100755 diff --git a/postgresql_autodoc/config.log b/postgresql_autodoc/config.log old mode 100644 new mode 100755 diff --git a/postgresql_autodoc/config.mk b/postgresql_autodoc/config.mk old mode 100644 new mode 100755 diff --git a/postgresql_autodoc/config.mk.in b/postgresql_autodoc/config.mk.in old mode 100644 new mode 100755 diff --git a/postgresql_autodoc/configure.ac b/postgresql_autodoc/configure.ac old mode 100644 new mode 100755 diff --git a/postgresql_autodoc/dia.tmpl b/postgresql_autodoc/dia.tmpl old mode 100644 new mode 100755 diff --git a/postgresql_autodoc/dot.tmpl b/postgresql_autodoc/dot.tmpl old mode 100644 new mode 100755 diff --git a/postgresql_autodoc/html.tmpl b/postgresql_autodoc/html.tmpl old mode 100644 new mode 100755 diff --git a/postgresql_autodoc/neato.tmpl b/postgresql_autodoc/neato.tmpl old mode 100644 new mode 100755 diff --git a/postgresql_autodoc/xml.tmpl b/postgresql_autodoc/xml.tmpl old mode 100644 new mode 100755 diff --git a/postgresql_autodoc/zigzag.dia.tmpl b/postgresql_autodoc/zigzag.dia.tmpl old mode 100644 new mode 100755 diff --git a/removed-code/Browser.java b/removed-code/Browser.java old mode 100644 new mode 100755 diff --git a/server.bat b/server.bat old mode 100644 new mode 100755 diff --git a/server.policy b/server.policy old mode 100644 new mode 100755 diff --git a/server.sh b/server.sh index 0435a13..5a8f3e7 100755 --- a/server.sh +++ b/server.sh @@ -1,7 +1,8 @@ /usr/bin/orbd \ -J-Djava.net.preferIPv4Stack=true \ --J-Dorg.omg.CORBA.ORBInitialHost=192.168.178.20 \ --ORBInitialPort 1050 -ORBInitialHost 192.168.178.20 & +-J-Dorg.omg.CORBA.ORBInitialHost=10.0.3.222 \ +-ORBDebugLevel=10 \ +-ORBInitialPort 1050 -ORBInitialHost 10.0.3.222 & sleep 4 ./start-java.sh yalpServer.jar killall -9 orbd diff --git a/src/YalpAuth/YalpPGSqlAuth/DatabaseDefines.java b/src/YalpAuth/YalpPGSqlAuth/DatabaseDefines.java old mode 100644 new mode 100755 diff --git a/src/YalpAuth/YalpPGSqlAuth/PGSqlAuth.java b/src/YalpAuth/YalpPGSqlAuth/PGSqlAuth.java old mode 100644 new mode 100755 diff --git a/src/YalpAuth/YalpPGSqlAuth/YalpAuthPluginImpl.java b/src/YalpAuth/YalpPGSqlAuth/YalpAuthPluginImpl.java old mode 100644 new mode 100755 diff --git a/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java b/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java old mode 100644 new mode 100755 diff --git a/src/YalpClients/EflClient/corba_example/huhu.idl b/src/YalpClients/EflClient/corba_example/huhu.idl old mode 100644 new mode 100755 diff --git a/src/YalpClients/EflClient/corba_test.py b/src/YalpClients/EflClient/corba_test.py old mode 100644 new mode 100755 diff --git a/src/YalpClients/EflClient/list_test.edc b/src/YalpClients/EflClient/list_test.edc old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 diff --git a/src/YalpClients/EflClient/medialist.py b/src/YalpClients/EflClient/medialist.py old mode 100644 new mode 100755 diff --git a/src/YalpClients/EflClient/playlist.py b/src/YalpClients/EflClient/playlist.py old mode 100644 new mode 100755 index 475b39e..58f2919 --- 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 old mode 100644 new mode 100755 diff --git a/src/YalpClients/EflClient/yalp_gui.edc b/src/YalpClients/EflClient/yalp_gui.edc old mode 100644 new mode 100755 index 70427af..c73d70d --- 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 old mode 100644 new mode 100755 diff --git a/src/YalpClients/SwtClient/GUI/InitGUI.java b/src/YalpClients/SwtClient/GUI/InitGUI.java old mode 100644 new mode 100755 diff --git a/src/YalpClients/SwtClient/GUI/LoadDialog.java b/src/YalpClients/SwtClient/GUI/LoadDialog.java old mode 100644 new mode 100755 diff --git a/src/YalpClients/SwtClient/GUI/SWTResourceManager.java b/src/YalpClients/SwtClient/GUI/SWTResourceManager.java old mode 100644 new mode 100755 diff --git a/src/YalpClients/SwtClient/GUI/SortListener.java b/src/YalpClients/SwtClient/GUI/SortListener.java old mode 100644 new mode 100755 diff --git a/src/YalpClients/SwtClient/GUI/StartDialog.java b/src/YalpClients/SwtClient/GUI/StartDialog.java old mode 100644 new mode 100755 diff --git a/src/YalpClients/WebClient/App.xaml b/src/YalpClients/WebClient/App.xaml old mode 100644 new mode 100755 diff --git a/src/YalpClients/WebClient/App.xaml.cs b/src/YalpClients/WebClient/App.xaml.cs old mode 100644 new mode 100755 diff --git a/src/YalpClients/WebClient/Default.aspx.cs b/src/YalpClients/WebClient/Default.aspx.cs old mode 100644 new mode 100755 diff --git a/src/YalpClients/WebClient/Default.aspx.designer.cs b/src/YalpClients/WebClient/Default.aspx.designer.cs old mode 100644 new mode 100755 diff --git a/src/YalpClients/WebClient/MainPage.xaml b/src/YalpClients/WebClient/MainPage.xaml old mode 100644 new mode 100755 diff --git a/src/YalpClients/WebClient/MainPage.xaml.cs b/src/YalpClients/WebClient/MainPage.xaml.cs old mode 100644 new mode 100755 diff --git a/src/YalpClients/WebClient/Properties/AppManifest.xml b/src/YalpClients/WebClient/Properties/AppManifest.xml old mode 100644 new mode 100755 diff --git a/src/YalpClients/WebClient/Properties/AssemblyInfo.cs b/src/YalpClients/WebClient/Properties/AssemblyInfo.cs old mode 100644 new mode 100755 diff --git a/src/YalpClients/WebClient/VideoPlayer.csproj b/src/YalpClients/WebClient/VideoPlayer.csproj old mode 100644 new mode 100755 diff --git a/src/YalpClients/WebClient/VideoPlayer.csproj.user b/src/YalpClients/WebClient/VideoPlayer.csproj.user old mode 100644 new mode 100755 diff --git a/src/YalpClients/WebClient/VideoPlayer.sln b/src/YalpClients/WebClient/VideoPlayer.sln old mode 100644 new mode 100755 diff --git a/src/YalpInputs/YalpPGSqlInput/DatabaseDefines.java b/src/YalpInputs/YalpPGSqlInput/DatabaseDefines.java old mode 100644 new mode 100755 diff --git a/src/YalpInputs/YalpPGSqlInput/PGSqlInput.java b/src/YalpInputs/YalpPGSqlInput/PGSqlInput.java old mode 100644 new mode 100755 diff --git a/src/YalpInputs/YalpPGSqlInput/YalpInputPluginImpl.java b/src/YalpInputs/YalpPGSqlInput/YalpInputPluginImpl.java old mode 100644 new mode 100755 diff --git a/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/Browser.java b/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/Browser.java old mode 100644 new mode 100755 diff --git a/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/FileBrowser.java b/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/FileBrowser.java old mode 100644 new mode 100755 diff --git a/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/FileFinder.java b/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/FileFinder.java old mode 100644 new mode 100755 diff --git a/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/FileInfoManager.java b/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/FileInfoManager.java old mode 100644 new mode 100755 diff --git a/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/YalpPGSQLIndexer.java b/src/YalpInputs/YalpPGSqlInput/YalpPGSQLIndexer/YalpPGSQLIndexer.java old mode 100644 new mode 100755 diff --git a/src/YalpInputs/YalpPGSqlInput/YalpPGSqlInput.java b/src/YalpInputs/YalpPGSqlInput/YalpPGSqlInput.java old mode 100644 new mode 100755 diff --git a/src/YalpInputs/YalpPGSqlInput/db-design-sql.backup b/src/YalpInputs/YalpPGSqlInput/db-design-sql.backup old mode 100644 new mode 100755 diff --git a/src/YalpOutputs/YalpVlcTelnetOutput/TelnetInterface.java b/src/YalpOutputs/YalpVlcTelnetOutput/TelnetInterface.java old mode 100644 new mode 100755 diff --git a/src/YalpOutputs/YalpVlcTelnetOutput/VlcStreamer.java b/src/YalpOutputs/YalpVlcTelnetOutput/VlcStreamer.java old mode 100644 new mode 100755 diff --git a/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java b/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java old mode 100644 new mode 100755 index 88bfbf8..0ff1387 --- 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 old mode 100644 new mode 100755 diff --git a/src/YalpServer/AuthPlugin.java b/src/YalpServer/AuthPlugin.java old mode 100644 new mode 100755 diff --git a/src/YalpServer/AuthPluginHandler.java b/src/YalpServer/AuthPluginHandler.java old mode 100644 new mode 100755 diff --git a/src/YalpServer/InputPlugin.java b/src/YalpServer/InputPlugin.java old mode 100644 new mode 100755 diff --git a/src/YalpServer/InputPluginHandler.java b/src/YalpServer/InputPluginHandler.java old mode 100644 new mode 100755 diff --git a/src/YalpServer/OutputPlugin.java b/src/YalpServer/OutputPlugin.java old mode 100644 new mode 100755 diff --git a/src/YalpServer/OutputPluginHandler.java b/src/YalpServer/OutputPluginHandler.java old mode 100644 new mode 100755 diff --git a/src/yalp.idl b/src/yalp.idl old mode 100644 new mode 100755 diff --git a/start-java.sh b/start-java.sh index 9652578..5158416 100755 --- a/start-java.sh +++ b/start-java.sh @@ -1,8 +1,8 @@ java \ -Djava.net.preferIPv4Stack=true \ --Dorg.omg.CORBA.ORBInitialHost=127.0.0.1 \ +-Dorg.omg.CORBA.ORBInitialHost=10.0.3.222 \ -Djava.library.path=./lib \ -jar $@ \ --ORBInitialPort 1050 -ORBInitialHost 127.0.0.1 \ --ORBInitRef NameService=corbaloc:iiop:127.0.0.1:1050/NameService \ +-ORBInitialPort 1050 -ORBInitialHost 10.0.3.222 \ +-ORBInitRef NameService=corbaloc:iiop:10.0.3.222:1050/NameService \ -ORBDottedDecimalAddresses 1 diff --git a/start.bat b/start.bat old mode 100644 new mode 100755 diff --git a/winidlj.bat b/winidlj.bat old mode 100644 new mode 100755 diff --git a/yalp.doxy b/yalp.doxy old mode 100644 new mode 100755 diff --git a/yalp.sql b/yalp.sql old mode 100644 new mode 100755 -- cgit v1.2.3