[Swfdec-commits] 2 commits - swfdec/swfdec_audio_event.c swfdec/swfdec_audio_event.h swfdec/swfdec_codec_audio.c

[Benjamin Otte]

 swfdec/swfdec_audio_event.c |    7 +++----
 swfdec/swfdec_audio_event.h |    2 +-
 swfdec/swfdec_codec_audio.c |    1 -
 3 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit d3f04841dc19d9c2490ae22bd1fd4d4ddae84881
Author: Benjamin Otte <otte at gnome.org>
Date:   Fri Feb 8 23:11:40 2008 +0100

    remove debugging message

diff --git a/swfdec/swfdec_codec_audio.c b/swfdec/swfdec_codec_audio.c
index 27bf03f..1f4bb23 100644
--- a/swfdec/swfdec_codec_audio.c
+++ b/swfdec/swfdec_codec_audio.c
@@ -190,7 +190,6 @@ swfdec_audio_decoder_new (guint codec, SwfdecAudioFormat format)
 
   g_return_val_if_fail (SWFDEC_IS_AUDIO_FORMAT (format), NULL);
 
-  g_print ("new decoder for format %u\n", codec);
   for (i = 0; i < G_N_ELEMENTS (audio_codecs); i++) {
     ret = audio_codecs[i].func (codec, format);
     if (ret)
commit 3bdf05b870c2747b878084f552b1121d6262dc6c
Author: Benjamin Otte <otte at gnome.org>
Date:   Fri Feb 8 22:56:33 2008 +0100

    don't pretend there's silence if we failed to decode

diff --git a/swfdec/swfdec_audio_event.c b/swfdec/swfdec_audio_event.c
index d7ab2f5..6903c93 100644
--- a/swfdec/swfdec_audio_event.c
+++ b/swfdec/swfdec_audio_event.c
@@ -171,10 +171,9 @@ swfdec_audio_event_decode (SwfdecAudioEvent *event)
   event->decoded = swfdec_sound_get_decoded (event->sound,
       &event->decoded_format);
   if (event->decoded == NULL) {
-    SWFDEC_INFO ("Could not decode audio. Will assume %u samples of silence instead.",
-	event->sound->n_samples);
-    event->decoded = swfdec_buffer_new0 (event->sound->n_samples / 4);
-    event->decoded_format = swfdec_audio_format_new (5512, 1, FALSE);
+    SWFDEC_INFO ("Could not decode audio.");
+    event->n_samples = 0;
+    return;
   } else {
     swfdec_buffer_ref (event->decoded);
   }
diff --git a/swfdec/swfdec_audio_event.h b/swfdec/swfdec_audio_event.h
index b2e3d6c..ed59cb5 100644
--- a/swfdec/swfdec_audio_event.h
+++ b/swfdec/swfdec_audio_event.h
@@ -49,7 +49,7 @@ struct _SwfdecAudioEvent
   guint			n_envelopes;		/* amount of points in the envelope */
   SwfdecSoundEnvelope *	envelope;		/* volume envelope or NULL if none */
   /* dynamic data */
-  SwfdecBuffer *	decoded;		/* the decoded buffer we play back */
+  SwfdecBuffer *	decoded;		/* the decoded buffer we play back or NULL if failure */
   SwfdecAudioFormat	decoded_format;		/* format of the decoded buffer */
   guint			offset;			/* current offset in 44.1kHz */
   guint			loop;			/* current loop we're in */