Author: dmeyer
Date: Fri Apr 28 19:41:24 2006
New Revision: 1518
Modified:
trunk/player/src/xine.py
Log:
small fixes to make fb output work (hardcoded using vidixfb)
Modified: trunk/player/src/xine.py
==============================================================================
--- trunk/player/src/xine.py (original)
+++ trunk/player/src/xine.py Fri Apr 28 19:41:24 2006
@@ -151,7 +151,7 @@
self._ao = self._xine.open_audio_driver()
control_return = []
- if wid:
+ if wid and isinstance(wid, int):
self._vo = self._xine.open_video_driver(
"kaa", control_return = control_return,
passthrough = "xv", wid = wid,
@@ -162,6 +162,14 @@
frame_output_cb =
notifier.WeakCallback(self._x11_frame_output_cb),
dest_size_cb = notifier.WeakCallback(self._x11_dest_size_cb))
self._driver_control = control_return[0]
+ elif wid and isinstance(wid, str) and wid.startswith('fb'):
+ self._vo = self._xine.open_video_driver(
+ "kaa", control_return = control_return,
+ passthrough = "vidixfb",
+ osd_configure_cb = notifier.WeakCallback(self._osd_configure),
+ frame_output_cb =
notifier.WeakCallback(self._x11_frame_output_cb),
+ dest_size_cb = notifier.WeakCallback(self._x11_dest_size_cb))
+ self._driver_control = control_return[0]
else:
self._vo = self._xine.open_video_driver("none")
self._driver_control = None
@@ -598,7 +606,7 @@
old_window.signals["unmap_event"].disconnect(self._handle_window_visibility_event)
old_window.signals["expose_event"].disconnect(self._handle_window_expose_event)
- if window:
+ if window and window.signals:
window.signals["configure_event"].connect_weak(self._handle_window_configure_event)
window.signals["map_event"].connect_weak(self._handle_window_visibility_event)
window.signals["unmap_event"].connect_weak(self._handle_window_visibility_event)
-------------------------------------------------------
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
