[SCM] morituri/master: * morituri/common/gstreamer.py: In -bad the plugin is called audioparsersbad.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 111dec9b3d3d5bb408cb24fb538c6c77a8bdd8bb
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Fri May 27 10:38:49 2011 +0000

    	* morituri/common/gstreamer.py:
    	  In -bad the plugin is called audioparsersbad.

diff --git a/ChangeLog b/ChangeLog
index 650fb49..78e153d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-27  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* morituri/common/gstreamer.py:
+	  In -bad the plugin is called audioparsersbad.
+
 2011-05-25  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* morituri/common/gstreamer.py:
diff --git a/morituri/common/gstreamer.py b/morituri/common/gstreamer.py
index 5d2b119..90b8eea 100644
--- a/morituri/common/gstreamer.py
+++ b/morituri/common/gstreamer.py
@@ -174,19 +174,22 @@ class GstPipelineTask(task.Task):
 
 # workaround for issue #64
 def removeAudioParsers():
+    log.debug('gstreamer', 'Removing buggy audioparsers plugin if needed')
+
     import gst
     registry = gst.registry_get_default()
-    plugin = registry.find_plugin("audioparsers")
-    if not plugin:
-        return
 
-    log.debug('gstreamer', 'Found audioparsers plugin from %s %s',
-        plugin.get_source(), plugin.get_version())
+    plugin = registry.find_plugin("audioparsersbad")
+    if plugin:
+        # always remove from bad
+        log.debug('gstreamer', 'removing audioparsersbad plugin from registry')
+        registry.remove_plugin(plugin)
 
-    if plugin.get_source() == 'gst-plugins-good' \
-        and plugin.get_version() > '0.10.29.1':
-        return
+    plugin = registry.find_plugin("audioparsers")
+    if plugin:
+        log.debug('gstreamer', 'Found audioparsers plugin from %s %s',
+            plugin.get_source(), plugin.get_version())
 
-    # always remove from bad
-    log.debug('gstreamer', 'removing audioparsers plugin from registry')
-    registry.remove_plugin(plugin)
+        if plugin.get_source() == 'gst-plugins-good' \
+            and plugin.get_version() > '0.10.29.1':
+            return

-- 
morituri packaging