moved level-example to tests/examples/level-example

Original commit message from CVS:
* configure.ac:
* gst/level/Makefile.am:
* gst/level/level-example.c:
* tests/Makefile.am:
* tests/examples/level/Makefile.am:
* tests/examples/level/level-example.c: (message_handler), (main):
moved level-example to tests/examples/level-example
* tests/old/examples/level/demo.c: (main):
* tests/old/examples/level/plot.c: (main):
some initial fixes

diff --git a/ChangeLog b/ChangeLog
index 551bfeb..03ed028 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2005-12-30  Stefan Kost  <ensonic@users.sf.net>
+
+       * configure.ac:
+       * gst/level/Makefile.am:
+       * gst/level/level-example.c:
+       * tests/Makefile.am:
+       * tests/examples/level/Makefile.am:
+       * tests/examples/level/level-example.c: (message_handler), (main):
+          moved level-example to tests/examples/level-example
+       * tests/old/examples/level/demo.c: (main):
+       * tests/old/examples/level/plot.c: (main):
+          some initial fixes
+
 2005-12-29  Michael Smith  <msmith@fluendo.com>
 
        * gst/udp/gstmultiudpsink.c: (gst_multiudpsink_render),

diff --git a/configure.ac b/configure.ac
index 0f47741..39d9ba5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -214,6 +214,28 @@ dnl check for "check", unit testing library/header
 AM_PATH_CHECK(0.9.2, HAVE_CHECK=yes, HAVE_CHECK=no)
 AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_CHECK" = "xyes")
 
+dnl GTK is optional and used in examples
+HAVE_GTK=NO
+PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.2.0, HAVE_GTK_22=yes, HAVE_GTK_22=no)
+if test "x$HAVE_GTK_22" = "xyes"; then
+  HAVE_GTK=yes
+  GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
+  AC_SUBST(GTK_VERSION)
+  GTK_PREFIX=`$PKG_CONFIG --variable=prefix gdk-pixbuf-2.0`
+  AC_SUBST(GTK_BASE_DIR)
+else
+  PKG_CHECK_MODULES(GTK2, gtk+-2.0, HAVE_GTK_20=yes, HAVE_GTK_20=no)
+fi
+if test "x$HAVE_GTK_20" = "xyes"; then
+  HAVE_GTK=yes
+fi
+GTK_CFLAGS=$GTK2_CFLAGS
+GTK_LIBS=$GTK2_LIBS
+AC_SUBST(GTK_LIBS)
+AC_SUBST(GTK_CFLAGS)
+AC_SUBST(HAVE_GTK)
+AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes")
+
 dnl should we install schemas ?
 translit(dnm, m, l) AM_CONDITIONAL(USE_GCONFTOOL, true)
 GST_CHECK_FEATURE(GCONFTOOL, [GConf schemas], , [
@@ -551,6 +573,7 @@ gst/matroska/Makefile
 gst/multipart/Makefile
 gst/rtp/Makefile
 gst/rtsp/Makefile
+gst/smoothwave/Makefile
 gst/smpte/Makefile
 gst/udp/Makefile
 gst/videobox/Makefile
@@ -583,6 +606,8 @@ docs/plugins/Makefile
 docs/version.entities
 tests/Makefile
 tests/check/Makefile
+tests/examples/Makefile
+tests/examples/level/Makefile
 common/Makefile
 common/m4/Makefile
 m4/Makefile

diff --git a/gst/level/Makefile.am b/gst/level/Makefile.am
index ab5b80b..01e94cf 100644 (file)
--- a/gst/level/Makefile.am
+++ b/gst/level/Makefile.am
@@ -7,6 +7,3 @@ libgstlevel_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = gstlevel.h
 
-noinst_PROGRAMS = level-example
-level_example_CFLAGS = $(GST_CFLAGS)
-level_example_LDADD = $(GST_LIBS)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index ce326cf..acdd17e 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,8 +4,7 @@ else
 SUBDIRS_CHECK =
 endif
 
-SUBDIRS =                      \
-       $(SUBDIRS_CHECK)
+SUBDIRS = $(SUBDIRS_CHECK) examples
+
+DIST_SUBDIRS = check examples
 
-DIST_SUBDIRS =                         \
-       check

diff --git a/tests/examples/level/Makefile.am b/tests/examples/level/Makefile.am
new file mode 100644 (file)
index 0000000..5185538
--- /dev/null
+++ b/tests/examples/level/Makefile.am
@@ -0,0 +1,4 @@
+noinst_PROGRAMS = level-example
+level_example_CFLAGS = $(GST_CFLAGS)
+level_example_LDADD = $(GST_LIBS)
+

diff --git a/gst/level/level-example.c b/tests/examples/level/level-example.c
similarity index 78%
rename from gst/level/level-example.c
rename to tests/examples/level/level-example.c
index 96c0cbd..bab167f 100644 (file)
--- a/gst/level/level-example.c
+++ b/tests/examples/level/level-example.c
@@ -1,3 +1,23 @@
+/* GStreamer
+ * Copyright (C) 2000,2001,2002,2003,2005
+ *           Thomas Vander Stichele <thomas at apestaart 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.
+ */
+
 #include <string.h>
 #include <math.h>
 

diff --git a/tests/old/examples/level/demo.c b/tests/old/examples/level/demo.c
index 502f50f..366b54c 100644 (file)
--- a/tests/old/examples/level/demo.c
+++ b/tests/old/examples/level/demo.c
@@ -125,7 +125,7 @@ main (int argc, char *argv[])
   if (error) {
     g_print ("pipeline could not be constructed: %s\n", error->message);
     g_print ("Please give a complete pipeline  with a 'level' element.\n");
-    g_print ("Example: sinesrc ! level ! %s\n", DEFAULT_AUDIOSINK);
+    g_print ("Example: audiotestsrc ! level ! %s\n", DEFAULT_AUDIOSINK);
     g_error_free (error);
     return 1;
   }

diff --git a/tests/old/examples/level/plot.c b/tests/old/examples/level/plot.c
index 6df0106..51ad2f7 100644 (file)
--- a/tests/old/examples/level/plot.c
+++ b/tests/old/examples/level/plot.c
@@ -98,7 +98,7 @@ main (int argc, char *argv[])
   if (error) {
     g_print ("pipeline could not be constructed: %s\n", error->message);
     g_print ("Please give a complete pipeline  with a 'level' element.\n");
-    g_print ("Example: sinesrc ! level ! %s\n", DEFAULT_AUDIOSINK);
+    g_print ("Example: audiotestsrc ! level ! %s\n", DEFAULT_AUDIOSINK);
     g_error_free (error);
     return 1;
   }