mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-03-30 12:49:40 +00:00
updated to maybe work with threads
Original commit message from CVS: updated to maybe work with threads
This commit is contained in:
parent
6b99320437
commit
6c247e7e1f
2 changed files with 26 additions and 8 deletions
|
@ -26,13 +26,16 @@ import sys
|
||||||
from gstreamer import *
|
from gstreamer import *
|
||||||
from gobject import GObject
|
from gobject import GObject
|
||||||
import gtk
|
import gtk
|
||||||
|
gtk.threads_init()
|
||||||
|
|
||||||
class DVDPlayer(object):
|
class DVDPlayer(object):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def idle(self, pipeline):
|
def idle(self, pipeline):
|
||||||
|
#gtk.threads_enter()
|
||||||
pipeline.iterate()
|
pipeline.iterate()
|
||||||
|
#gtk.threads_leave()
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
def eof(self, sender):
|
def eof(self, sender):
|
||||||
|
@ -40,6 +43,7 @@ class DVDPlayer(object):
|
||||||
sys.exit(0)
|
sys.exit(0)
|
||||||
|
|
||||||
def mpegparse_newpad(self, parser, pad, pipeline):
|
def mpegparse_newpad(self, parser, pad, pipeline):
|
||||||
|
#gtk.threads_enter()
|
||||||
print '***** a new pad %s was created' % pad.get_name()
|
print '***** a new pad %s was created' % pad.get_name()
|
||||||
if pad.get_name()[:6] == 'video_':
|
if pad.get_name()[:6] == 'video_':
|
||||||
pad.connect(self.v_queue.get_pad('sink'))
|
pad.connect(self.v_queue.get_pad('sink'))
|
||||||
|
@ -55,10 +59,13 @@ class DVDPlayer(object):
|
||||||
self.pipeline.set_state(STATE_PLAYING)
|
self.pipeline.set_state(STATE_PLAYING)
|
||||||
else:
|
else:
|
||||||
print 'unknown pad: %s' % pad.get_name()
|
print 'unknown pad: %s' % pad.get_name()
|
||||||
|
#gtk.threads_leave()
|
||||||
|
|
||||||
def mpegparse_have_size(self, videosink, width, height):
|
def mpegparse_have_size(self, videosink, width, height):
|
||||||
|
gtk.threads_enter()
|
||||||
self.gtk_socket.set_usize(width,height)
|
self.gtk_socket.set_usize(width,height)
|
||||||
self.appwindow.show_all()
|
self.appwindow.show_all()
|
||||||
|
gtk.threads_leave()
|
||||||
|
|
||||||
def main(self):
|
def main(self):
|
||||||
if len(sys.argv) < 5:
|
if len(sys.argv) < 5:
|
||||||
|
@ -82,16 +89,18 @@ class DVDPlayer(object):
|
||||||
def run(self):
|
def run(self):
|
||||||
print 'setting to PLAYING state'
|
print 'setting to PLAYING state'
|
||||||
|
|
||||||
|
gtk.threads_enter()
|
||||||
|
|
||||||
self.pipeline.set_state(STATE_PLAYING)
|
self.pipeline.set_state(STATE_PLAYING)
|
||||||
|
|
||||||
gtk.idle_add(self.idle,self.pipeline)
|
gtk.idle_add(self.idle,self.pipeline)
|
||||||
|
|
||||||
#gtk.threads_enter()
|
|
||||||
gtk.main()
|
gtk.main()
|
||||||
#gtk.threads_leave()
|
|
||||||
|
|
||||||
self.pipeline.set_state(STATE_NULL)
|
self.pipeline.set_state(STATE_NULL)
|
||||||
|
|
||||||
|
gtk.threads_leave()
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
def build_video_thread(self):
|
def build_video_thread(self):
|
||||||
|
@ -122,7 +131,7 @@ class DVDPlayer(object):
|
||||||
self.color2 = gst_element_factory_make('colorspace','color2')
|
self.color2 = gst_element_factory_make('colorspace','color2')
|
||||||
assert self.color2
|
assert self.color2
|
||||||
|
|
||||||
self.show = gst_element_factory_make('videosink','show')
|
self.show = gst_element_factory_make('xvideosink','show')
|
||||||
#self.show = gst_element_factory_make('sdlvideosink','show')
|
#self.show = gst_element_factory_make('sdlvideosink','show')
|
||||||
#self.show = gst_element_factory_make('fakesink','fakesinkv')
|
#self.show = gst_element_factory_make('fakesink','fakesinkv')
|
||||||
assert self.show
|
assert self.show
|
||||||
|
@ -177,7 +186,7 @@ class DVDPlayer(object):
|
||||||
self.src = gst_element_factory_make('dvdreadsrc','src');
|
self.src = gst_element_factory_make('dvdreadsrc','src');
|
||||||
assert self.src
|
assert self.src
|
||||||
|
|
||||||
#GObject.connect(self.src,'deep_notify',self.dnprint)
|
GObject.connect(self.src,'deep_notify',self.dnprint)
|
||||||
self.src.set_property('location', self.location)
|
self.src.set_property('location', self.location)
|
||||||
self.src.set_property('title', self.title)
|
self.src.set_property('title', self.title)
|
||||||
self.src.set_property('chapter', self.chapter)
|
self.src.set_property('chapter', self.chapter)
|
||||||
|
|
|
@ -26,13 +26,16 @@ import sys
|
||||||
from gstreamer import *
|
from gstreamer import *
|
||||||
from gobject import GObject
|
from gobject import GObject
|
||||||
import gtk
|
import gtk
|
||||||
|
gtk.threads_init()
|
||||||
|
|
||||||
class DVDPlayer(object):
|
class DVDPlayer(object):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def idle(self, pipeline):
|
def idle(self, pipeline):
|
||||||
|
#gtk.threads_enter()
|
||||||
pipeline.iterate()
|
pipeline.iterate()
|
||||||
|
#gtk.threads_leave()
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
def eof(self, sender):
|
def eof(self, sender):
|
||||||
|
@ -40,6 +43,7 @@ class DVDPlayer(object):
|
||||||
sys.exit(0)
|
sys.exit(0)
|
||||||
|
|
||||||
def mpegparse_newpad(self, parser, pad, pipeline):
|
def mpegparse_newpad(self, parser, pad, pipeline):
|
||||||
|
#gtk.threads_enter()
|
||||||
print '***** a new pad %s was created' % pad.get_name()
|
print '***** a new pad %s was created' % pad.get_name()
|
||||||
if pad.get_name()[:6] == 'video_':
|
if pad.get_name()[:6] == 'video_':
|
||||||
pad.connect(self.v_queue.get_pad('sink'))
|
pad.connect(self.v_queue.get_pad('sink'))
|
||||||
|
@ -55,10 +59,13 @@ class DVDPlayer(object):
|
||||||
self.pipeline.set_state(STATE_PLAYING)
|
self.pipeline.set_state(STATE_PLAYING)
|
||||||
else:
|
else:
|
||||||
print 'unknown pad: %s' % pad.get_name()
|
print 'unknown pad: %s' % pad.get_name()
|
||||||
|
#gtk.threads_leave()
|
||||||
|
|
||||||
def mpegparse_have_size(self, videosink, width, height):
|
def mpegparse_have_size(self, videosink, width, height):
|
||||||
|
gtk.threads_enter()
|
||||||
self.gtk_socket.set_usize(width,height)
|
self.gtk_socket.set_usize(width,height)
|
||||||
self.appwindow.show_all()
|
self.appwindow.show_all()
|
||||||
|
gtk.threads_leave()
|
||||||
|
|
||||||
def main(self):
|
def main(self):
|
||||||
if len(sys.argv) < 5:
|
if len(sys.argv) < 5:
|
||||||
|
@ -82,16 +89,18 @@ class DVDPlayer(object):
|
||||||
def run(self):
|
def run(self):
|
||||||
print 'setting to PLAYING state'
|
print 'setting to PLAYING state'
|
||||||
|
|
||||||
|
gtk.threads_enter()
|
||||||
|
|
||||||
self.pipeline.set_state(STATE_PLAYING)
|
self.pipeline.set_state(STATE_PLAYING)
|
||||||
|
|
||||||
gtk.idle_add(self.idle,self.pipeline)
|
gtk.idle_add(self.idle,self.pipeline)
|
||||||
|
|
||||||
#gtk.threads_enter()
|
|
||||||
gtk.main()
|
gtk.main()
|
||||||
#gtk.threads_leave()
|
|
||||||
|
|
||||||
self.pipeline.set_state(STATE_NULL)
|
self.pipeline.set_state(STATE_NULL)
|
||||||
|
|
||||||
|
gtk.threads_leave()
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
def build_video_thread(self):
|
def build_video_thread(self):
|
||||||
|
@ -122,7 +131,7 @@ class DVDPlayer(object):
|
||||||
self.color2 = gst_element_factory_make('colorspace','color2')
|
self.color2 = gst_element_factory_make('colorspace','color2')
|
||||||
assert self.color2
|
assert self.color2
|
||||||
|
|
||||||
self.show = gst_element_factory_make('videosink','show')
|
self.show = gst_element_factory_make('xvideosink','show')
|
||||||
#self.show = gst_element_factory_make('sdlvideosink','show')
|
#self.show = gst_element_factory_make('sdlvideosink','show')
|
||||||
#self.show = gst_element_factory_make('fakesink','fakesinkv')
|
#self.show = gst_element_factory_make('fakesink','fakesinkv')
|
||||||
assert self.show
|
assert self.show
|
||||||
|
@ -177,7 +186,7 @@ class DVDPlayer(object):
|
||||||
self.src = gst_element_factory_make('dvdreadsrc','src');
|
self.src = gst_element_factory_make('dvdreadsrc','src');
|
||||||
assert self.src
|
assert self.src
|
||||||
|
|
||||||
#GObject.connect(self.src,'deep_notify',self.dnprint)
|
GObject.connect(self.src,'deep_notify',self.dnprint)
|
||||||
self.src.set_property('location', self.location)
|
self.src.set_property('location', self.location)
|
||||||
self.src.set_property('title', self.title)
|
self.src.set_property('title', self.title)
|
||||||
self.src.set_property('chapter', self.chapter)
|
self.src.set_property('chapter', self.chapter)
|
||||||
|
|
Loading…
Reference in a new issue