diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2008-02-08 10:09:33 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2008-02-08 10:09:33 +0000 |
| commit | 0e176540b5678db0b88d517138d42292290e4895 (patch) | |
| tree | 64df379b5ce7052941a9af0a3d7a3ee0b6676461 | |
| parent | 26a52d2733997ec5f09f10ba45cfefc3beffdd80 (diff) | |
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.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | gst/multifile/gstmultifilesrc.c | 2 | ||||
| -rw-r--r-- | tests/examples/equalizer/.gitignore | 1 | ||||
| -rw-r--r-- | tests/examples/equalizer/Makefile.am | 8 | ||||
| -rw-r--r-- | tests/examples/spectrum/.gitignore | 2 | ||||
| -rw-r--r-- | tests/examples/spectrum/Makefile.am | 12 |
6 files changed, 35 insertions, 1 deletions
@@ -1,3 +1,14 @@ +2008-02-08 Tim-Philipp Müller <tim at centricular dot net> + + * 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 <jan.schmidt@sun.com> * configure.ac: diff --git a/gst/multifile/gstmultifilesrc.c b/gst/multifile/gstmultifilesrc.c index 4a30a050..47cfad36 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 00000000..1549b67c --- /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 00000000..54c6dc58 --- /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 00000000..d1d65d58 --- /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 00000000..0fd2ef17 --- /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) + |