cleanup cheese-stage.c from unused codeHEADmaster

1 files changed, 6 insertions, 49 deletions

diff --git a/src/cheese-stage.c b/src/cheese-stage.c
index 14daa3c..196902f 100644
--- a/src/cheese-stage.c
+++ b/src/cheese-stage.c
@@ -62,42 +62,6 @@ create_window (GstBus * bus, GstMessage * message, gpointer data)
   return GST_BUS_DROP;
 }
 
-#if 0
-static gboolean
-on_enter_animate (ClutterActor *actor, ClutterEvent *event, gpointer data)
-{
-  ClutterAnimation *previous_animation;
-
-  previous_animation = clutter_actor_get_animation (actor);
-  if (previous_animation)
-    clutter_animation_completed (previous_animation);
-
-  clutter_actor_raise_top (actor);
-
-  clutter_actor_animate (actor, CLUTTER_LINEAR, 150,
-      "scale-x", 1.1,
-      "scale-y", 1.1,
-      NULL);
-  return TRUE;
-}
-
-static gboolean
-on_leave_animate (ClutterActor *actor, ClutterEvent *event, gpointer data)
-{
-  ClutterAnimation *previous_animation;
-
-  previous_animation = clutter_actor_get_animation (actor);
-  if (previous_animation)
-    clutter_animation_completed (previous_animation);
-
-  clutter_actor_animate (actor, CLUTTER_LINEAR, 500,
-      "scale-x", 1.0,
-      "scale-y", 1.0,
-      NULL);
-  return TRUE;
-}
-#endif
-
 static gboolean
 on_window_configure (GtkWidget *window, GdkEventConfigure *ev, ClutterActor *layout)
 {
@@ -129,7 +93,6 @@ on_button_animate (ClutterActor *actor, ClutterEvent *event, gpointer data)
   else {
 
   clutter_actor_reparent (actor, stage);
-//  clutter_actor_set_opacity (actor, 100);
 
   clutter_actor_animate (actor, CLUTTER_LINEAR, 250,
                          "width", pw,
@@ -201,7 +164,7 @@ main (int argc, char *argv[])
       "identity", W, H);
 */
   desc = g_strdup_printf ("videotestsrc ! "
-      "video/x-raw-rgb, width=%d, height=%d, framerate=10/1 ! ffmpegcolorspace ! identity", W, H);
+      "video/x-raw-rgb, width=%d, height=%d, framerate=15/1 ! ffmpegcolorspace ! identity", W, H);
 
   pipeline = GST_PIPELINE (gst_pipeline_new (NULL));
 
@@ -214,22 +177,18 @@ main (int argc, char *argv[])
   gst_bin_add_many (GST_BIN (pipeline), srcbin, tee, NULL);
 
   fx[0] = gst_parse_bin_from_description ("identity", TRUE, NULL);
-//  fx[1] = gst_parse_bin_from_description ("ffmpegcolorspace ! videobalance saturation=0 ! ffmpegcolorspace", TRUE, NULL);
   fx[1] = gst_parse_bin_from_description ("identity", TRUE, NULL);
-//  fx[2] = gst_parse_bin_from_description ("ffmpegcolorspace ! videoflip method=4 ! ffmpegcolorspace", TRUE, NULL);
   fx[2] = gst_parse_bin_from_description ("identity", TRUE, NULL);
-  fx[3] = gst_parse_bin_from_description ("dicetv square-bits=3", TRUE, NULL);
-  fx[4] = gst_parse_bin_from_description ("warptv", TRUE, NULL);
-  fx[5] = gst_parse_bin_from_description ("shagadelictv", TRUE, NULL);
-  fx[6] = gst_parse_bin_from_description ("vertigotv", TRUE, NULL);
-//  fx[7] = gst_parse_bin_from_description ("ffmpegcolorspace ! videobalance saturation=1.5 hue=-0.5 ! ffmpegcolorspace", TRUE, NULL);
+  fx[3] = gst_parse_bin_from_description ("dicetv square-bits=3 ! ffmpegcolorspace", TRUE, NULL);
+  fx[4] = gst_parse_bin_from_description ("warptv ! ffmpegcolorspace", TRUE, NULL);
+  fx[5] = gst_parse_bin_from_description ("shagadelictv ! ffmpegcolorspace", TRUE, NULL);
+  fx[6] = gst_parse_bin_from_description ("vertigotv ! ffmpegcolorspace", TRUE, NULL);
   fx[7] = gst_parse_bin_from_description ("identity", TRUE, NULL);
-//  fx[8] = gst_parse_bin_from_description ("ffmpegcolorspace ! videoflip method=5 ! ffmpegcolorspace", TRUE, NULL);
   fx[8] = gst_parse_bin_from_description ("identity", TRUE, NULL);
 
   for (i = 0; i < N_ACTORS; i++) {
     queue[i] = gst_element_factory_make ("queue", NULL);
-    sink[i] = gst_element_factory_make ("ximagesink", NULL);
+    sink[i] = gst_element_factory_make ("glimagesink", NULL);
     gst_bin_add_many (GST_BIN (pipeline), queue[i], fx[i], sink[i], NULL);
   }
 
@@ -241,8 +200,6 @@ main (int argc, char *argv[])
     clutter_actor_set_reactive (actor[i], TRUE);
     g_signal_connect (actor[i], "button-press-event", G_CALLBACK (on_button_animate), layout);
   }
-//    g_signal_connect (actor[i], "enter-event", G_CALLBACK (on_enter_animate), NULL);
-//    g_signal_connect (actor[i], "leave-event", G_CALLBACK (on_leave_animate), NULL);
 
   gst_element_link_many (srcbin, tee, NULL);