mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-27 23:44:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

[298/906] Revert "Fix indention"

Browse source 
This reverts commit 96e4ab18c2cf9876f6c031b9aba6282d0bd45a93.

You should have asked first.  And you would have been told "no",
because it causes people on development branches to do a huge
amount of extra work.
This commit is contained in:
David Schleef 2009-02-10 21:57:31 -08:00 committed by Matthew Waters
parent 4525015dc6
commit ea43a17480
2 changed files with 52 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tests/examples/gtk/fxtest/fxtest.c
View file

@ -20,8 +20,7 @@ expose_cb (GtkWidget * widget, GdkEventExpose * event, gpointer data)
GST_X_OVERLAY (gst_bin_get_by_interface (GST_BIN (data),
GST_TYPE_X_OVERLAY));
#ifdef WIN32
gst_x_overlay_set_xwindow_id (overlay,
(gulong) GDK_WINDOW_HWND (widget->window));
gst_x_overlay_set_xwindow_id (overlay, (gulong)GDK_WINDOW_HWND(widget->window));
#else
gst_x_overlay_set_xwindow_id (overlay, GDK_WINDOW_XWINDOW (widget->window));
#endif
@ -113,8 +112,7 @@ main (gint argc, gchar * argv[])
GOptionContext *context;
GOptionEntry options[] = {
{ "source-bin", 's', 0, G_OPTION_ARG_STRING_ARRAY, &source_desc_array,
"Use a custom source bin description (gst-launch style)", NULL}
,
"Use a custom source bin description (gst-launch style)", NULL },
{ NULL }
};
@ -135,13 +133,10 @@ main (gint argc, gchar * argv[])
g_strfreev (source_desc_array);
}
if (source_desc == NULL) {
source_desc =
g_strdup
("videotestsrc ! video/x-raw-rgb, width=352, height=288 ! identity");
source_desc = g_strdup ("videotestsrc ! video/x-raw-rgb, width=352, height=288 ! identity");
}
sourcebin =
gst_parse_bin_from_description (g_strdup (source_desc), TRUE, &error);
sourcebin = gst_parse_bin_from_description (g_strdup (source_desc), TRUE, &error);
g_free (source_desc);
if (error) {
g_print ("Error while parsing source bin description: %s\n",

28
tests/examples/gtk/fxtest/pixbufdrop.c
View file

@ -113,7 +113,8 @@ set_location_delayed (gpointer data)
static void
on_drag_data_received (GtkWidget * widget,
GdkDragContext * context, int x, int y,
GtkSelectionData * seldata, guint inf, guint time, gpointer data)
GtkSelectionData * seldata, guint inf, guint time,
gpointer data)
{
GdkPixbufFormat *format;
SourceData *userdata = g_new0 (SourceData, 1);
@ -131,9 +132,9 @@ on_drag_data_received (GtkWidget * widget,
if (delay > 0) {
g_print ("%d\n", delay);
g_timeout_add_seconds (1, set_location_delayed, userdata);
} else
g_object_set (G_OBJECT (userdata->data), userdata->nick, userdata->value,
NULL);
}
else
g_object_set (G_OBJECT (userdata->data), userdata->nick, userdata->value, NULL);
g_free (filename);
}
@ -160,15 +161,9 @@ main (gint argc, gchar * argv[])
GOptionContext *context;
GOptionEntry options[] = {
{ "source-bin", 's', 0, G_OPTION_ARG_STRING_ARRAY, &source_desc_array,
"Use a custom source bin description (gst-launch style)", NULL}
,
{"method", 'm', 0, G_OPTION_ARG_INT, &method,
"1 for gstdifferencematte, 2 for gstpixbufoverlay", "M"}
,
{"delay", 'd', 0, G_OPTION_ARG_INT, &delay,
"Wait N seconds before to send the image to gstreamer (useful with differencematte)",
"N"}
,
"Use a custom source bin description (gst-launch style)", NULL },
{ "method", 'm', 0, G_OPTION_ARG_INT, &method, "1 for gstdifferencematte, 2 for gstpixbufoverlay", "M" },
{ "delay", 'd', 0, G_OPTION_ARG_INT, &delay, "Wait N seconds before to send the image to gstreamer (useful with differencematte)", "N" },
{ NULL }
};
@ -189,13 +184,10 @@ main (gint argc, gchar * argv[])
g_strfreev (source_desc_array);
}
if (source_desc == NULL) {
source_desc =
g_strdup
("videotestsrc ! video/x-raw-rgb, width=352, height=288 ! identity");
source_desc = g_strdup ("videotestsrc ! video/x-raw-rgb, width=352, height=288 ! identity");
}
sourcebin =
gst_parse_bin_from_description (g_strdup (source_desc), TRUE, &error);
sourcebin = gst_parse_bin_from_description (g_strdup (source_desc), TRUE, &error);
g_free (source_desc);
if (error) {
g_print ("Error while parsing source bin description: %s\n",