From 0e176540b5678db0b88d517138d42292290e4895 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 8 Feb 2008 10:09:33 +0000 Subject: [PATCH] gst/multifile/gstmultifilesrc.c: Need to use gsize here for the size, fixes compiler warning. Original commit message from CVS: * gst/multifile/gstmultifilesrc.c: (gst_multi_file_src_create): Need to use gsize here for the size, fixes compiler warning. * tests/examples/equalizer/.cvsignore: * tests/examples/equalizer/Makefile.am: * tests/examples/spectrum/.cvsignore: * tests/examples/spectrum/Makefile.am: Add missing files to fix the build. --- ChangeLog | 11 +++++++++++ gst/multifile/gstmultifilesrc.c | 2 +- tests/examples/equalizer/.gitignore | 1 + tests/examples/equalizer/Makefile.am | 8 ++++++++ tests/examples/spectrum/.gitignore | 2 ++ tests/examples/spectrum/Makefile.am | 12 ++++++++++++ 6 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 tests/examples/equalizer/.gitignore create mode 100644 tests/examples/equalizer/Makefile.am create mode 100644 tests/examples/spectrum/.gitignore create mode 100644 tests/examples/spectrum/Makefile.am diff --git a/ChangeLog b/ChangeLog index 05d98e5..55a4fea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2008-02-08 Tim-Philipp Müller + + * gst/multifile/gstmultifilesrc.c: (gst_multi_file_src_create): + Need to use gsize here for the size, fixes compiler warning. + + * tests/examples/equalizer/.cvsignore: + * tests/examples/equalizer/Makefile.am: + * tests/examples/spectrum/.cvsignore: + * tests/examples/spectrum/Makefile.am: + Add missing files to fix the build. + 2008-02-08 Jan Schmidt * configure.ac: diff --git a/gst/multifile/gstmultifilesrc.c b/gst/multifile/gstmultifilesrc.c index 4a30a05..47cfad3 100644 --- a/gst/multifile/gstmultifilesrc.c +++ b/gst/multifile/gstmultifilesrc.c @@ -266,7 +266,7 @@ static GstFlowReturn gst_multi_file_src_create (GstPushSrc * src, GstBuffer ** buffer) { GstMultiFileSrc *multifilesrc; - guint size; + gsize size; gchar *data; gchar *filename; GstBuffer *buf; diff --git a/tests/examples/equalizer/.gitignore b/tests/examples/equalizer/.gitignore new file mode 100644 index 0000000..1549b67 --- /dev/null +++ b/tests/examples/equalizer/.gitignore @@ -0,0 +1 @@ +demo diff --git a/tests/examples/equalizer/Makefile.am b/tests/examples/equalizer/Makefile.am new file mode 100644 index 0000000..54c6dc5 --- /dev/null +++ b/tests/examples/equalizer/Makefile.am @@ -0,0 +1,8 @@ +if HAVE_GTK +noinst_PROGRAMS = demo +endif + +demo_SOURCES = demo.c +demo_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS) +demo_LDFLAGS = $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS) + diff --git a/tests/examples/spectrum/.gitignore b/tests/examples/spectrum/.gitignore new file mode 100644 index 0000000..d1d65d5 --- /dev/null +++ b/tests/examples/spectrum/.gitignore @@ -0,0 +1,2 @@ +demo-audiotest +demo-osssrc diff --git a/tests/examples/spectrum/Makefile.am b/tests/examples/spectrum/Makefile.am new file mode 100644 index 0000000..0fd2ef1 --- /dev/null +++ b/tests/examples/spectrum/Makefile.am @@ -0,0 +1,12 @@ +if HAVE_GTK +noinst_PROGRAMS = demo-osssrc demo-audiotest +endif + +demo_osssrc_SOURCES = demo-osssrc.c +demo_osssrc_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS) +demo_osssrc_LDFLAGS = $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS) + +demo_audiotest_SOURCES = demo-audiotest.c +demo_audiotest_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS) +demo_audiotest_LDFLAGS = $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS) + -- 2.7.4