[cogl/wip/cogl-gst: 4/9] cogl-gst: fixes some indentation + guint usage
- From: Neil Roberts <nroberts src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/wip/cogl-gst: 4/9] cogl-gst: fixes some indentation + guint usage
- Date: Tue, 26 Feb 2013 20:02:40 +0000 (UTC)
commit d6dfd97b17943486ab7038a81f69b2f22b257bed
Author: Robert Bragg <robert linux intel com>
Date: Fri Feb 22 16:19:37 2013 +0000
cogl-gst: fixes some indentation + guint usage
cogl-gst/cogl-gst-video-sink.c | 66 ++++++++++++++++++++--------------------
1 files changed, 33 insertions(+), 33 deletions(-)
---
diff --git a/cogl-gst/cogl-gst-video-sink.c b/cogl-gst/cogl-gst-video-sink.c
index 84a118f..37b362f 100644
--- a/cogl-gst/cogl-gst-video-sink.c
+++ b/cogl-gst/cogl-gst-video-sink.c
@@ -308,36 +308,36 @@ create_template_pipeline (CoglGstVideoSink *sink,
else
priv->pipeline = cogl_pipeline_new (priv->ctx);
- if (decl && post)
- {
- CoglSnippet *snippet = cogl_snippet_new (priv->hook, decl, post);
- cogl_pipeline_add_snippet (priv->pipeline, snippet);
- cogl_object_unref (snippet);
- }
-
- if (set_uniforms)
- {
- unsigned int location;
- location = cogl_pipeline_get_uniform_location (priv->pipeline,
- "ytex");
- cogl_pipeline_set_uniform_1i (priv->pipeline, location, 0);
-
- if (n_layers > 1)
- {
- location = cogl_pipeline_get_uniform_location (priv->pipeline,
- "utex");
- cogl_pipeline_set_uniform_1i (priv->pipeline, location, 1);
- priv->free_layer++;
- }
-
- if (n_layers > 2)
- {
- location = cogl_pipeline_get_uniform_location (priv->pipeline,
- "vtex");
- cogl_pipeline_set_uniform_1i (priv->pipeline, location, 2);
- priv->free_layer++;
- }
- }
+ if (decl && post)
+ {
+ CoglSnippet *snippet = cogl_snippet_new (priv->hook, decl, post);
+ cogl_pipeline_add_snippet (priv->pipeline, snippet);
+ cogl_object_unref (snippet);
+ }
+
+ if (set_uniforms)
+ {
+ unsigned int location;
+ location = cogl_pipeline_get_uniform_location (priv->pipeline,
+ "ytex");
+ cogl_pipeline_set_uniform_1i (priv->pipeline, location, 0);
+
+ if (n_layers > 1)
+ {
+ location = cogl_pipeline_get_uniform_location (priv->pipeline,
+ "utex");
+ cogl_pipeline_set_uniform_1i (priv->pipeline, location, 1);
+ priv->free_layer++;
+ }
+
+ if (n_layers > 2)
+ {
+ location = cogl_pipeline_get_uniform_location (priv->pipeline,
+ "vtex");
+ cogl_pipeline_set_uniform_1i (priv->pipeline, location, 2);
+ priv->free_layer++;
+ }
+ }
g_signal_emit_by_name (sink, "cogl-pipeline-ready", 0);
}
@@ -736,7 +736,7 @@ cogl_gst_video_sink_set_caps (GstBaseSink *bsink,
}
else
{
- guint32 mask;
+ uint32_t mask;
gst_structure_get_int (structure, "red_mask", &red_mask);
gst_structure_get_int (structure, "blue_mask", &blue_mask);
@@ -822,7 +822,7 @@ cogl_gst_video_sink_start (GstBaseSink *base_sink)
static void
cogl_gst_video_sink_set_property (GObject *object,
- guint prop_id,
+ unsigned int prop_id,
const GValue *value,
GParamSpec *pspec)
{
@@ -841,7 +841,7 @@ cogl_gst_video_sink_set_property (GObject *object,
static void
cogl_gst_video_sink_get_property (GObject *object,
- guint prop_id,
+ unsigned int prop_id,
GValue *value,
GParamSpec *pspec)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]