isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-25 04:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

cogl-gst: Remove the return value from attach_frame()

Browse Source 
Previously cogl_gst_video_sink_attach_frame returned the last layer
used by the sink. This can also be retrieved via
cogl_gst_video_sink_get_free_layer so I don't think it's necessary to
return it here and it seems kind of out of place.

Reviewed-by: Robert Bragg <robert@linux.intel.com>

(cherry picked from commit 0805f3e9db715fc2c97b7e60d4f3a25e7fa598fc)
This commit is contained in:
Neil Roberts 2013-04-25 19:01:37 +01:00 committed by Lionel Landwerlin
parent 735bf63063
commit ee559d4e93
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cogl-gst/cogl-gst-video-sink.c
View File

@ -190,7 +190,7 @@ cogl_gst_video_sink_get_free_layer (CoglGstVideoSink *sink)
return sink->priv->free_layer; return sink->priv->free_layer;
} }
int void
cogl_gst_video_sink_attach_frame (CoglGstVideoSink *sink, cogl_gst_video_sink_attach_frame (CoglGstVideoSink *sink,
CoglPipeline *pln) CoglPipeline *pln)
{ {
@ -201,8 +201,6 @@ cogl_gst_video_sink_attach_frame (CoglGstVideoSink *sink,
if (priv->frame[i] != NULL) if (priv->frame[i] != NULL)
cogl_pipeline_set_layer_texture (pln, i + priv->custom_start, cogl_pipeline_set_layer_texture (pln, i + priv->custom_start,
priv->frame[i]); priv->frame[i]);
return priv->free_layer;
} }
static CoglBool static CoglBool

5
cogl-gst/cogl-gst-video-sink.h
View File

@ -262,12 +262,9 @@ cogl_gst_video_sink_get_free_layer (CoglGstVideoSink *sink);
* would then make a copy of its template pipeline and call this to * would then make a copy of its template pipeline and call this to
* set the textures. * set the textures.
* *
* Return value: the next free layer after the sink's internal private
* layers. This is the same value that is returned by
* cogl_gst_video_sink_get_free_layer().
* Since: 1.16 * Since: 1.16
*/ */
int void
cogl_gst_video_sink_attach_frame (CoglGstVideoSink *sink, cogl_gst_video_sink_attach_frame (CoglGstVideoSink *sink,
CoglPipeline *pln); CoglPipeline *pln);