From 4ec7c5c5d8042630612c7a7ef89a21c4475f0fbe Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Sat, 29 Apr 2006 16:59:16 +0000 Subject: [PATCH] examples/gstfile.py: Threaded application, we NEED gobject.threads_init(). Original commit message from CVS: * examples/gstfile.py: Threaded application, we NEED gobject.threads_init(). This should finally gets rid of the crashes when used on single files. * gst/extend/discoverer.py: Re-order the imports. --- ChangeLog | 8 ++++++++ common | 2 +- examples/gstfile.py | 1 + gst/extend/discoverer.py | 11 +++++++++-- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12136ca101..bf7fa235a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-04-29 Edward Hervey + + * examples/gstfile.py: + Threaded application, we NEED gobject.threads_init(). + This should finally gets rid of the crashes when used on single files. + * gst/extend/discoverer.py: + Re-order the imports. + 2006-04-28 Edward Hervey * gst/arg-types.py: diff --git a/common b/common index a6710e67fd..6b67aa6dd1 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit a6710e67fd82147e32a18f1b63177583faffd498 +Subproject commit 6b67aa6dd111fb139e1be0f6a386e3ff84cce091 diff --git a/examples/gstfile.py b/examples/gstfile.py index 7e1b500c13..ea0a7685e5 100644 --- a/examples/gstfile.py +++ b/examples/gstfile.py @@ -15,6 +15,7 @@ import os import sys import gobject +gobject.threads_init() import pygst pygst.require('0.10') diff --git a/gst/extend/discoverer.py b/gst/extend/discoverer.py index 5e3b2c0600..85dda7f099 100644 --- a/gst/extend/discoverer.py +++ b/gst/extend/discoverer.py @@ -24,9 +24,16 @@ Class and functions for getting multimedia information about files """ -import gst -import gobject import os.path + +import pygtk +pygtk.require('2.0') +import gobject + +import pygst +pygst.require('0.10') +import gst + from gst.extend.pygobject import gsignal class Discoverer(gst.Pipeline):