From 2b077e89c620c630e4fdaf2d9cb73ab141127ea9 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Mon, 1 Jul 2013 16:10:55 +0100 Subject: switch ClutterGst to use ClutterContent --- examples/camera-player.c | 17 ++++++++------- examples/pieces.js | 17 +++++++++------ examples/video-flip.js | 56 +++++++++++++++++++++++++++--------------------- examples/video-flip2.js | 46 +++++++++++++++++++++------------------ examples/video-player.c | 10 ++++++--- examples/video-wall.js | 14 ++++++------ 6 files changed, 90 insertions(+), 70 deletions(-) (limited to 'examples') diff --git a/examples/camera-player.c b/examples/camera-player.c index e601d50..e5e25a1 100644 --- a/examples/camera-player.c +++ b/examples/camera-player.c @@ -329,9 +329,8 @@ size_change (ClutterGstPlayer *player, /* base_width and base_height are the actual dimensions of the buffers before * taking the pixel aspect ratio into account. We need to get the actual * size of the texture to display */ - clutter_actor_get_preferred_size (app->camera_actor, - NULL, NULL, - &frame_width, &frame_height); + clutter_content_get_preferred_size (clutter_actor_get_content (app->camera_actor), + &frame_width, &frame_height); new_height = (frame_height * stage_width) / frame_width; if (new_height <= stage_height) @@ -386,7 +385,6 @@ main (int argc, char *argv[]) app = g_new0(CameraApp, 1); app->stage = stage; - app->camera_actor = clutter_gst_aspectratio_new (); app->camera_player = clutter_gst_camera_new (); if (app->camera_player == NULL) @@ -395,6 +393,13 @@ main (int argc, char *argv[]) return EXIT_FAILURE; } + app->camera_actor = g_object_new (CLUTTER_TYPE_ACTOR, + "content", g_object_new (CLUTTER_GST_TYPE_ASPECTRATIO, + "player", app->camera_player, + NULL), + NULL); + + app->camera_devices = clutter_gst_camera_get_camera_devices (app->camera_player); if (!app->camera_devices) { @@ -429,10 +434,6 @@ main (int argc, char *argv[]) "size-change", G_CALLBACK (size_change), app); - - clutter_gst_actor_set_player (CLUTTER_GST_ACTOR (app->camera_actor), - CLUTTER_GST_PLAYER (app->camera_player)); - /* Add control UI to stage */ clutter_actor_add_child (stage, app->camera_actor); diff --git a/examples/pieces.js b/examples/pieces.js index 5642752..34606c3 100644 --- a/examples/pieces.js +++ b/examples/pieces.js @@ -131,13 +131,16 @@ for (let i = 0; i < ROWS; i++) { y1: i / ROWS, y2: (i + 1) / ROWS, }) - let actor = new ClutterGst.Crop({ width: BIT_WIDTH, - height: BIT_HEIGHT, - player: player, - x: BIT_WIDTH * j, - y: BIT_HEIGHT * i, - input_region: input, - }); + let actor = new Clutter.Actor({ + width: BIT_WIDTH, + height: BIT_HEIGHT, + x: BIT_WIDTH * j, + y: BIT_HEIGHT * i, + content: new ClutterGst.Crop({ + player: player, + input_region: input, + }), + }); stage.add_actor(actor); pieces.array[i][j] = actor; diff --git a/examples/video-flip.js b/examples/video-flip.js index f320cef..4776750 100644 --- a/examples/video-flip.js +++ b/examples/video-flip.js @@ -45,12 +45,12 @@ stage.set_background_color(new Clutter.Color({ red: 0, stage.connect('destroy', Lang.bind(this, function() { Clutter.main_quit(); })); -player1 = new ClutterGst.Playback(); +let player1 = new ClutterGst.Playback(); player1.set_filename(ARGV[0]); player1.set_audio_volume(0); player1.set_progress(0.20); -player2 = new ClutterGst.Playback(); +let player2 = new ClutterGst.Playback(); player2.set_filename(ARGV[1]); player2.set_audio_volume(0); player2.set_progress(0.20); @@ -125,30 +125,36 @@ for (let i = 0; i < ROWS; i++) { y2: (i + 1) / ROWS, }) let actor = - new ClutterGst.Crop({ reactive: true, - cull_backface: true, - pivot_point: new Clutter.Point({ x: 0.5, - y: 0.5 }), - width: 200, - height: 200, - x: -200, - y: -200, - input_region: input, - player: player1, - }); + new Clutter.Actor({ + reactive: true, + pivot_point: new Clutter.Point({ x: 0.5, + y: 0.5 }), + width: 200, + height: 200, + x: -200, + y: -200, + content: new ClutterGst.Crop({ + cull_backface: true, + input_region: input, + player: player1, + }), + }); actor._backActor = - new ClutterGst.Crop({ reactive: false, - cull_backface: true, - pivot_point: new Clutter.Point({ x: 0.5, - y: 0.5 }), - rotation_angle_y: 180, - width: 200, - height: 200, - x: -200, - y: -200, - input_region: input, - player: player2, - }); + new Clutter.Actor({ + reactive: false, + pivot_point: new Clutter.Point({ x: 0.5, + y: 0.5 }), + rotation_angle_y: 180, + width: 200, + height: 200, + x: -200, + y: -200, + content: new ClutterGst.Crop({ + cull_backface: true, + input_region: input, + player: player2, + }), + }); stage.add_child(actor); stage.add_child(actor._backActor); diff --git a/examples/video-flip2.js b/examples/video-flip2.js index 25ae4b8..98966ec 100644 --- a/examples/video-flip2.js +++ b/examples/video-flip2.js @@ -119,27 +119,27 @@ Players.prototype = { updateActorsCurrent: function(actors, back) { for (let i in actors) { if (back) - actors[i]._backActor.player = this.getCurrentPlayer(); + actors[i]._backActor.content.player = this.getCurrentPlayer(); else - actors[i].player = this.getCurrentPlayer(); + actors[i].content.player = this.getCurrentPlayer(); } }, updateActorsNext: function(actors, back) { for (let i in actors) { if (back) - actors[i]._backActor.player = this.getNextPlayer(); + actors[i]._backActor.content.player = this.getNextPlayer(); else - actors[i].player = this.getNextPlayer(); + actors[i].content.player = this.getNextPlayer(); } }, updateActorsPrevious: function(actors, back) { for (let i in actors) { if (back) - actors[i]._backActor.player = this.getPreviousPlayer(); + actors[i]._backActor.content.player = this.getPreviousPlayer(); else - actors[i].player = this.getPreviousPlayer(); + actors[i].content.player = this.getPreviousPlayer(); } }, @@ -241,22 +241,26 @@ for (let i = 0; i < ROWS; i++) { y2: (i + 1) / ROWS, }) let actor = - new ClutterGst.Crop({ cull_backface: true, - pivot_point: new Clutter.Point({ x: 0.5, - y: 0.5 }), - width: TILE_WIDTH, - height: TILE_HEIGHT, - input_region: input, - }); + new Clutter.Actor({ + pivot_point: new Clutter.Point({ x: 0.5, + y: 0.5 }), + width: TILE_WIDTH, + height: TILE_HEIGHT, + content: new ClutterGst.Crop({ cull_backface: true, + input_region: input, + }), + }); actor._backActor = - new ClutterGst.Crop({ cull_backface: true, - pivot_point: new Clutter.Point({ x: 0.5, - y: 0.5 }), - rotation_angle_y: 180, - width: TILE_WIDTH, - height: TILE_HEIGHT, - input_region: input, - }); + new Clutter.Actor({ + pivot_point: new Clutter.Point({ x: 0.5, + y: 0.5 }), + rotation_angle_y: 180, + width: TILE_WIDTH, + height: TILE_HEIGHT, + content: new ClutterGst.Crop({ cull_backface: true, + input_region: input, + }), + }); stage.add_child(actor); stage.add_child(actor._backActor); diff --git a/examples/video-player.c b/examples/video-player.c index e9435c1..b3e1317 100644 --- a/examples/video-player.c +++ b/examples/video-player.c @@ -469,11 +469,15 @@ main (int argc, char *argv[]) app = g_new0(VideoApp, 1); app->stage = stage; - app->vactor = g_object_new (CLUTTER_GST_TYPE_ASPECTRATIO, NULL); - clutter_actor_set_size (app->vactor, clutter_actor_get_width (stage), clutter_actor_get_height (stage)); app->player = clutter_gst_playback_new (); - clutter_gst_actor_set_player (CLUTTER_GST_ACTOR (app->vactor), CLUTTER_GST_PLAYER (app->player)); + app->vactor = g_object_new (CLUTTER_TYPE_ACTOR, + "width", clutter_actor_get_width (stage), + "height", clutter_actor_get_height (stage), + "content", g_object_new (CLUTTER_GST_TYPE_ASPECTRATIO, + "player", app->player, + NULL), + NULL); if (app->vactor == NULL) g_error("failed to create vactor"); diff --git a/examples/video-wall.js b/examples/video-wall.js index adb39a4..151f11c 100644 --- a/examples/video-wall.js +++ b/examples/video-wall.js @@ -45,7 +45,7 @@ stage.set_background_color(new Clutter.Color({ red: 0, stage.connect('destroy', Lang.bind(this, function() { Clutter.main_quit(); })); -player = new ClutterGst.Playback(); +let player = new ClutterGst.Playback(); player.set_filename(ARGV[0]); player.set_audio_volume(0); player.set_progress(0.20); @@ -136,11 +136,13 @@ for (let i = 0; i < ROWS; i++) { y1: i / ROWS, y2: (i + 1) / ROWS, }) - let subActor = new ClutterGst.Crop({ width: 200, - height: 200, - player: player, - input_region: input, - }); + let subActor = new Clutter.Actor({ + width: 200, + height: 200, + content: new ClutterGst.Crop({ player: player, + input_region: input, + }), + }); let actor = new Clutter.Actor(); actor.add_child(subActor); -- cgit v1.2.1