[cheese/camerabin: 4/4] Merge branch 'master' into camerabin

[Luciana Fujii Pontello <lufujii src gnome org>]

commit 1058af84476d8e00984195c7aad5296f14dea965
Merge: 6c0e530 6934d22
Author: Luciana Fujii Pontello <luciana fujii eti br>
Date:   Mon Jan 17 15:58:00 2011 -0200

    Merge branch 'master' into camerabin
    
    Conflicts:
    	libcheese/cheese-camera.c

 libcheese/cheese-camera.c |   18 +--
 po/el.po                  |  323 ++++++++++++++++++---------------------------
 2 files changed, 134 insertions(+), 207 deletions(-)
---
diff --cc libcheese/cheese-camera.c
index 14095ff,da07e7d..d2251ca
--- a/libcheese/cheese-camera.c
+++ b/libcheese/cheese-camera.c
@@@ -410,26 -447,57 +406,26 @@@ cheese_camera_create_video_filter_bin (
    if (error != NULL && *error != NULL)
      return FALSE;
  
 -  gst_bin_add_many (GST_BIN (priv->video_display_bin), priv->camera_source_bin,
 -                    priv->camera_tee, priv->effects_downscaler, priv->effects_tee,
 -                    priv->effects_valve, priv->main_valve,
 -                    priv->effect_filter,
 -                    priv->video_balance, priv->csp_post_balance,
 -                    save_tee, save_queue,
 -                    video_display_queue, video_scale, video_sink, NULL);
 -
 -  ok  = gst_element_link_many (priv->camera_source_bin, priv->camera_tee, NULL);
 -  ok &= gst_element_link_many (priv->camera_tee, priv->main_valve, priv->effect_filter,
 -                               priv->video_balance, priv->csp_post_balance,
 -                               save_tee, NULL);
 +  gst_bin_add_many (GST_BIN (priv->video_filter_bin), priv->camera_tee,
 +                    priv->effects_downscaler, priv->effects_tee,
 +                    priv->effects_valve, priv->main_valve, priv->effect_filter,
-                     priv->csp_post_effect, priv->video_balance,
-                     priv->csp_post_balance, NULL);
++                    priv->video_balance, priv->csp_post_balance, NULL);
 +
-   ok &= gst_element_link_many (priv->camera_tee, priv->main_valve, priv->effect_filter,
-                                priv->csp_post_effect, priv->video_balance,
++  ok &= gst_element_link_many (priv->camera_tee, priv->main_valve,
++                               priv->effect_filter, priv->video_balance,
 +                               priv->csp_post_balance, NULL);
++
    ok &= gst_element_link_many (priv->camera_tee, priv->effects_valve,
                                 priv->effects_downscaler, priv->effects_tee, NULL);
 -  ok &= gst_element_link_many (save_tee, save_queue, NULL);
 -  ok &= gst_element_link_many (save_tee, video_display_queue, video_scale, video_sink, NULL);
  
 -  /* add ghostpad */
 -  pad = gst_element_get_pad (save_queue, "src");
 -  gst_element_add_pad (priv->video_display_bin, gst_ghost_pad_new ("src", pad));
 +  /* add ghostpads */
 +
 +  pad = gst_element_get_static_pad (priv->csp_post_balance, "src");
 +  gst_element_add_pad (priv->video_filter_bin, gst_ghost_pad_new ("src", pad));
 +  gst_object_unref (GST_OBJECT (pad));
 +
 +  pad = gst_element_get_static_pad (priv->camera_tee, "sink");
 +  gst_element_add_pad (priv->video_filter_bin, gst_ghost_pad_new ("sink", pad));
    gst_object_unref (GST_OBJECT (pad));
  
    if (!ok)
@@@ -552,16 -771,16 +548,16 @@@ cheese_camera_change_effect_filter (Che
    g_object_set (G_OBJECT (priv->main_valve), "drop", TRUE, NULL);
  
    gst_element_unlink_many (priv->main_valve, priv->effect_filter,
-                            priv->csp_post_effect, NULL);
+                            priv->video_balance, NULL);
  
    g_object_ref (priv->effect_filter);
 -  gst_bin_remove (GST_BIN (priv->video_display_bin), priv->effect_filter);
 +  gst_bin_remove (GST_BIN (priv->video_filter_bin), priv->effect_filter);
    gst_element_set_state (priv->effect_filter, GST_STATE_NULL);
    g_object_unref (priv->effect_filter);
  
 -  gst_bin_add (GST_BIN (priv->video_display_bin), new_filter);
 +  gst_bin_add (GST_BIN (priv->video_filter_bin), new_filter);
    ok = gst_element_link_many (priv->main_valve, new_filter,
-                               priv->csp_post_effect, NULL);
+                               priv->video_balance, NULL);
    gst_element_set_state (new_filter, GST_STATE_PAUSED);
  
    g_return_if_fail (ok);