From: Thibault Saunier <thibault.saunier@collabora.com>
Date: Sat, 5 May 2012 17:00:49 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/0.10'
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2e52fe15f014ea81bca216620a4bf099b855cea3;p=platform%2Fupstream%2Fgst-editing-services.git

Merge remote-tracking branch 'origin/0.10'

Conflicts:
	bindings/python/ges.defs
	ges/ges-track-video-transition.c
---

2e52fe15f014ea81bca216620a4bf099b855cea3
diff --cc ges/ges-track-video-transition.c
index 792b891,de43086..47999fa
--- a/ges/ges-track-video-transition.c
+++ b/ges/ges-track-video-transition.c
@@@ -226,10 -298,10 +300,7 @@@ create_mixer (GstElement * topbin
  {
    GstElement *mixer = NULL;
  
--  /* Prefer videomixer2 to videomixer */
--  mixer = gst_element_factory_make ("videomixer2", NULL);
--  if (mixer == NULL)
--    mixer = gst_element_factory_make ("videomixer", NULL);
++  mixer = gst_element_factory_make ("videomixer", NULL);
    g_object_set (G_OBJECT (mixer), "background", 1, NULL);
    gst_bin_add (GST_BIN (topbin), mixer);
  
@@@ -448,9 -525,8 +522,8 @@@ switch_to_smpte_cb (GstPad * sink, gboo
  
  beach:
    priv->pending_type = GES_VIDEO_STANDARD_TRANSITION_TYPE_NONE;
-   gst_pad_remove_probe (sink, priv->switch_to_smpte_prob);
 -  gst_pad_set_blocked_async (sink,
 -      FALSE, (GstPadBlockCallback) unblock_pad_cb, NULL);
 +
-   return GST_PAD_PROBE_OK;
++  return GST_PAD_PROBE_REMOVE;
  }
  
  static GstElement *
@@@ -527,15 -601,14 +598,14 @@@ switch_to_crossfade_cb (GstPad * sink, 
  
  beach:
    priv->pending_type = GES_VIDEO_STANDARD_TRANSITION_TYPE_NONE;
-   gst_pad_remove_probe (sink, priv->switch_to_cfade_prob);
 -  gst_pad_set_blocked_async (sink, FALSE,
 -      (GstPadBlockCallback) unblock_pad_cb, NULL);
 +
-   return GST_PAD_PROBE_OK;
++  return GST_PAD_PROBE_REMOVE;
  }
  
  static GObject *
  link_element_to_mixer (GstElement * element, GstElement * mixer)
  {
--  GstPad *sinkpad = gst_element_get_request_pad (mixer, "sink_%d");
++  GstPad *sinkpad = gst_element_get_request_pad (mixer, "sink_%u");
    GstPad *srcpad = gst_element_get_static_pad (element, "src");
  
    gst_pad_link_full (srcpad, sinkpad, GST_PAD_LINK_CHECK_NOTHING);
@@@ -681,20 -726,17 +722,16 @@@ ges_track_video_transition_set_transiti
      if (type != GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE) {
        if (!priv->topbin)
          return FALSE;
-       GST_ERROR ("OO");
        priv->smpte = NULL;
-       priv->switch_to_smpte_prob =
-           gst_pad_add_probe (pad, GST_PAD_PROBE_TYPE_BLOCK_UPSTREAM,
 -      gst_pad_set_blocked_async (gst_element_get_static_pad (priv->topbin,
 -              "sinka"), TRUE, (GstPadBlockCallback) switch_to_smpte_cb, self);
++      gst_pad_add_probe (pad, GST_PAD_PROBE_TYPE_IDLE,
 +          (GstPadProbeCallback) switch_to_smpte_cb, self, NULL);
-       GST_ERROR ("OO");
      } else {
        if (!priv->topbin)
          return FALSE;
        priv->start_value = 1.0;
        priv->end_value = 0.0;
-       priv->switch_to_cfade_prob =
-           gst_pad_add_probe (pad, GST_PAD_PROBE_TYPE_BLOCK_UPSTREAM,
 -      gst_pad_set_blocked_async (gst_element_get_static_pad (priv->topbin,
 -              "sinka"), TRUE, (GstPadBlockCallback) switch_to_crossfade_cb,
 -          self);
++      gst_pad_add_probe (pad, GST_PAD_PROBE_TYPE_IDLE,
 +          (GstPadProbeCallback) switch_to_crossfade_cb, self, NULL);
      }
      return TRUE;
    }