mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 08:46:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

add extra error for empty pipeline

Browse source 
Original commit message from CVS:
add extra error for empty pipeline
This commit is contained in:
Benjamin Otte 2003-04-27 23:56:31 +00:00
parent 775fbca9a5
commit 9837c9dbaa
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gst/gstparse.h
View file

@ -40,6 +40,7 @@ typedef enum
GST_PARSE_ERROR_LINK, GST_PARSE_ERROR_LINK,
GST_PARSE_ERROR_COULD_NOT_SET_PROPERTY, GST_PARSE_ERROR_COULD_NOT_SET_PROPERTY,
GST_PARSE_ERROR_EMPTY_BIN, GST_PARSE_ERROR_EMPTY_BIN,
GST_PARSE_ERROR_EMPTY
} GstParseError; } GstParseError;

9
gst/parse/grammar.y
View file

@ -521,7 +521,6 @@ static int yyerror (const char *s);
%type <e> element %type <e> element
%type <p> padlist pads assignments %type <p> padlist pads assignments
%left '{' '}' '(' ')' %left '{' '}' '(' ')'
%left ',' %left ','
%right '.' %right '.'
@ -580,7 +579,6 @@ reference: REF { MAKE_REF ($$, $1, NULL); }
linkpart: reference { $$ = $1; } linkpart: reference { $$ = $1; }
| pads { MAKE_REF ($$, NULL, $1); } | pads { MAKE_REF ($$, NULL, $1); }
| /* NOP */ { MAKE_REF ($$, NULL, NULL); } | /* NOP */ { MAKE_REF ($$, NULL, NULL); }
| linkpart error { $$ = $1; }
; ;
link: linkpart '!' linkpart { $$ = $1; link: linkpart '!' linkpart { $$ = $1;
@ -594,7 +592,7 @@ linklist: link { $$ = g_slist_prepend (NULL, $1); }
| link linklist { $$ = g_slist_prepend ($2, $1); } | link linklist { $$ = g_slist_prepend ($2, $1); }
| linklist error { $$ = $1; } | linklist error { $$ = $1; }
; ;
chain: element { $$ = gst_parse_chain_new (); chain: element { $$ = gst_parse_chain_new ();
$$->first = $$->last = $1; $$->first = $$->last = $1;
$$->front = $$->back = NULL; $$->front = $$->back = NULL;
@ -688,7 +686,10 @@ chain: element { $$ = gst_parse_chain_new ();
| chain error { $$ = $1; } | chain error { $$ = $1; }
; ;
graph: chain { $$ = (graph_t *) graph; graph: /* NOP */ { ERROR (GST_PARSE_ERROR_EMPTY, "Empty pipeline not allowed");
$$ = (graph_t *) graph;
}
| chain { $$ = (graph_t *) graph;
if ($1->front) { if ($1->front) {
if (!$1->front->src_name) { if (!$1->front->src_name) {
ERROR (GST_PARSE_ERROR_LINK, "link without source element"); ERROR (GST_PARSE_ERROR_LINK, "link without source element");