+2004-05-04 Benjamin Otte <otte@gnome.org>
+
+ * gst/parse/grammar.y:
+ fix assert to not trigger when there's no error argument
+ * gst/parse/parse.l:
+ fix definition of caps to allow more than two structures
+ * testsuite/caps/Makefile.am:
+ * testsuite/caps/renegotiate.c: (main):
+ it's sinesrc and works in that case
+
2004-05-04 Wim Taymans <wim@fluendo.com>
* gst/schedulers/gstoptimalscheduler.c: (remove_from_group),
g_slist_foreach (g.links, (GFunc)gst_parse_free_link, NULL);
g_slist_free (g.links);
- g_assert (*error);
+ if (error)
+ g_assert (*error);
ret = NULL;
goto out;
_capschar ("\\".)|([^\;!])
_capsstring {_capschar}+|("\""([^\"]|"\\\"")*"\"")|("'"([^']|"\\\"")*"'")
_caps {_mimetype}(","[^!]|{_capsstring})*
-_link ("!"[[:space:]]*{_caps}([[:space:]]*";"[[:space:]]*{_caps})*[[:space:]]*"!")|("!")
+_link ("!"[[:space:]]*{_caps}([[:space:]]*(";"[[:space:]]*{_caps})*[[:space:]]*)*"!")|("!")
%x value
%option noyywrap
noinst_HEADERS = \
caps.h
-tests_fail = renegotiate
+tests_fail =
tests_ignore =
app_fixate_LDADD = $(GST_OBJ_LIBS)
const GList *l2;
int i;
int ret;
+ GError *error = NULL;
gst_init (&argc, &argv);
/* change sinesrk to sinesrc once gst_parse_launch is fixed */
- pipeline = gst_parse_launch ("sinesrk ! audioconvert ! "
+ pipeline = gst_parse_launch ("sinesrc ! audioconvert ! "
"audio/x-raw-int, channels=2, rate=48000;"
- "audio/x-raw-int, channels=1, rate=44100 !" "fakesink", NULL);
+ "audio/x-raw-int, channels=1, rate=44100 !" "fakesink", &error);
- if (pipeline == NULL) {
+ if (error != NULL) {
g_print
("oops, couldn't build pipeline. You probably don't have audioconvert or sinesrc\n");
exit (0);
noinst_HEADERS = \
caps.h
-tests_fail = renegotiate
+tests_fail =
tests_ignore =
app_fixate_LDADD = $(GST_OBJ_LIBS)
const GList *l2;
int i;
int ret;
+ GError *error = NULL;
gst_init (&argc, &argv);
/* change sinesrk to sinesrc once gst_parse_launch is fixed */
- pipeline = gst_parse_launch ("sinesrk ! audioconvert ! "
+ pipeline = gst_parse_launch ("sinesrc ! audioconvert ! "
"audio/x-raw-int, channels=2, rate=48000;"
- "audio/x-raw-int, channels=1, rate=44100 !" "fakesink", NULL);
+ "audio/x-raw-int, channels=1, rate=44100 !" "fakesink", &error);
- if (pipeline == NULL) {
+ if (error != NULL) {
g_print
("oops, couldn't build pipeline. You probably don't have audioconvert or sinesrc\n");
exit (0);