diff --git a/framework/subsystems/odeviced/audio.py b/framework/subsystems/odeviced/audio.py
index 3e03931..ec3a977 100644
--- a/framework/subsystems/odeviced/audio.py
+++ b/framework/subsystems/odeviced/audio.py
@@ -98,13 +98,6 @@ class GStreamerPlayer( Player ):
     A Gstreamer based Player.
     """
 
-    decoderMap = { \
-        "sid": "siddec",
-        "mod": "modplug",
-        "mp3": "mad",
-        "wav": "wavparse",
-        }
-
     def __init__( self, *args, **kwargs ):
         Player.__init__( self, *args, **kwargs )
         self.pipelines = {}
@@ -166,7 +159,7 @@ class GStreamerPlayer( Player ):
         else:
             pipeline = self.createPipeline( name )
             if pipeline is None:
-                error_cb( UnknownFormat( "known formats are %s" % self.decoderMap.keys() ) )
+                error_cb( NoPipeline( "The GStreamer pipeline was not created" ) )
             else:
                 bus = pipeline.get_bus()
                 bus.add_signal_watch()
@@ -189,15 +182,10 @@ class GStreamerPlayer( Player ):
         ok_cb()
 
     def createPipeline( self, name ):
-        try:
-            decoder = GStreamerPlayer.decoderMap[ name.split( '.' )[-1] ]
-        except KeyError:
-            return None
-        else:
-            # parse_launch may burn a few cycles compared to element_factory_make,
-            # however it should still be faster than creating the pipeline from
-            # individual elements in python, since it's all happening in compiled code
-            return gst.parse_launch( "filesrc location=%s ! %s ! alsasink" % ( name, decoder ) )
+        # parse_launch may burn a few cycles compared to element_factory_make,
+        # however it should still be faster than creating the pipeline from
+        # individual elements in python, since it's all happening in compiled code
+        return gst.parse_launch( "filesrc location=%s ! decodebin ! audioconvert ! alsasink" % ( name ) )
 
 #----------------------------------------------------------------------------#
 class AlsaScenarios( object ):