Revert "make creating audio decoders take codec data, too"

This reverts commit 4742a6015fce9f5dc0f61b4399b32d2bc88cefe4.

8 files changed, 10 insertions, 14 deletions

diff --git a/swfdec/swfdec_audio_decoder.c b/swfdec/swfdec_audio_decoder.c
index c0b666bd..72be7326 100644
--- a/swfdec/swfdec_audio_decoder.c
+++ b/swfdec/swfdec_audio_decoder.c
@@ -83,8 +83,6 @@ swfdec_audio_decoder_prepare (guint codec, SwfdecAudioFormat format, char **miss
  * swfdec_audio_decoder_new:
  * @codec: codec id
  * @format: #SwfdecAudioCodec to decode
- * @data: setup data for the codec or %NULL for none. Setup data is only 
- *        required for AAC audio.
  *
  * Creates a decoder suitable for decoding @format. If no decoder is available
  * for the given for mat, %NULL is returned.
@@ -92,7 +90,7 @@ swfdec_audio_decoder_prepare (guint codec, SwfdecAudioFormat format, char **miss
  * Returns: a new decoder or %NULL
  **/
 SwfdecAudioDecoder *
-swfdec_audio_decoder_new (guint codec, SwfdecAudioFormat format, SwfdecBuffer *data)
+swfdec_audio_decoder_new (guint codec, SwfdecAudioFormat format)
 {
   SwfdecAudioDecoder *ret = NULL;
   GSList *walk;
@@ -101,7 +99,7 @@ swfdec_audio_decoder_new (guint codec, SwfdecAudioFormat format, SwfdecBuffer *d
 
   for (walk = audio_codecs; walk; walk = walk->next) {
     SwfdecAudioDecoderClass *klass = g_type_class_ref (GPOINTER_TO_SIZE (walk->data));
-    ret = klass->create (codec, format, data);
+    ret = klass->create (codec, format);
     g_type_class_unref (klass);
     if (ret)
       break;
diff --git a/swfdec/swfdec_audio_decoder.h b/swfdec/swfdec_audio_decoder.h
index 8c7fb5d8..6837a48a 100644
--- a/swfdec/swfdec_audio_decoder.h
+++ b/swfdec/swfdec_audio_decoder.h
@@ -70,8 +70,7 @@ struct _SwfdecAudioDecoderClass
                                          SwfdecAudioFormat      format,
 					 char **                missing);
   SwfdecAudioDecoder *	(* create)	(guint                  codec,
-					 SwfdecAudioFormat      format,
-					 SwfdecBuffer *		data);
+					 SwfdecAudioFormat      format);
 
   void			(* push)	(SwfdecAudioDecoder *	decoder,
 					 SwfdecBuffer *		buffer);
@@ -86,8 +85,7 @@ gboolean		swfdec_audio_decoder_prepare	(guint			codec,
 							 SwfdecAudioFormat	format,
 							 char **		missing);
 SwfdecAudioDecoder *   	swfdec_audio_decoder_new      	(guint			codec,
-							 SwfdecAudioFormat	format,
-							 SwfdecBuffer *		data);
+							 SwfdecAudioFormat	format);
 
 void			swfdec_audio_decoder_push	(SwfdecAudioDecoder *	decoder,
 							 SwfdecBuffer *		buffer);
diff --git a/swfdec/swfdec_audio_decoder_adpcm.c b/swfdec/swfdec_audio_decoder_adpcm.c
index 255af889..18eaab17 100644
--- a/swfdec/swfdec_audio_decoder_adpcm.c
+++ b/swfdec/swfdec_audio_decoder_adpcm.c
@@ -34,7 +34,7 @@ swfdec_audio_decoder_adpcm_prepare (guint codec, SwfdecAudioFormat format, char
 }
 
 static SwfdecAudioDecoder *
-swfdec_audio_decoder_adpcm_create (guint codec, SwfdecAudioFormat format, SwfdecBuffer *data)
+swfdec_audio_decoder_adpcm_create (guint codec, SwfdecAudioFormat format)
 {
   if (codec != SWFDEC_AUDIO_CODEC_ADPCM)
     return NULL;
diff --git a/swfdec/swfdec_audio_decoder_gst.c b/swfdec/swfdec_audio_decoder_gst.c
index e22c05b4..9b29957f 100644
--- a/swfdec/swfdec_audio_decoder_gst.c
+++ b/swfdec/swfdec_audio_decoder_gst.c
@@ -108,7 +108,7 @@ swfdec_audio_decoder_get_resampler (void)
 }
 
 static SwfdecAudioDecoder *
-swfdec_audio_decoder_gst_create (guint type, SwfdecAudioFormat format, SwfdecBuffer *data)
+swfdec_audio_decoder_gst_create (guint type, SwfdecAudioFormat format)
 {
   SwfdecAudioDecoderGst *player;
   GstCaps *srccaps, *sinkcaps;
diff --git a/swfdec/swfdec_audio_decoder_uncompressed.c b/swfdec/swfdec_audio_decoder_uncompressed.c
index e299f728..6a4caf6c 100644
--- a/swfdec/swfdec_audio_decoder_uncompressed.c
+++ b/swfdec/swfdec_audio_decoder_uncompressed.c
@@ -35,7 +35,7 @@ swfdec_audio_decoder_uncompressed_prepare (guint codec, SwfdecAudioFormat format
 }
 
 static SwfdecAudioDecoder *
-swfdec_audio_decoder_uncompressed_create (guint codec, SwfdecAudioFormat format, SwfdecBuffer *data)
+swfdec_audio_decoder_uncompressed_create (guint codec, SwfdecAudioFormat format)
 {
   if (codec != SWFDEC_AUDIO_CODEC_UNDEFINED &&
       codec != SWFDEC_AUDIO_CODEC_UNCOMPRESSED)
diff --git a/swfdec/swfdec_audio_flv.c b/swfdec/swfdec_audio_flv.c
index e5cd6be6..2a49ee6e 100644
--- a/swfdec/swfdec_audio_flv.c
+++ b/swfdec/swfdec_audio_flv.c
@@ -92,7 +92,7 @@ swfdec_audio_flv_decode_one (SwfdecAudioFlv *flv)
       }
       flv->format = format;
       flv->in = in;
-      flv->decoder = swfdec_audio_decoder_new (flv->format, flv->in, NULL);
+      flv->decoder = swfdec_audio_decoder_new (flv->format, flv->in);
       if (flv->decoder == NULL)
 	return NULL;
     } else if (format != flv->format ||
diff --git a/swfdec/swfdec_audio_stream.c b/swfdec/swfdec_audio_stream.c
index 08063504..857fecdc 100644
--- a/swfdec/swfdec_audio_stream.c
+++ b/swfdec/swfdec_audio_stream.c
@@ -203,7 +203,7 @@ swfdec_audio_stream_use_decoder (SwfdecAudioStream *stream,
     /* FIXME: send NULL buffer */
     g_object_unref (stream->decoder);
   }
-  stream->decoder = swfdec_audio_decoder_new (codec, format, NULL);
+  stream->decoder = swfdec_audio_decoder_new (codec, format);
 }
 
 void
diff --git a/swfdec/swfdec_sound.c b/swfdec/swfdec_sound.c
index 75891c6c..d228e45e 100644
--- a/swfdec/swfdec_sound.c
+++ b/swfdec/swfdec_sound.c
@@ -192,7 +192,7 @@ swfdec_sound_get_decoded (SwfdecSound *sound)
   if (sound->encoded == NULL)
     return NULL;
 
-  decoder = swfdec_audio_decoder_new (sound->codec, sound->format, NULL);
+  decoder = swfdec_audio_decoder_new (sound->codec, sound->format);
   if (decoder == NULL)
     return NULL;