summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Otte <otte@gnome.org>2004-05-09 00:13:39 +0000
committerBenjamin Otte <otte@gnome.org>2004-05-09 00:13:39 +0000
commit692fd964ae6666f4beed958afbe090c7fd58daca (patch)
treef5611856bcb26402408400610d0000da5ab59630
parentba9981b8044eddf87e3c1091937ce6cc9fb7c5c7 (diff)
gst/wavparse/gstwavparse.c: make PAUSED=>READY=>PAUSED=READY work by not destroying NULL sourcepads
Original commit message from CVS: * gst/wavparse/gstwavparse.c: (gst_wavparse_destroy_sourcepad), (gst_wavparse_create_sourcepad): make PAUSED=>READY=>PAUSED=READY work by not destroying NULL sourcepads
-rw-r--r--ChangeLog7
-rw-r--r--gst/wavparse/gstwavparse.c9
2 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ceda4c90..f320c792 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2004-05-09 Benjamin Otte <otte@gnome.org>
+ * gst/wavparse/gstwavparse.c: (gst_wavparse_destroy_sourcepad),
+ (gst_wavparse_create_sourcepad):
+ make PAUSED=>READY=>PAUSED=READY work by not destroying NULL
+ sourcepads
+
+2004-05-09 Benjamin Otte <otte@gnome.org>
+
* ext/alsa/gstalsasink.c: (gst_alsa_sink_check_event):
allow discont events before caps nego
diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c
index 0e90130c..5d185aa5 100644
--- a/gst/wavparse/gstwavparse.c
+++ b/gst/wavparse/gstwavparse.c
@@ -215,15 +215,16 @@ gst_wavparse_init (GstWavParse * wavparse)
static void
gst_wavparse_destroy_sourcepad (GstWavParse * wavparse)
{
- gst_element_remove_pad (GST_ELEMENT (wavparse), wavparse->srcpad);
- wavparse->srcpad = NULL;
+ if (wavparse->srcpad) {
+ gst_element_remove_pad (GST_ELEMENT (wavparse), wavparse->srcpad);
+ wavparse->srcpad = NULL;
+ }
}
static void
gst_wavparse_create_sourcepad (GstWavParse * wavparse)
{
- if (wavparse->srcpad)
- gst_wavparse_destroy_sourcepad (wavparse);
+ gst_wavparse_destroy_sourcepad (wavparse);
/* source */
wavparse->srcpad =