Commit b194c942 authored by Tim-Philipp Müller's avatar Tim-Philipp Müller
Browse files

Make sure our checks and the videotestsrc plugin link against the local...

Make sure our checks and the videotestsrc plugin link against the local uninstalled gst libs and not any installed gs...

Original commit message from CVS:
* gst/videotestsrc/Makefile.am:
* tests/check/Makefile.am:
Make sure our checks and the videotestsrc plugin link against the
local uninstalled gst libs and not any installed gst libs that
might happen to exist as well.
* tests/check/elements/adder.c: (message_received),
(test_event_message_received), (test_play_twice_message_received):
* tests/check/elements/ffmpegcolorspace.c: (GST_START_TEST):
Fix compiler warnings when compiling against core with disabled
debugging system.
parent 4ac9b64f
2006-11-16 Tim-Philipp Müller <tim at centricular dot net>
* gst/videotestsrc/Makefile.am:
* tests/check/Makefile.am:
Make sure our checks and the videotestsrc plugin link against the
local uninstalled gst libs and not any installed gst libs that
might happen to exist as well.
* tests/check/elements/adder.c: (message_received),
(test_event_message_received), (test_play_twice_message_received):
* tests/check/elements/ffmpegcolorspace.c: (GST_START_TEST):
Fix compiler warnings when compiling against core with disabled
debugging system.
2006-11-16 Michael Smith <msmith@fluendo.com>
 
* gst/audiorate/gstaudiorate.c: (gst_audio_rate_reset),
......@@ -6,6 +6,6 @@ libgstvideotestsrc_la_SOURCES = \
libgstvideotestsrc_la_CFLAGS = $(GST_CFLAGS) $(LIBOIL_CFLAGS)
libgstvideotestsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstvideotestsrc_la_LIBADD = $(GST_LIBS) $(LIBOIL_LIBS) $(GST_BASE_LIBS)
libgstvideotestsrc_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(LIBOIL_LIBS)
noinst_HEADERS = gstvideotestsrc.h videotestsrc.h
......@@ -92,13 +92,24 @@ VALGRIND_TESTS_DISABLE = $(VALGRIND_TO_FIX)
SUPPRESSIONS = $(top_srcdir)/common/gst.supp $(srcdir)/gst-plugins-base.supp
libs_audio_CFLAGS = \
$(GST_BASE_CFLAGS) \
$(AM_CFLAGS)
libs_audio_LDADD = \
$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \
$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \
$(GST_BASE_LIBS) \
$(LDADD)
libs_cddabasesrc_CFLAGS = \
$(GST_BASE_CFLAGS) \
$(AM_CFLAGS)
libs_cddabasesrc_LDADD = \
$(top_builddir)/gst-libs/gst/cdda/libgstcdda-@GST_MAJORMINOR@.la \
$(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la \
$(GST_BASE_LIBS) \
$(LDADD)
libs_tag_LDADD = \
......@@ -108,8 +119,14 @@ elements_alsa_LDADD = \
$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \
$(LDADD)
elements_audioconvert_CFLAGS = \
$(GST_BASE_CFLAGS) \
$(AM_CFLAGS)
elements_audioconvert_LDADD = \
$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \
$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \
$(GST_BASE_LIBS) \
$(LDADD)
elements_audiorate_LDADD = $(LDADD)
......@@ -140,15 +157,26 @@ elements_vorbistag_CFLAGS = \
$(VORBIS_CFLAGS) \
$(CFLAGS) $(AM_CFLAGS)
libs_video_CFLAGS = \
$(GST_BASE_CFLAGS) \
$(AM_CFLAGS)
libs_video_LDADD = \
$(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la \
$(GST_BASE_LIBS) \
$(LDADD)
pipelines_oggmux_LDADD = $(LDADD) $(OGG_LIBS)
pipelines_oggmux_CFLAGS = $(AM_CFLAGS) $(OGG_CFLAGS)
pipelines_simple_launch_lines_CFLAGS = \
$(GST_BASE_CFLAGS) \
$(AM_CFLAGS)
pipelines_simple_launch_lines_LDADD = \
$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \
$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \
$(GST_BASE_LIBS) \
$(LDADD)
EXTRA_DIST = gst-plugins-base.supp
......@@ -37,11 +37,8 @@ static GMainLoop *main_loop;
static void
message_received (GstBus * bus, GstMessage * message, GstPipeline * bin)
{
GstObject *object = GST_MESSAGE_SRC (message);
GST_INFO ("bus message from \"%s\" (%s): ",
GST_STR_NULL (GST_ELEMENT_NAME (object)),
gst_message_type_get_name (GST_MESSAGE_TYPE (message)));
GST_INFO ("bus message from \"%" GST_PTR_FORMAT "\": %" GST_PTR_FORMAT,
GST_MESSAGE_SRC (message), message);
switch (message->type) {
case GST_MESSAGE_EOS:
......@@ -71,11 +68,8 @@ static void
test_event_message_received (GstBus * bus, GstMessage * message,
GstPipeline * bin)
{
GstObject *object = GST_MESSAGE_SRC (message);
GST_INFO ("bus message from \"%s\" (%s): ",
GST_STR_NULL (GST_ELEMENT_NAME (object)),
gst_message_type_get_name (GST_MESSAGE_TYPE (message)));
GST_INFO ("bus message from \"%" GST_PTR_FORMAT "\": %" GST_PTR_FORMAT,
GST_MESSAGE_SRC (message), message);
switch (message->type) {
case GST_MESSAGE_SEGMENT_DONE:
......@@ -176,12 +170,10 @@ static void
test_play_twice_message_received (GstBus * bus, GstMessage * message,
GstPipeline * bin)
{
GstObject *object = GST_MESSAGE_SRC (message);
gboolean res;
GST_INFO ("bus message from \"%s\" (%s): ",
GST_STR_NULL (GST_ELEMENT_NAME (object)),
gst_message_type_get_name (GST_MESSAGE_TYPE (message)));
GST_INFO ("bus message from \"%" GST_PTR_FORMAT "\": %" GST_PTR_FORMAT,
GST_MESSAGE_SRC (message), message);
switch (message->type) {
case GST_MESSAGE_SEGMENT_DONE:
......
......@@ -300,8 +300,6 @@ GST_START_TEST (test_rgb_to_rgb)
for (l = conversions; l != NULL; l = l->next) {
RGBConversion *conv = (RGBConversion *) l->data;
RGBFormat *from = &conv->from_fmt;
RGBFormat *to = &conv->to_fmt;
/* does videotestsrc support the from_caps? */
if (!gst_caps_is_subset (conv->from_caps, template_caps)) {
......@@ -313,6 +311,12 @@ GST_START_TEST (test_rgb_to_rgb)
/* caps are supported, let's run some tests then ... */
for (p = 0; p < G_N_ELEMENTS (test_patterns); ++p) {
GstStateChangeReturn state_ret;
RGBFormat *from = &conv->from_fmt;
RGBFormat *to = &conv->to_fmt;
/* trick compiler into thinking from is used, might throw warning
* otherwise if the debugging system is disabled */
fail_unless (from != NULL);
gst_element_set_state (pipeline, GST_STATE_NULL);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment