From 37f2bc3e9211613982b195fd367b8a579ec88e74 Mon Sep 17 00:00:00 2001 From: Jaromil Date: Sun, 28 Jun 2009 17:42:46 +0200 Subject: [PATCH] fixes to DIR and RSS playlist in python now correctly initialising and using the EOS callback --- scripts/python/DIRPlaylist/DIRPlaylist.py | 31 +++++++----- scripts/python/RSSPlaylist/RSS.pyc | Bin 24608 -> 0 bytes scripts/python/RSSPlaylist/RSSPlaylist.py | 58 +++++++++++++++------- 3 files changed, 59 insertions(+), 30 deletions(-) delete mode 100644 scripts/python/RSSPlaylist/RSS.pyc diff --git a/scripts/python/DIRPlaylist/DIRPlaylist.py b/scripts/python/DIRPlaylist/DIRPlaylist.py index f28254fa..c47b73da 100644 --- a/scripts/python/DIRPlaylist/DIRPlaylist.py +++ b/scripts/python/DIRPlaylist/DIRPlaylist.py @@ -50,13 +50,18 @@ class DIRPlaylist(object): if( string.find(f,"mp4")>0): videos.append(f) print("+ " + f) + if( string.find(f,"avi")>0): + videos.append(f) + print("+ " + f) if(len(videos)<1): print("error: no videos found in dir " + dir) exit() self.cx = freej.Context() - self.cx.init(self.width, self.height, 0, 0) + self.scr = freej.SdlScreen( self.width, self.height ) + self.cx.add_screen(self.scr) + self.cx.plugger.refresh(self.cx) self.ctx_thread = threading.Thread(target = self.cx.start, name = "freej") @@ -64,33 +69,33 @@ class DIRPlaylist(object): current = 0 - callback = NextVideoCB() + self.callback = NextVideoCB() while (not self.cx.quit): if(current >= len(videos)): current = 0 - video = freej.VideoLayer() - video.init(self.cx) + self.video = freej.VideoLayer() + self.video.init(self.cx) - video.open(dir + "/" + videos[current]) - video.add_eos_call(callback) - video.fit() - video.active = True - self.cx.add_layer(video) - video.start() + self.video.open(dir + "/" + videos[current]) + self.video.add_eos_call(self.callback) +# self.video.fit() + self.video.start() + + self.cx.add_layer(self.video) while(not end_of_video): time.sleep(5) print "end of video" - video.quit = True + self.video.quit = True time.sleep(1) - self.cx.rem_layer(video) + self.cx.rem_layer(self.video) current += 1 ############### main() if len(sys.argv) > 1: - dirplaylist = DIRPlaylist(320,240,sys.argv[1]) + dirplaylist = DIRPlaylist(400,300,sys.argv[1]) else: dirplaylist = DIRPlaylist() diff --git a/scripts/python/RSSPlaylist/RSS.pyc b/scripts/python/RSSPlaylist/RSS.pyc deleted file mode 100644 index 2ea5daee5467f9d79cd3587f850c051e518bdbf7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24608 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 1: - rssplaylist = RSSPlaylist(320,240,sys.argv[1]) + rssplaylist = RSSPlaylist(400,300,sys.argv[1]) else: rssplaylist = RSSPlaylist()