[Cogl] [PATCH 14/15] cogl-gst: Remove the return value from attach_frame()

Lionel Landwerlin llandwerlin at gmail.com
Sat Jun 22 01:58:58 PDT 2013


From: Neil Roberts <neil at linux.intel.com>

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 at linux.intel.com>

(cherry picked from commit 0805f3e9db715fc2c97b7e60d4f3a25e7fa598fc)
---
 cogl-gst/cogl-gst-video-sink.c | 4 +---
 cogl-gst/cogl-gst-video-sink.h | 5 +----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/cogl-gst/cogl-gst-video-sink.c b/cogl-gst/cogl-gst-video-sink.c
index 6e65402..42d44b7 100644
--- a/cogl-gst/cogl-gst-video-sink.c
+++ b/cogl-gst/cogl-gst-video-sink.c
@@ -190,7 +190,7 @@ cogl_gst_video_sink_get_free_layer (CoglGstVideoSink *sink)
   return sink->priv->free_layer;
 }
 
-int
+void
 cogl_gst_video_sink_attach_frame (CoglGstVideoSink *sink,
                                   CoglPipeline *pln)
 {
@@ -201,8 +201,6 @@ cogl_gst_video_sink_attach_frame (CoglGstVideoSink *sink,
     if (priv->frame[i] != NULL)
       cogl_pipeline_set_layer_texture (pln, i + priv->custom_start,
                                        priv->frame[i]);
-
-  return priv->free_layer;
 }
 
 static CoglBool
diff --git a/cogl-gst/cogl-gst-video-sink.h b/cogl-gst/cogl-gst-video-sink.h
index e76e742..a9694a6 100644
--- a/cogl-gst/cogl-gst-video-sink.h
+++ b/cogl-gst/cogl-gst-video-sink.h
@@ -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
  * 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
  */
-int
+void
 cogl_gst_video_sink_attach_frame (CoglGstVideoSink *sink,
                                   CoglPipeline *pln);
 
-- 
1.8.3.1



More information about the Cogl mailing list