Author: dmeyer
Date: Tue Aug 22 20:18:00 2006
New Revision: 1892
Added:
trunk/WIP/player/src/backends/gstreamer/main.py
trunk/WIP/player/src/backends/xine/main.py
Modified:
trunk/WIP/player/src/backends/gstreamer/child.py
trunk/WIP/player/src/backends/gstreamer/player.py
trunk/WIP/player/src/backends/xine/child.py
trunk/WIP/player/src/backends/xine/player.py
Log:
move child main into extra file
Modified: trunk/WIP/player/src/backends/gstreamer/child.py
==============================================================================
--- trunk/WIP/player/src/backends/gstreamer/child.py (original)
+++ trunk/WIP/player/src/backends/gstreamer/child.py Tue Aug 22 20:18:00 2006
@@ -129,5 +129,3 @@
gst.SEEK_FLAG_FLUSH | gst.SEEK_FLAG_ACCURATE,
gst.SEEK_TYPE_SET, pos, gst.SEEK_TYPE_NONE, 0)
-player = GStreamer(sys.argv[1])
-kaa.notifier.loop()
Added: trunk/WIP/player/src/backends/gstreamer/main.py
==============================================================================
--- (empty file)
+++ trunk/WIP/player/src/backends/gstreamer/main.py Tue Aug 22 20:18:00 2006
@@ -0,0 +1,7 @@
+import sys
+import kaa
+
+from child import GStreamer
+
+player = GStreamer(sys.argv[1])
+kaa.main()
Modified: trunk/WIP/player/src/backends/gstreamer/player.py
==============================================================================
--- trunk/WIP/player/src/backends/gstreamer/player.py (original)
+++ trunk/WIP/player/src/backends/gstreamer/player.py Tue Aug 22 20:18:00 2006
@@ -24,7 +24,7 @@
def _span(self):
- script = os.path.join(os.path.dirname(__file__), 'child.py')
+ script = os.path.join(os.path.dirname(__file__), 'main.py')
self._gst = ChildProcess(self, script, str(self._instance_id))
self._gst.signals["completed"].connect_weak(self._exited)
self._gst.set_stop_command(kaa.notifier.WeakCallback(self._end_child))
Modified: trunk/WIP/player/src/backends/xine/child.py
==============================================================================
--- trunk/WIP/player/src/backends/xine/child.py (original)
+++ trunk/WIP/player/src/backends/xine/child.py Tue Aug 22 20:18:00 2006
@@ -308,28 +308,3 @@
def input(self, input):
self._stream.send_event(input)
-
-
-
-
-
-
-
-
-
-player = XinePlayerChild(sys.argv[1])
-kaa.main()
-
-# Remove shared memory. We don't detach right away, because the vo
-# thread might still be running, and it will crash if it tries to write
-# to that memory.
-if player._osd_shmem:
- kaa.shm.remove_memory(player._osd_shmem.shmid)
-if player._frame_shmem:
- kaa.shm.remove_memory(player._frame_shmem.shmid)
-
-# Force garbage collection for testing.
-del player
-gc.collect()
-
-sys.exit(0)
Added: trunk/WIP/player/src/backends/xine/main.py
==============================================================================
--- (empty file)
+++ trunk/WIP/player/src/backends/xine/main.py Tue Aug 22 20:18:00 2006
@@ -0,0 +1,23 @@
+import sys
+import gc
+import kaa
+import kaa.shm
+
+from child import XinePlayerChild as Xine
+
+player = Xine(sys.argv[1])
+kaa.main()
+
+# Remove shared memory. We don't detach right away, because the vo
+# thread might still be running, and it will crash if it tries to write
+# to that memory.
+if player._osd_shmem:
+ kaa.shm.remove_memory(player._osd_shmem.shmid)
+if player._frame_shmem:
+ kaa.shm.remove_memory(player._frame_shmem.shmid)
+
+# Force garbage collection for testing.
+del player
+gc.collect()
+
+sys.exit(0)
Modified: trunk/WIP/player/src/backends/xine/player.py
==============================================================================
--- trunk/WIP/player/src/backends/xine/player.py (original)
+++ trunk/WIP/player/src/backends/xine/player.py Tue Aug 22 20:18:00 2006
@@ -60,7 +60,7 @@
def _spawn(self):
# Launch self (-u is unbuffered stdout)
- script = os.path.join(os.path.dirname(__file__), 'child.py')
+ script = os.path.join(os.path.dirname(__file__), 'main.py')
self._xine = ChildProcess(self, script, str(self._instance_id))
self._xine.signals["completed"].connect_weak(self._exited)
self._xine.set_stop_command(kaa.notifier.WeakCallback(self._end_child))
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
