Update of /cvsroot/freevo/kaa/xine/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30717/test
Modified Files:
kaaplayer.py
Log Message:
Buffer video driver takes a passthrough option to pass the video through
to the real video out (like Xv, say). The buffer callback can prevent
video from being passed through by returning False. Currently kaaplayer
is a mess as it contains a lot of half-working code to test this stuff.
Index: kaaplayer.py
===================================================================
RCS file: /cvsroot/freevo/kaa/xine/test/kaaplayer.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** kaaplayer.py 25 Jul 2005 17:33:46 -0000 1.4
--- kaaplayer.py 25 Jul 2005 23:23:57 -0000 1.5
***************
*** 54,71 ****
elif key == "a":
! global vo_buffer, vo, win, win2
! t = stream.get_video_source().get_wire_target()
! if t == vo_buffer:
! say("\nWire to Xv\n")
! stream.get_video_source().wire(vo)
! #win2.hide()
! win.show()
! else:
! say("\nWire to Evas\n")
! stream.get_video_source().wire(vo_buffer)
win2.show()
! #win.hide()
! vo._port.send_gui_data(xine.GUI_SEND_DRAWABLE_CHANGED,
win._window.ptr)
! vo._port.send_gui_data(xine.GUI_SEND_VIDEOWIN_VISIBLE, 1)
--- 54,66 ----
elif key == "a":
! global vo_xv, win, win2
! if win.get_visible():
win2.show()
! win.hide()
! else:
! win.show()
! win2.hide()
! vo_xv._port.send_gui_data(xine.GUI_SEND_DRAWABLE_CHANGED,
win._window.ptr)
! vo_xv._port.send_gui_data(xine.GUI_SEND_VIDEOWIN_VISIBLE, 1)
***************
*** 117,121 ****
def foo(width, height, aspect, buffer, window):
! #return
if window.movie.size_get() != (width, height):
print "RESIZE", width, height, threading.currentThread()
--- 112,117 ----
def foo(width, height, aspect, buffer, window):
! if not window.get_visible():
! return True
if window.movie.size_get() != (width, height):
print "RESIZE", width, height, threading.currentThread()
***************
*** 140,144 ****
x = xine.Xine()
if 1: #isinstance(win, display.EvasX11Window):
! win2 = display.EvasX11Window(gl = False, size = (640, 480), title = "Kaa
Player")
r = win2.get_evas().object_rectangle_add()
r.color_set((255,255,255,255))
--- 136,140 ----
x = xine.Xine()
if 1: #isinstance(win, display.EvasX11Window):
! win2 = display.EvasX11Window(gl = True, size = (640, 480), title = "Kaa
Player")
r = win2.get_evas().object_rectangle_add()
r.color_set((255,255,255,255))
***************
*** 158,165 ****
cb = notifier.MainThreadCallback(foo, win2)
#cb.set_async(False)
! vo_buffer = x.open_video_driver("buffer", callback = cb)
! vo = x.open_video_driver(window = win)
else:
! vo_buffer = None
vo = x.open_video_driver(window = win)
--- 154,162 ----
cb = notifier.MainThreadCallback(foo, win2)
#cb.set_async(False)
! vo_xv = x.open_video_driver(window = win)
! vo = x.open_video_driver("buffer", callback = cb, passthrough = vo_xv)
! #vo = vo_xv
else:
! vo_xv = None
vo = x.open_video_driver(window = win)
***************
*** 190,196 ****
#buffer.get_default_output().wire(stream.deint_post.get_default_input())
! #print x.list_video_plugins()
win.show()
kaa.main()
win.hide()
! del ao, vo, stream, x, vo_buffer, win
--- 187,196 ----
#buffer.get_default_output().wire(stream.deint_post.get_default_input())
! #fork = x.post_init("fork", video_targets = [vo, vo_buffer])
! #stream.get_video_source().wire(fork.get_default_input())
!
! print x.list_post_plugins()
win.show()
kaa.main()
win.hide()
! del ao, vo, stream, x, vo_xv, win, win2
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
