diff options
author | Lionel Landwerlin <llandwerlin@gmail.com> | 2013-07-22 16:32:06 +0100 |
---|---|---|
committer | Lionel Landwerlin <llandwerlin@gmail.com> | 2013-07-22 16:32:06 +0100 |
commit | 2df8981679d3226489e705726adf7f1572229ffd (patch) | |
tree | 81535abc6094166c9c47826e2abd1ce03e2d6701 | |
parent | f9225bea8ad45624e57a3144d37ddd842510014a (diff) | |
download | clutter-gst-2df8981679d3226489e705726adf7f1572229ffd.tar.gz |
fix compilation warnings all over the place
-rw-r--r-- | clutter-gst/clutter-gst-aspectratio.c | 3 | ||||
-rw-r--r-- | clutter-gst/clutter-gst-auto-video-sink.c | 2 | ||||
-rw-r--r-- | clutter-gst/clutter-gst-camera.c | 1 | ||||
-rw-r--r-- | clutter-gst/clutter-gst-content.c | 2 | ||||
-rw-r--r-- | clutter-gst/clutter-gst-crop.c | 3 | ||||
-rw-r--r-- | examples/video-sink-navigation.c | 3 | ||||
-rw-r--r-- | examples/video-sink.c | 2 |
7 files changed, 10 insertions, 6 deletions
diff --git a/clutter-gst/clutter-gst-aspectratio.c b/clutter-gst/clutter-gst-aspectratio.c index aca44f0..b2363be 100644 --- a/clutter-gst/clutter-gst-aspectratio.c +++ b/clutter-gst/clutter-gst-aspectratio.c @@ -147,6 +147,9 @@ clutter_gst_aspectratio_paint_content (ClutterContent *content, clutter_actor_get_background_color (actor, &color); color.alpha = paint_opacity; + node = clutter_color_node_new (&color); + clutter_paint_node_set_name (node, "BlankVideoFrame"); + clutter_paint_node_add_rectangle_custom (node, content_box.x1, content_box.y1, content_box.x2, content_box.y2); diff --git a/clutter-gst/clutter-gst-auto-video-sink.c b/clutter-gst/clutter-gst-auto-video-sink.c index c7c1cd2..a3137f1 100644 --- a/clutter-gst/clutter-gst-auto-video-sink.c +++ b/clutter-gst/clutter-gst-auto-video-sink.c @@ -147,8 +147,6 @@ clutter_gst_auto_video_sink_reset (ClutterGstAutoVideoSink *sink) gst_object_unref (targetpad); } -static GstStaticCaps raw_caps = GST_STATIC_CAPS ("video/x-raw"); - static void clutter_gst_auto_video_sink_init (ClutterGstAutoVideoSink *sink) { diff --git a/clutter-gst/clutter-gst-camera.c b/clutter-gst/clutter-gst-camera.c index a5736db..0d5ddf5 100644 --- a/clutter-gst/clutter-gst-camera.c +++ b/clutter-gst/clutter-gst-camera.c @@ -838,7 +838,6 @@ static gboolean setup_pipeline (ClutterGstCamera *self) { ClutterGstCameraPrivate *priv = self->priv; - CoglGstVideoSink *video_sink; if (!probe_camera_devices (self)) { diff --git a/clutter-gst/clutter-gst-content.c b/clutter-gst/clutter-gst-content.c index 9ea1d30..ce9cb19 100644 --- a/clutter-gst/clutter-gst-content.c +++ b/clutter-gst/clutter-gst-content.c @@ -409,8 +409,6 @@ clutter_gst_content_init (ClutterGstContent *self) ClutterContent * clutter_gst_content_new (void) { - CoglGstVideoSink *sink; - return g_object_new (CLUTTER_GST_TYPE_CONTENT, NULL); } diff --git a/clutter-gst/clutter-gst-crop.c b/clutter-gst/clutter-gst-crop.c index e3cf348..77b964c 100644 --- a/clutter-gst/clutter-gst-crop.c +++ b/clutter-gst/clutter-gst-crop.c @@ -113,6 +113,9 @@ clutter_gst_crop_paint_content (ClutterContent *content, clutter_actor_get_background_color (actor, &color); color.alpha = paint_opacity; + node = clutter_color_node_new (&color); + clutter_paint_node_set_name (node, "BlankVideoFrame"); + clutter_paint_node_add_rectangle_custom (node, content_box.x1, content_box.y1, content_box.x2, content_box.y2); diff --git a/examples/video-sink-navigation.c b/examples/video-sink-navigation.c index e4d3cc9..8dc5fdd 100644 --- a/examples/video-sink-navigation.c +++ b/examples/video-sink-navigation.c @@ -75,6 +75,9 @@ main (int argc, char *argv[]) test = gst_element_factory_make ("navigationtest", NULL); colorspace = gst_element_factory_make ("videoconvert", NULL); + sink = gst_element_factory_make ("clutterautovideosink", NULL); + g_object_set (sink, "content", clutter_actor_get_content (actor), NULL); + // g_object_set (src , "pattern", 10, NULL); gst_bin_add_many (GST_BIN (pipeline), src, filter, test, colorspace, sink, NULL); diff --git a/examples/video-sink.c b/examples/video-sink.c index 7389a4d..26a3651 100644 --- a/examples/video-sink.c +++ b/examples/video-sink.c @@ -114,7 +114,7 @@ main (int argc, char *argv[]) gst_bin_add_many (GST_BIN (bin), src, warp, NULL); gst_element_link_many (src, warp, NULL); - g_object_set (pipeline, "source", bin); + g_object_set (pipeline, "source", bin, NULL); clutter_gst_player_set_playing (CLUTTER_GST_PLAYER (player), TRUE); |