[clutter-gst] remove usage of ClutterContainer

[Lionel Landwerlin <llandwerlin src gnome org>]

commit 01749c3282a7346256f3ff2af6357fd1576a44ca
Author: Lionel Landwerlin <llandwerlin gmail com>
Date:   Wed Jan 30 11:57:11 2013 +0000

    remove usage of ClutterContainer

 clutter-gst/clutter-gst-video-sink.c |    6 +++---
 examples/video-player.c              |   28 +++++++++++-----------------
 tests/test-alpha.c                   |    3 ++-
 tests/test-start-stop.c              |    2 +-
 4 files changed, 17 insertions(+), 22 deletions(-)
---
diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c
index 152bebc..e5a383c 100644
--- a/clutter-gst/clutter-gst-video-sink.c
+++ b/clutter-gst/clutter-gst-video-sink.c
@@ -426,8 +426,8 @@ on_stage_destroyed (ClutterStage * stage,
   g_mutex_lock (&gst_source->buffer_lock);
 
   clutter_actor_hide (CLUTTER_ACTOR (stage));
-  clutter_container_remove_actor (CLUTTER_CONTAINER (stage),
-      CLUTTER_ACTOR (priv->texture));
+  clutter_actor_remove_child (CLUTTER_ACTOR (stage),
+                              CLUTTER_ACTOR (priv->texture));
 
   if (gst_source->buffer)
     gst_buffer_unref (gst_source->buffer);
@@ -499,7 +499,7 @@ clutter_gst_source_dispatch (GSource * source,
       clutter_gst_video_sink_set_texture (gst_source->sink,
           CLUTTER_TEXTURE (actor));
       clutter_stage_set_user_resizable (CLUTTER_STAGE (stage), TRUE);
-      clutter_container_add_actor (CLUTTER_CONTAINER (stage), actor);
+      clutter_actor_add_child (stage, actor);
       clutter_stage_set_no_clear_hint (CLUTTER_STAGE (stage), TRUE);
 
       g_signal_connect (stage, "delete-event",
diff --git a/examples/video-player.c b/examples/video-player.c
index cd973e5..6d3689f 100644
--- a/examples/video-player.c
+++ b/examples/video-player.c
@@ -223,14 +223,12 @@ input_cb (ClutterStage *stage,
           case CLUTTER_d:
             if (app->vtexture)
               {
-                clutter_container_remove_actor (CLUTTER_CONTAINER (app->stage),
-                                                app->vtexture);
+                clutter_actor_remove_child (app->stage, app->vtexture);
                 app->vtexture = NULL;
               }
             if (app->control)
               {
-                clutter_container_remove_actor (CLUTTER_CONTAINER (app->stage),
-                                                app->control);
+                clutter_actor_remove_child (app->stage, app->control);
                 app->control = NULL;
               }
             break;
@@ -494,15 +492,13 @@ main (int argc, char *argv[])
 
   clutter_actor_hide (app->control_play);
 
-  clutter_container_add (CLUTTER_CONTAINER (app->control),
-                         app->control_bg,
-                         app->control_play,
-                         app->control_pause,
-                         app->control_seek1,
-                         app->control_seek2,
-                         app->control_seekbar,
-                         app->control_label,
-                         NULL);
+  clutter_actor_add_child (app->control, app->control_bg);
+  clutter_actor_add_child (app->control, app->control_play);
+  clutter_actor_add_child (app->control, app->control_pause);
+  clutter_actor_add_child (app->control, app->control_seek1);
+  clutter_actor_add_child (app->control, app->control_seek2);
+  clutter_actor_add_child (app->control, app->control_seekbar);
+  clutter_actor_add_child (app->control, app->control_label);
 
   clutter_actor_set_opacity (app->control, 0xee);
 
@@ -519,10 +515,8 @@ main (int argc, char *argv[])
   clutter_actor_set_position (app->control_label, 82, 29);
 
   /* Add control UI to stage */
-  clutter_container_add (CLUTTER_CONTAINER (stage),
-                         app->vtexture,
-                         app->control,
-                         NULL);
+  clutter_actor_add_child (stage, app->vtexture);
+  clutter_actor_add_child (stage, app->control);
 
   position_controls (app, app->control);
 
diff --git a/tests/test-alpha.c b/tests/test-alpha.c
index 23e8844..e1e78e6 100644
--- a/tests/test-alpha.c
+++ b/tests/test-alpha.c
@@ -197,7 +197,8 @@ main (int argc, char *argv[])
     g_critical("Could not link elements");
   gst_element_set_state (GST_ELEMENT(pipeline), GST_STATE_PLAYING);
 
-  clutter_container_add (CLUTTER_CONTAINER (stage), rectangle, texture, NULL);
+  clutter_actor_add_child (stage, rectangle);
+  clutter_actor_add_child (stage, texture);
   clutter_actor_show_all (stage);
 
   animation = clutter_actor_animate (texture, CLUTTER_LINEAR, 6000,
diff --git a/tests/test-start-stop.c b/tests/test-start-stop.c
index 62801c7..7b6efab 100644
--- a/tests/test-start-stop.c
+++ b/tests/test-start-stop.c
@@ -160,7 +160,7 @@ main (int argc, char *argv[])
   clutter_media_set_audio_volume (CLUTTER_MEDIA(video), 0.5);
   clutter_media_set_playing (CLUTTER_MEDIA(video), TRUE);
 
-  clutter_container_add (CLUTTER_CONTAINER(stage), video, NULL);
+  clutter_actor_add_child (stage, video);
   clutter_actor_show_all (stage);
   clutter_main ();