mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-03 01:02:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
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
This commit is contained in:
Stefan Kost 2005-12-30 15:28:44 +00:00
parent 603daf45ac
commit cda24bb930
8 changed files with 67 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -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),

25
configure.ac
View file

@ -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

3
gst/level/Makefile.am
View file

@ -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)

7
tests/Makefile.am
View file

@ -4,8 +4,7 @@ else
SUBDIRS_CHECK =
endif
SUBDIRS = \
$(SUBDIRS_CHECK)
SUBDIRS = $(SUBDIRS_CHECK) examples
DIST_SUBDIRS = check examples
DIST_SUBDIRS = \
check

4
tests/examples/level/Makefile.am Normal file
View file

@ -0,0 +1,4 @@
noinst_PROGRAMS = level-example
level_example_CFLAGS = $(GST_CFLAGS)
level_example_LDADD = $(GST_LIBS)

20
gst/level/level-example.c → tests/examples/level/level-example.c
View file

@ -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>

2
tests/old/examples/level/demo.c
View file

@ -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;
}

2
tests/old/examples/level/plot.c
View file

@ -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;
}