summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFilippo Argiolas <filippo.argiolas@gmail.com>2009-07-15 09:42:11 +0200
committerFilippo Argiolas <filippo.argiolas@gmail.com>2009-07-15 09:42:11 +0200
commit6865901dc1bd807e493b82186e8670c0ecd7e864 (patch)
tree574e8d86f96edee7ef7487bae138e2e0bde282cd /src
parentcaba6e28416d0aebefaba53565c7941b19b99578 (diff)
Cleanup white spaces
Diffstat (limited to 'src')
-rw-r--r--src/cheese-grid.c17
-rw-r--r--src/cheese-stage.c14
-rw-r--r--src/cheese-texture.c4
3 files changed, 17 insertions, 18 deletions
diff --git a/src/cheese-grid.c b/src/cheese-grid.c
index f1a40a4..671d2aa 100644
--- a/src/cheese-grid.c
+++ b/src/cheese-grid.c
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2009 Filippo Argiolas
*
* This library is free software; you can redistribute it and/or
@@ -160,7 +160,7 @@ cheese_grid_dispose (GObject *object)
{
CheeseGrid *self = (CheeseGrid *) object;
CheeseGridPrivate *priv;
-
+
priv = self->priv;
/* Destroy all of the children. This will cause them to be removed
@@ -177,7 +177,7 @@ cheese_grid_finalize (GObject *object)
{
CheeseGrid *self = (CheeseGrid *) object;
CheeseGridPrivate *priv = self->priv;
-
+
g_hash_table_destroy (priv->hash_table);
G_OBJECT_CLASS (cheese_grid_parent_class)->finalize (object);
@@ -232,7 +232,7 @@ cheese_grid_real_remove (ClutterContainer *container,
CheeseGridPrivate *priv = layout->priv;
g_object_ref (actor);
-
+
if (g_hash_table_remove (priv->hash_table, actor))
{
clutter_actor_unparent (actor);
@@ -330,7 +330,7 @@ cheese_grid_get_preferred_width (ClutterActor *self,
// natural_width = clutter_actor_get_width (parent);
natural_width = 600.0;
-
+
if (min_width_p)
*min_width_p = natural_width;
if (natural_width_p)
@@ -448,18 +448,18 @@ cheese_grid_allocate (ClutterActor *self,
if (alloc_ratio < ratio) {
child_box.x1 = child_width * i;
child_box.x2 = child_box.x1 + child_width;
-
+
child_box.y1 = child_height * j + (child_height - child_width/ratio)/2.0;
child_box.y2 = child_box.y1 + (child_width/ratio);
}
else {
child_box.x1 = child_width * i + (child_width - child_height*ratio)/2.0;
child_box.x2 = child_box.x1 + child_height*ratio;
-
+
child_box.y1 = child_height * j;
child_box.y2 = child_box.y1 + child_height;
}
-
+
/* update the allocation */
clutter_actor_allocate (CLUTTER_ACTOR (child),
&child_box,
@@ -471,4 +471,3 @@ cheese_grid_allocate (ClutterActor *self,
}
}
}
-
diff --git a/src/cheese-stage.c b/src/cheese-stage.c
index 50030f6..14daa3c 100644
--- a/src/cheese-stage.c
+++ b/src/cheese-stage.c
@@ -67,11 +67,11 @@ static gboolean
on_enter_animate (ClutterActor *actor, ClutterEvent *event, gpointer data)
{
ClutterAnimation *previous_animation;
-
+
previous_animation = clutter_actor_get_animation (actor);
if (previous_animation)
clutter_animation_completed (previous_animation);
-
+
clutter_actor_raise_top (actor);
clutter_actor_animate (actor, CLUTTER_LINEAR, 150,
@@ -85,7 +85,7 @@ static gboolean
on_leave_animate (ClutterActor *actor, ClutterEvent *event, gpointer data)
{
ClutterAnimation *previous_animation;
-
+
previous_animation = clutter_actor_get_animation (actor);
if (previous_animation)
clutter_animation_completed (previous_animation);
@@ -122,7 +122,7 @@ on_button_animate (ClutterActor *actor, ClutterEvent *event, gpointer data)
previous_animation = clutter_actor_get_animation (actor);
if (previous_animation)
clutter_animation_completed (previous_animation);
-
+
if (parent == stage) {
clutter_actor_reparent (actor, CLUTTER_ACTOR (layout));
}
@@ -190,7 +190,7 @@ main (int argc, char *argv[])
clutter_container_add_actor (CLUTTER_CONTAINER (stage), layout);
- g_signal_connect (window, "configure-event",
+ g_signal_connect (window, "configure-event",
G_CALLBACK (on_window_configure), layout);
@@ -212,7 +212,7 @@ main (int argc, char *argv[])
tee = gst_element_factory_make ("tee", NULL);
gst_bin_add_many (GST_BIN (pipeline), srcbin, tee, NULL);
-
+
fx[0] = gst_parse_bin_from_description ("identity", TRUE, NULL);
// fx[1] = gst_parse_bin_from_description ("ffmpegcolorspace ! videobalance saturation=0 ! ffmpegcolorspace", TRUE, NULL);
fx[1] = gst_parse_bin_from_description ("identity", TRUE, NULL);
@@ -226,7 +226,7 @@ main (int argc, char *argv[])
fx[7] = gst_parse_bin_from_description ("identity", TRUE, NULL);
// fx[8] = gst_parse_bin_from_description ("ffmpegcolorspace ! videoflip method=5 ! ffmpegcolorspace", TRUE, NULL);
fx[8] = gst_parse_bin_from_description ("identity", TRUE, NULL);
-
+
for (i = 0; i < N_ACTORS; i++) {
queue[i] = gst_element_factory_make ("queue", NULL);
sink[i] = gst_element_factory_make ("ximagesink", NULL);
diff --git a/src/cheese-texture.c b/src/cheese-texture.c
index 04a1336..194ca3f 100644
--- a/src/cheese-texture.c
+++ b/src/cheese-texture.c
@@ -48,7 +48,7 @@ struct _CheeseTexturePrivate
static int _damage_event_base = 0;
-static GdkFilterReturn
+static GdkFilterReturn
gdk_filter (GdkXEvent *xevent, GdkEvent *event, gpointer data)
{
XEvent *xev = (XEvent *) xevent;
@@ -77,7 +77,7 @@ gdk_filter (GdkXEvent *xevent, GdkEvent *event, gpointer data)
ret = clutter_x11_handle_event (xev);
if (ret == CLUTTER_X11_FILTER_REMOVE) return GDK_FILTER_REMOVE;
}
- }
+ }
else if (xev->xany.window == toplevel) {
switch (xev->type) {
case ConfigureNotify: