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

[Robert Bragg]

This series of patches looks good to land to me:

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

thanks,
- Robert


On Thu, Apr 25, 2013 at 7:06 PM, Neil Roberts <neil at linux.intel.com> wrote:
> 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.
> ---
>  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 8fe6aca..50c2f91 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.7.11.3.g3c3efa5
>
> _______________________________________________
> Cogl mailing list
> Cogl at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/cogl