diff options
| author | Damien Lespiau <damien.lespiau@intel.com> | 2009-06-26 14:28:10 +0200 |
|---|---|---|
| committer | Damien Lespiau <damien.lespiau@intel.com> | 2009-06-26 14:28:10 +0200 |
| commit | 62f3a7f4492c630fca81671425c32720354a46ef (patch) | |
| tree | ba3762c60a644313c8870b3be30494e8ea3d0c90 | |
| parent | ea5e74aebad96c373c18618d12f2dc042fe01427 (diff) | |
| download | clutter-gst-62f3a7f4492c630fca81671425c32720354a46ef.tar.gz | |
[videosink] Refactor Renderer::init()
The first argument, the target ClutterActor was both unneeded and still
reachable from the sink.
| -rw-r--r-- | clutter-gst/clutter-gst-video-sink.c | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c index beca3bb..20c1844 100644 --- a/clutter-gst/clutter-gst-video-sink.c +++ b/clutter-gst/clutter-gst-video-sink.c @@ -167,8 +167,7 @@ typedef struct _ClutterGstRenderer int flags; /* ClutterGstFeatures ORed flags */ GstStaticCaps caps; /* caps handled by the renderer */ - void (*init) (ClutterActor *actor, - ClutterGstVideoSink *sink); + void (*init) (ClutterGstVideoSink *sink); void (*upload) (ClutterGstVideoSink *sink, GstBuffer *buffer); void (*paint) (ClutterActor *actor, @@ -350,8 +349,7 @@ clutter_gst_video_sink_set_shader (ClutterGstVideoSink *sink, /* some renderers don't need all the ClutterGstRenderer vtable */ static void -clutter_gst_dummy_init (ClutterActor *actor, - ClutterGstVideoSink *sink) +clutter_gst_dummy_init (ClutterGstVideoSink *sink) { } @@ -432,14 +430,12 @@ static ClutterGstRenderer rgb32_renderer = */ static void -clutter_gst_yv12_glsl_init (ClutterActor *actor, - ClutterGstVideoSink *sink) +clutter_gst_yv12_glsl_init (ClutterGstVideoSink *sink) { ClutterGstVideoSinkPrivate *priv= sink->priv; GLint location; - clutter_gst_video_sink_set_shader (sink, - yv12_to_rgba_shader); + clutter_gst_video_sink_set_shader (sink, yv12_to_rgba_shader); cogl_program_use (priv->program); location = cogl_program_get_uniform_location (priv->program, "ytex"); @@ -543,8 +539,7 @@ static ClutterGstRenderer yv12_glsl_renderer = #ifdef CLUTTER_COGL_HAS_GL static void -clutter_gst_yv12_fp_init (ClutterActor *actor, - ClutterGstVideoSink *sink) +clutter_gst_yv12_fp_init (ClutterGstVideoSink *sink) { gchar *shader; @@ -593,14 +588,12 @@ static ClutterGstRenderer yv12_fp_renderer = */ static void -clutter_gst_i420_glsl_init (ClutterActor *actor, - ClutterGstVideoSink *sink) +clutter_gst_i420_glsl_init (ClutterGstVideoSink *sink) { ClutterGstVideoSinkPrivate *priv = sink->priv; GLint location; - clutter_gst_video_sink_set_shader (sink, - yv12_to_rgba_shader); + clutter_gst_video_sink_set_shader (sink, yv12_to_rgba_shader); cogl_program_use (priv->program); location = cogl_program_get_uniform_location (priv->program, "ytex"); @@ -633,8 +626,7 @@ static ClutterGstRenderer i420_glsl_renderer = #ifdef CLUTTER_COGL_HAS_GL static void -clutter_gst_i420_fp_init (ClutterActor *actor, - ClutterGstVideoSink *sink) +clutter_gst_i420_fp_init (ClutterGstVideoSink *sink) { gchar *shader; @@ -669,8 +661,7 @@ static ClutterGstRenderer i420_fp_renderer = */ static void -clutter_gst_ayuv_glsl_init(ClutterActor *actor, - ClutterGstVideoSink *sink) +clutter_gst_ayuv_glsl_init(ClutterGstVideoSink *sink) { clutter_gst_video_sink_set_shader (sink, ayuv_to_rgba_shader); } @@ -875,7 +866,7 @@ clutter_gst_video_sink_idle_func (gpointer data) { gulong handler_id; - priv->renderer->init (CLUTTER_ACTOR (priv->texture), sink); + priv->renderer->init (sink); handler_id = g_signal_connect (priv->texture, |