summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Otte <otte@gnome.org>2004-08-03 14:28:12 +0000
committerBenjamin Otte <otte@gnome.org>2004-08-03 14:28:12 +0000
commitc870aeb9ce9ea891abe98b24ed53c71ceecce5ad (patch)
tree2893984a343c349b609da092bbcd855f33791c76
parent3a7e84664890ba9c3dc2e08b9248a127d03d056b (diff)
downloadgst-plugins-bad-c870aeb9ce9ea891abe98b24ed53c71ceecce5ad.tar.gz
gst-plugins-bad-c870aeb9ce9ea891abe98b24ed53c71ceecce5ad.tar.bz2
gst-plugins-bad-c870aeb9ce9ea891abe98b24ed53c71ceecce5ad.zip
fixes for G_DISABLE_ASSERT and friends
Original commit message from CVS: * examples/dynparams/filter.c: (ui_control_create): * examples/gstplay/player.c: (print_tag): * ext/alsa/gstalsa.c: (gst_alsa_request_new_pad): * ext/gdk_pixbuf/gstgdkanimation.c: (gst_gdk_animation_iter_may_advance): * ext/jack/gstjack.c: (gst_jack_request_new_pad): * ext/mad/gstid3tag.c: (gst_mad_id3_to_tag_list), (tag_list_to_id3_tag_foreach), (gst_id3_tag_handle_event): * ext/vorbis/oggvorbisenc.c: (gst_oggvorbisenc_get_tag_value): * ext/vorbis/vorbisenc.c: (gst_vorbisenc_get_tag_value): * ext/xine/xineaudiodec.c: (gst_xine_audio_dec_chain): * gst-libs/gst/media-info/media-info-test.c: (print_tag): * gst/sine/demo-dparams.c: (main): * gst/tags/gstvorbistag.c: (gst_tag_to_vorbis_comments): * testsuite/alsa/formats.c: (create_pipeline): * testsuite/alsa/sinesrc.c: (sinesrc_force_caps), (sinesrc_get): fixes for G_DISABLE_ASSERT and friends * gst/typefind/gsttypefindfunctions.c: (aac_type_find), (mp3_type_frame_length_from_header), (mp3_type_find), (plugin_init): require mp3 typefinding to have at least MIN_HEADERS valid headers add typefinding for AAC adts files
-rw-r--r--ChangeLog25
-rw-r--r--examples/dynparams/filter.c5
-rw-r--r--examples/gstplay/player.c3
-rw-r--r--ext/jack/gstjack.c3
-rw-r--r--ext/xine/xineaudiodec.c2
-rw-r--r--gst-libs/gst/media-info/media-info-test.c3
6 files changed, 35 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index d02427a4..56ea378f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2004-08-03 Benjamin Otte <otte@gnome.org>
+
+ * examples/dynparams/filter.c: (ui_control_create):
+ * examples/gstplay/player.c: (print_tag):
+ * ext/alsa/gstalsa.c: (gst_alsa_request_new_pad):
+ * ext/gdk_pixbuf/gstgdkanimation.c:
+ (gst_gdk_animation_iter_may_advance):
+ * ext/jack/gstjack.c: (gst_jack_request_new_pad):
+ * ext/mad/gstid3tag.c: (gst_mad_id3_to_tag_list),
+ (tag_list_to_id3_tag_foreach), (gst_id3_tag_handle_event):
+ * ext/vorbis/oggvorbisenc.c: (gst_oggvorbisenc_get_tag_value):
+ * ext/vorbis/vorbisenc.c: (gst_vorbisenc_get_tag_value):
+ * ext/xine/xineaudiodec.c: (gst_xine_audio_dec_chain):
+ * gst-libs/gst/media-info/media-info-test.c: (print_tag):
+ * gst/sine/demo-dparams.c: (main):
+ * gst/tags/gstvorbistag.c: (gst_tag_to_vorbis_comments):
+ * testsuite/alsa/formats.c: (create_pipeline):
+ * testsuite/alsa/sinesrc.c: (sinesrc_force_caps), (sinesrc_get):
+ fixes for G_DISABLE_ASSERT and friends
+ * gst/typefind/gsttypefindfunctions.c: (aac_type_find),
+ (mp3_type_frame_length_from_header), (mp3_type_find),
+ (plugin_init):
+ require mp3 typefinding to have at least MIN_HEADERS valid headers
+ add typefinding for AAC adts files
+
2004-08-04 Jan Schmidt <thaytan@mad.scientist.com>
* sys/ximage/ximagesink.c:
diff --git a/examples/dynparams/filter.c b/examples/dynparams/filter.c
index 5178d28b..333820df 100644
--- a/examples/dynparams/filter.c
+++ b/examples/dynparams/filter.c
@@ -183,8 +183,9 @@ ui_control_create (GstElement * element, GtkWidget * control, _filter_ui_t * ui)
/* create the dparam object */
dparam = gst_dpsmooth_new (G_PARAM_SPEC_VALUE_TYPE (specs[i]));
g_object_set (G_OBJECT (dparam), "update_period", 2000000LL, NULL);
- g_assert (gst_dpman_attach_dparam (dpman,
- (gchar *) g_param_spec_get_name (specs[i]), dparam));
+ if (!gst_dpman_attach_dparam (dpman,
+ (gchar *) g_param_spec_get_name (specs[i]), dparam))
+ g_assert_not_reached ();
gst_dpman_set_mode (dpman, "asynchronous");
g_signal_connect (widget, "value-changed",
G_CALLBACK (cb_dynparm_value_changed), dparam);
diff --git a/examples/gstplay/player.c b/examples/gstplay/player.c
index 4258d645..ca76978e 100644
--- a/examples/gstplay/player.c
+++ b/examples/gstplay/player.c
@@ -34,7 +34,8 @@ print_tag (const GstTagList * list, const gchar * tag, gpointer unused)
gchar *str;
if (gst_tag_get_type (tag) == G_TYPE_STRING) {
- g_assert (gst_tag_list_get_string_index (list, tag, i, &str));
+ if (!gst_tag_list_get_string_index (list, tag, i, &str))
+ g_assert_not_reached ();
} else {
str =
g_strdup_value_contents (gst_tag_list_get_value_index (list, tag, i));
diff --git a/ext/jack/gstjack.c b/ext/jack/gstjack.c
index 8b1296ea..58678f87 100644
--- a/ext/jack/gstjack.c
+++ b/ext/jack/gstjack.c
@@ -308,7 +308,8 @@ gst_jack_request_new_pad (GstElement * element, GstPadTemplate * templ,
GstJackPad *pad;
gint count;
- g_return_val_if_fail ((this = GST_JACK (element)), NULL);
+ g_return_val_if_fail (GST_IS_JACK (element), NULL);
+ this = GST_JACK (element);
if (!this->bin)
pad_list = &this->pads;
diff --git a/ext/xine/xineaudiodec.c b/ext/xine/xineaudiodec.c
index a0a19f21..dee0242f 100644
--- a/ext/xine/xineaudiodec.c
+++ b/ext/xine/xineaudiodec.c
@@ -328,7 +328,7 @@ gst_xine_audio_dec_chain (GstPad * pad, GstData * in)
xine->decoder->decode_data (xine->decoder, &element);
/* send stsd emulation to the decoder */
/* FIXME: qdm2 only right now */
- g_assert (gst_pad_get_negotiated_caps (xine->sinkpad));
+ g_assert (gst_pad_is_negotiated (xine->sinkpad));
structure =
gst_caps_get_structure (gst_pad_get_negotiated_caps (xine->sinkpad), 0);
*((guint32 *) & stsd[56]) = GUINT32_TO_BE (12);
diff --git a/gst-libs/gst/media-info/media-info-test.c b/gst-libs/gst/media-info/media-info-test.c
index e0778d9f..4013b3ed 100644
--- a/gst-libs/gst/media-info/media-info-test.c
+++ b/gst-libs/gst/media-info/media-info-test.c
@@ -15,7 +15,8 @@ print_tag (const GstTagList * list, const gchar * tag, gpointer unused)
gchar *str;
if (gst_tag_get_type (tag) == G_TYPE_STRING) {
- g_assert (gst_tag_list_get_string_index (list, tag, i, &str));
+ if (!gst_tag_list_get_string_index (list, tag, i, &str))
+ g_assert_not_reached ();
} else {
str =
g_strdup_value_contents (gst_tag_list_get_value_index (list, tag, i));