From 161d53e6dac4d17aa6d7e350ef785a0bc8dea39e Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomas@apestaart.org>
Date: Fri, 28 Apr 2006 19:23:20 +0000
Subject: moved ximagesrc to good

Original commit message from CVS:
moved ximagesrc to good
---
 tests/Makefile.am            | 16 +++-------
 tests/icles/.gitignore       |  1 -
 tests/icles/Makefile.am      | 12 --------
 tests/icles/ximagesrc-test.c | 71 --------------------------------------------
 4 files changed, 4 insertions(+), 96 deletions(-)
 delete mode 100644 tests/icles/ximagesrc-test.c

(limited to 'tests')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index aababe77..6ba48806 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,16 +4,8 @@ else
 SUBDIRS_CHECK =
 endif
 
-if USE_X
-SUBDIRS_ICLES = icles
-else
-SUBDIRS_ICLES =
-endif
-
-SUBDIRS = 			\
-	$(SUBDIRS_CHECK)	\
-	$(SUBDIRS_ICLES)
+SUBDIRS = icles			\
+	$(SUBDIRS_CHECK)
 
-DIST_SUBDIRS = 			\
-	check			\
-	icles
+DIST_SUBDIRS = icles		\
+	check
diff --git a/tests/icles/.gitignore b/tests/icles/.gitignore
index bda5abbb..e69de29b 100644
--- a/tests/icles/.gitignore
+++ b/tests/icles/.gitignore
@@ -1 +0,0 @@
-ximagesrc-test
diff --git a/tests/icles/Makefile.am b/tests/icles/Makefile.am
index 693a6e41..e69de29b 100644
--- a/tests/icles/Makefile.am
+++ b/tests/icles/Makefile.am
@@ -1,12 +0,0 @@
-if USE_X
-X_TESTS = ximagesrc-test
-
-ximagesrc_test_SOURCES = ximagesrc-test.c
-ximagesrc_test_CFLAGS = $(GST_CFLAGS)
-ximagesrc_test_LDFLAGS = $(GST_LIBS)
-else
-X_TESTS =
-endif
-
-noinst_PROGRAMS = $(X_TESTS)
-
diff --git a/tests/icles/ximagesrc-test.c b/tests/icles/ximagesrc-test.c
deleted file mode 100644
index 7af0e68b..00000000
--- a/tests/icles/ximagesrc-test.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* GStreamer
- * Copyright (C) <2006> Zaheer Abbas Merali <zaheerabbas at merali dot org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gst/gst.h>
-
-static GMainLoop *loop;
-
-static gboolean
-terminate_playback (GstElement * pipeline)
-{
-  g_print ("Terminating playback\n");
-  g_main_loop_quit (loop);
-  return FALSE;
-}
-
-int
-main (int argc, char **argv)
-{
-  GstElement *pipeline;
-  GstBus *bus;
-  GstState state, pending;
-  GError *error = NULL;
-
-  gst_init (&argc, &argv);
-
-  pipeline = gst_parse_launch ("ximagesrc ! fakesink", &error);
-  if (error) {
-    g_print ("Error while parsing pipeline description: %s\n", error->message);
-    return -1;
-  }
-
-  loop = g_main_loop_new (NULL, FALSE);
-
-  bus = gst_pipeline_get_bus (GST_PIPELINE (pipeline));
-
-  gst_element_set_state (pipeline, GST_STATE_PLAYING);
-
-  /* lets check it gets to PLAYING */
-  g_assert (gst_element_get_state (pipeline, &state, &pending,
-          GST_CLOCK_TIME_NONE) != GST_STATE_CHANGE_FAILURE);
-  g_assert (state == GST_STATE_PLAYING || pending == GST_STATE_PLAYING);
-
-  /* We want to get out after 5 seconds */
-  g_timeout_add (5000, (GSourceFunc) terminate_playback, pipeline);
-
-  g_main_loop_run (loop);
-
-  g_main_loop_unref (loop);
-
-  return 0;
-}
-- 
cgit v1.2.1