mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-03 01:02:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

grammar.y: remove trailing whitespace

Browse source
This commit is contained in:
Stefan Sauer 2016-01-03 11:37:57 +01:00
parent 4e437a564d
commit 583304959a
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gst/parse/grammar.y
View file

@ -251,7 +251,7 @@ static int gst_resolve_reference(reference_t *rr, GstElement *pipeline){
bin = GST_BIN (pipeline); bin = GST_BIN (pipeline);
rr->element = gst_bin_get_by_name_recurse_up (bin, rr->name); rr->element = gst_bin_get_by_name_recurse_up (bin, rr->name);
} else { } else {
rr->element = strcmp (GST_ELEMENT_NAME (pipeline), rr->name) == 0 ? rr->element = strcmp (GST_ELEMENT_NAME (pipeline), rr->name) == 0 ?
gst_object_ref(pipeline) : NULL; gst_object_ref(pipeline) : NULL;
} }
if(rr->element) return 0; /* resolved */ if(rr->element) return 0; /* resolved */
@ -638,7 +638,7 @@ static int yyerror (void *scanner, graph_t *graph, const char *s);
%token <ss> PARSE_URL %token <ss> PARSE_URL
%token <ss> IDENTIFIER %token <ss> IDENTIFIER
%left <ss> REF PADREF BINREF %left <ss> REF PADREF BINREF
%token <ss> ASSIGNMENT %token <ss> ASSIGNMENT
%token <ss> LINK %token <ss> LINK
@ -746,7 +746,7 @@ elementary:
* that are syntactically closed (handled later in this file). * that are syntactically closed (handled later in this file).
* (e.g. fakesrc ! sinkreferencename.padname) * (e.g. fakesrc ! sinkreferencename.padname)
**************************************************************/ **************************************************************/
chain: openchain { $$=$1; chain: openchain { $$=$1;
if($$->last.name){ if($$->last.name){
SET_ERROR (graph->error, GST_PARSE_ERROR_SYNTAX, SET_ERROR (graph->error, GST_PARSE_ERROR_SYNTAX,
_("unexpected reference \"%s\" - ignoring"), $$->last.name); _("unexpected reference \"%s\" - ignoring"), $$->last.name);
@ -790,7 +790,7 @@ link: LINK { $$ = gst_parse_link_new ();
$$->sink.name = NULL; $$->sink.name = NULL;
$$->src.pads = NULL; $$->src.pads = NULL;
$$->sink.pads = NULL; $$->sink.pads = NULL;
$$->caps = NULL; $$->caps = NULL;
if ($1) { if ($1) {
$$->caps = gst_caps_from_string ($1); $$->caps = gst_caps_from_string ($1);
if ($$->caps == NULL) if ($$->caps == NULL)
@ -913,7 +913,7 @@ reference: REF morepads {
* _reference_ on each side. That * _reference_ on each side. That
* works already after the explanations above. * works already after the explanations above.
* someSourceName.Pad ! someSinkName. * someSourceName.Pad ! someSinkName.
* someSourceName.Pad,anotherPad ! someSinkName.Apad,Bpad * someSourceName.Pad,anotherPad ! someSinkName.Apad,Bpad
* *
* If a syntax error occurs, the already finished _chain_s * If a syntax error occurs, the already finished _chain_s
* and _links_ are kept intact. * and _links_ are kept intact.
@ -948,7 +948,7 @@ assignments: /* NOP */ { $$ = NULL; }
binopener: '(' { $$ = gst_parse_strdup(_("bin")); } binopener: '(' { $$ = gst_parse_strdup(_("bin")); }
| BINREF { $$ = $1; } | BINREF { $$ = $1; }
; ;
bin: binopener assignments chainlist ')' { bin: binopener assignments chainlist ')' {
chain_t *chain = $3; chain_t *chain = $3;
GSList *walk; GSList *walk;
GstBin *bin = (GstBin *) gst_element_factory_make ($1, NULL); GstBin *bin = (GstBin *) gst_element_factory_make ($1, NULL);
@ -1074,12 +1074,12 @@ priv_gst_parse_launch (const gchar *str, GError **error, GstParseContext *ctx,
g.chain->last.name=NULL; g.chain->last.name=NULL;
g.chain->last.pads=NULL; g.chain->last.pads=NULL;
}; };
/* ensure elements is not empty */ /* ensure elements is not empty */
if(!g.chain->elements){ if(!g.chain->elements){
g.chain->elements= g_slist_prepend (NULL, NULL); g.chain->elements= g_slist_prepend (NULL, NULL);
}; };
/* put all elements in our bin if necessary */ /* put all elements in our bin if necessary */
if(g.chain->elements->next){ if(g.chain->elements->next){
bin = GST_BIN (gst_element_factory_make ("pipeline", NULL)); bin = GST_BIN (gst_element_factory_make ("pipeline", NULL));
@ -1091,7 +1091,7 @@ priv_gst_parse_launch (const gchar *str, GError **error, GstParseContext *ctx,
} }
g_slist_free (g.chain->elements); g_slist_free (g.chain->elements);
g.chain->elements = g_slist_prepend (NULL, bin); g.chain->elements = g_slist_prepend (NULL, bin);
} }
ret = (GstElement *) g.chain->elements->data; ret = (GstElement *) g.chain->elements->data;
g_slist_free (g.chain->elements); g_slist_free (g.chain->elements);