From 754b22d7ee9a69631470daecb84792fa9af043eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 23 Sep 2011 21:18:47 +0100 Subject: [PATCH] libs: remove unused floatcast header-only library There's no code whatsoever that uses these macros. If anyone ever feels the need to resurrect them, we should add them to gstutils.h in core or libgstaudio or so. --- Android.mk | 2 - configure.ac | 5 +- docs/libs/gst-plugins-base-libs-docs.sgml | 10 -- docs/libs/gst-plugins-base-libs-sections.txt | 12 --- gst-libs/gst/Makefile.am | 3 +- gst-libs/gst/floatcast/Makefile.am | 2 - gst-libs/gst/floatcast/floatcast.h | 102 ------------------ gst-plugins-base.spec.in | 2 - gst/audioconvert/audioconvert.c | 1 - pkgconfig/Makefile.am | 3 - .../gstreamer-floatcast-uninstalled.pc.in | 14 --- pkgconfig/gstreamer-floatcast.pc.in | 16 --- tests/check/elements/audioconvert.c | 1 - tests/check/libs/gstlibscpp.cc | 2 - 14 files changed, 2 insertions(+), 173 deletions(-) delete mode 100644 gst-libs/gst/floatcast/Makefile.am delete mode 100644 gst-libs/gst/floatcast/floatcast.h delete mode 100644 pkgconfig/gstreamer-floatcast-uninstalled.pc.in delete mode 100644 pkgconfig/gstreamer-floatcast.pc.in diff --git a/Android.mk b/Android.mk index d6ca579a41..4bfbe75a43 100644 --- a/Android.mk +++ b/Android.mk @@ -8,7 +8,6 @@ GST_PLUGINS_BASE_BUILT_SOURCES := \ pkgconfig/gstreamer-audio-0.10.pc \ pkgconfig/gstreamer-cdda-0.10.pc \ pkgconfig/gstreamer-fft-0.10.pc \ - pkgconfig/gstreamer-floatcast-0.10.pc \ pkgconfig/gstreamer-interfaces-0.10.pc \ pkgconfig/gstreamer-netbuffer-0.10.pc \ pkgconfig/gstreamer-pbutils-0.10.pc \ @@ -23,7 +22,6 @@ GST_PLUGINS_BASE_BUILT_SOURCES := \ pkgconfig/gstreamer-audio-0.10-uninstalled.pc \ pkgconfig/gstreamer-cdda-0.10-uninstalled.pc \ pkgconfig/gstreamer-fft-0.10-uninstalled.pc \ - pkgconfig/gstreamer-floatcast-0.10-uninstalled.pc \ pkgconfig/gstreamer-interfaces-0.10-uninstalled.pc \ pkgconfig/gstreamer-netbuffer-0.10-uninstalled.pc \ pkgconfig/gstreamer-pbutils-0.10-uninstalled.pc \ diff --git a/configure.ac b/configure.ac index 939345307a..d363b6afb0 100644 --- a/configure.ac +++ b/configure.ac @@ -237,7 +237,7 @@ dnl check for fseeko() AC_FUNC_FSEEKO dnl Check for fast float to int casting as defined in C99 -dnl used in gst-libs/gst/floatcast/floatcast.h +dnl used to be used in gst-libs/gst/floatcast/floatcast.h (FIXME: still needed?) save_libs=$LIBS LIBS="$LIBS $LIBM" AC_C99_FUNC_LRINT @@ -901,7 +901,6 @@ gst-libs/gst/audio/Makefile gst-libs/gst/app/Makefile gst-libs/gst/cdda/Makefile gst-libs/gst/fft/Makefile -gst-libs/gst/floatcast/Makefile gst-libs/gst/interfaces/Makefile gst-libs/gst/netbuffer/Makefile gst-libs/gst/riff/Makefile @@ -922,8 +921,6 @@ pkgconfig/gstreamer-cdda.pc pkgconfig/gstreamer-cdda-uninstalled.pc pkgconfig/gstreamer-fft.pc pkgconfig/gstreamer-fft-uninstalled.pc -pkgconfig/gstreamer-floatcast.pc -pkgconfig/gstreamer-floatcast-uninstalled.pc pkgconfig/gstreamer-interfaces.pc pkgconfig/gstreamer-interfaces-uninstalled.pc pkgconfig/gstreamer-netbuffer.pc diff --git a/docs/libs/gst-plugins-base-libs-docs.sgml b/docs/libs/gst-plugins-base-libs-docs.sgml index daa6f1e818..b4707673b5 100644 --- a/docs/libs/gst-plugins-base-libs-docs.sgml +++ b/docs/libs/gst-plugins-base-libs-docs.sgml @@ -86,16 +86,6 @@ - - FloatCast Library - - This library should be linked to by getting cflags and libs from - gstreamer-plugins-base-&GST_MAJORMINOR;.pc and adding - -lgstfloatcase-&GST_MAJORMINOR; to the library flags. - - - - Interfaces Library diff --git a/docs/libs/gst-plugins-base-libs-sections.txt b/docs/libs/gst-plugins-base-libs-sections.txt index b3839a32f5..fb1a18cf7a 100644 --- a/docs/libs/gst-plugins-base-libs-sections.txt +++ b/docs/libs/gst-plugins-base-libs-sections.txt @@ -577,18 +577,6 @@ KISS_FFT_F64_MALLOC KISS_FFT_F64_SIN -# floatcast - -
-gstfloatcast -gst/floatcast/floatcast.h -gst_cast_double -gst_cast_float - -inline -
- - # interfaces
diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am index a762528dbd..a3f13f17d0 100644 --- a/gst-libs/gst/Makefile.am +++ b/gst-libs/gst/Makefile.am @@ -7,7 +7,6 @@ SUBDIRS = \ tag \ cdda \ fft \ - floatcast \ netbuffer \ rtp \ sdp \ @@ -32,7 +31,7 @@ rtsp: sdp pbutils: video audio INDEPENDENT_SUBDIRS = \ - interfaces tag audio fft floatcast netbuffer rtp sdp video app + interfaces tag audio fft netbuffer rtp sdp video app .PHONY: independent-subdirs $(INDEPENDENT_SUBDIRS) diff --git a/gst-libs/gst/floatcast/Makefile.am b/gst-libs/gst/floatcast/Makefile.am deleted file mode 100644 index b18029c44e..0000000000 --- a/gst-libs/gst/floatcast/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -floatcastincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/floatcast -floatcastinclude_HEADERS = floatcast.h diff --git a/gst-libs/gst/floatcast/floatcast.h b/gst-libs/gst/floatcast/floatcast.h deleted file mode 100644 index 279af28225..0000000000 --- a/gst-libs/gst/floatcast/floatcast.h +++ /dev/null @@ -1,102 +0,0 @@ -/* GStreamer - * Copyright (C) <1999> Erik Walthinsen - * Library <2002> Steve Baker - * - * 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. - */ - -/** - * SECTION:gstfloatcast - * @short_description: Floating point platform independence macros - * - * The floatcast.h header file contains a couple of convenience macros for - * floating point numbers. - * - * If you include this header, your application or library must link against - * libm (for maths.h support). - * - * For optimal results, your application's or library's build - * system should check whether the C99 functions lrint and lrintf are supported - * and define the preprocessor symbols HAVE_LRINT and HAVE_LRINTF if so. If - * you are using autoconf, you can do this by using the AC_C99_FUNC_LRINT and - * AC_C99_FUNC_LRINTF checks in your configure.ac or configure.in file and - * including your application's config.h header before you include floatcast.h. - */ - -#ifndef __FLOATCAST_H__ -#define __FLOATCAST_H__ - -#include -#include - -#if defined (_MSC_VER) && !defined (inline) -#define inline __inline -#endif - -G_BEGIN_DECLS - -/* FIXME 0.11: these gst_cast_*() functions are not used anywhere, so we could - * just as well get rid of them and move the float/double swap macros into - * gstutils.h in core */ - -/** - * gst_cast_float: - * @x: input value - * - * Casts a 32-bit floating point value (float) to an integer without bias. - */ -/** - * gst_cast_double: - * @x: input value - * - * Casts a 64-bit floating point value (double) to an integer without bias. - */ - -/* FIXME: HAVE_LRINT && HAVE_LRINTF are defined by config.h - they should - * not be used in an installed header. */ -#if defined(HAVE_LRINT) && defined(HAVE_LRINTF) - - /* These defines enable functionality introduced with the 1999 ISO C - ** standard. They must be defined before the inclusion of math.h to - ** engage them. If optimisation is enabled, these functions will be - ** inlined. With optimisation switched off, you have to link in the - ** maths library using -lm. - */ - - #define _ISOC9X_SOURCE 1 - #define _ISOC99_SOURCE 1 - - #define __USE_ISOC9X 1 - #define __USE_ISOC99 1 - - #include - - #define gst_cast_float(x) ((gint)lrintf(x)) - #define gst_cast_double(x) ((gint)lrint(x)) - -#else - #include - - /* use a standard c cast, but do rounding correctly */ - #define gst_cast_float(x) ((gint)floor((x)+0.5)) - #define gst_cast_double(x) ((gint)floor((x)+0.5)) - -#endif - -G_END_DECLS - -#endif /* __FLOATCAST_H__ */ - diff --git a/gst-plugins-base.spec.in b/gst-plugins-base.spec.in index 9a0f9d70f0..f815c78c75 100644 --- a/gst-plugins-base.spec.in +++ b/gst-plugins-base.spec.in @@ -148,7 +148,6 @@ GStreamer Plugins Base library development and header files. %{_includedir}/gstreamer-%{majorminor}/gst/audio/audio.h %{_includedir}/gstreamer-%{majorminor}/gst/audio/gstaudiofilter.h %{_includedir}/gstreamer-%{majorminor}/gst/audio/multichannel.h -%{_includedir}/gstreamer-%{majorminor}/gst/floatcast/floatcast.h %{_includedir}/gstreamer-%{majorminor}/gst/riff/riff-ids.h %{_includedir}/gstreamer-%{majorminor}/gst/riff/riff-media.h %{_includedir}/gstreamer-%{majorminor}/gst/riff/riff-read.h @@ -243,7 +242,6 @@ GStreamer Plugins Base library development and header files. %{_libdir}/pkgconfig/gstreamer-audio-%{majorminor}.pc %{_libdir}/pkgconfig/gstreamer-cdda-%{majorminor}.pc %{_libdir}/pkgconfig/gstreamer-fft-%{majorminor}.pc -%{_libdir}/pkgconfig/gstreamer-floatcast-%{majorminor}.pc %{_libdir}/pkgconfig/gstreamer-interfaces-%{majorminor}.pc %{_libdir}/pkgconfig/gstreamer-netbuffer-%{majorminor}.pc %{_libdir}/pkgconfig/gstreamer-pbutils-%{majorminor}.pc diff --git a/gst/audioconvert/audioconvert.c b/gst/audioconvert/audioconvert.c index c23b35660b..97dee20ee0 100644 --- a/gst/audioconvert/audioconvert.c +++ b/gst/audioconvert/audioconvert.c @@ -29,7 +29,6 @@ #include "gstchannelmix.h" #include "gstaudioquantize.h" #include "audioconvert.h" -#include "gst/floatcast/floatcast.h" #include "gstaudioconvertorc.h" #if G_BYTE_ORDER == G_LITTLE_ENDIAN diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am index 8fb2529235..11b8f473d0 100644 --- a/pkgconfig/Makefile.am +++ b/pkgconfig/Makefile.am @@ -4,7 +4,6 @@ pcverfiles = \ gstreamer-app-@GST_MAJORMINOR@.pc \ gstreamer-cdda-@GST_MAJORMINOR@.pc \ gstreamer-fft-@GST_MAJORMINOR@.pc \ - gstreamer-floatcast-@GST_MAJORMINOR@.pc \ gstreamer-interfaces-@GST_MAJORMINOR@.pc \ gstreamer-netbuffer-@GST_MAJORMINOR@.pc \ gstreamer-pbutils-@GST_MAJORMINOR@.pc \ @@ -20,7 +19,6 @@ pcverfiles_uninstalled = \ gstreamer-app-@GST_MAJORMINOR@-uninstalled.pc \ gstreamer-cdda-@GST_MAJORMINOR@-uninstalled.pc \ gstreamer-fft-@GST_MAJORMINOR@-uninstalled.pc \ - gstreamer-floatcast-@GST_MAJORMINOR@-uninstalled.pc \ gstreamer-interfaces-@GST_MAJORMINOR@-uninstalled.pc \ gstreamer-netbuffer-@GST_MAJORMINOR@-uninstalled.pc \ gstreamer-pbutils-@GST_MAJORMINOR@-uninstalled.pc \ @@ -53,7 +51,6 @@ pcinfiles = \ gstreamer-app.pc.in gstreamer-app-uninstalled.pc.in \ gstreamer-cdda.pc.in gstreamer-cdda-uninstalled.pc.in \ gstreamer-fft.pc.in gstreamer-fft-uninstalled.pc.in \ - gstreamer-floatcast.pc.in gstreamer-floatcast-uninstalled.pc.in \ gstreamer-interfaces.pc.in gstreamer-interfaces-uninstalled.pc.in \ gstreamer-netbuffer.pc.in gstreamer-netbuffer-uninstalled.pc.in \ gstreamer-pbutils.pc.in gstreamer-pbutils-uninstalled.pc.in \ diff --git a/pkgconfig/gstreamer-floatcast-uninstalled.pc.in b/pkgconfig/gstreamer-floatcast-uninstalled.pc.in deleted file mode 100644 index a8eacf7fca..0000000000 --- a/pkgconfig/gstreamer-floatcast-uninstalled.pc.in +++ /dev/null @@ -1,14 +0,0 @@ -# the standard variables don't make sense for an uninstalled copy -prefix= -exec_prefix= -libdir= -# includedir is builddir because it is used to find gstconfig.h in places -includedir=@abs_top_builddir@/gst-libs - -Name: GStreamer Floatcast Library, Uninstalled -Description: Platform independent floating point macros, uninstalled -Version: @VERSION@ -Requires: glib-2.0 -Libs: @LIBM@ -Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs - diff --git a/pkgconfig/gstreamer-floatcast.pc.in b/pkgconfig/gstreamer-floatcast.pc.in deleted file mode 100644 index c54b098919..0000000000 --- a/pkgconfig/gstreamer-floatcast.pc.in +++ /dev/null @@ -1,16 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ -datarootdir=${prefix}/share -datadir=${datarootdir} -girdir=${datadir}/gir-1.0 -typelibdir=${libdir}/girepository-1.0 - -Name: GStreamer Floatcast Library -Description: Platform independent floating point macros -Requires: glib-2.0 -Version: @VERSION@ -Libs: @LIBM@ -Cflags: -I${includedir} - diff --git a/tests/check/elements/audioconvert.c b/tests/check/elements/audioconvert.c index 9911301ed7..5b7ab9d3e9 100644 --- a/tests/check/elements/audioconvert.c +++ b/tests/check/elements/audioconvert.c @@ -23,7 +23,6 @@ #include -#include #include #include diff --git a/tests/check/libs/gstlibscpp.cc b/tests/check/libs/gstlibscpp.cc index fdcd482c06..f95cd784a4 100644 --- a/tests/check/libs/gstlibscpp.cc +++ b/tests/check/libs/gstlibscpp.cc @@ -48,8 +48,6 @@ #include #include -#include - #include #include #include