From 45464a038ec6fcc3e691b6ced8af7ce4b0a42186 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Sat, 4 Jun 2011 14:25:57 +0300 Subject: [PATCH] audiovisualizers: rename scopes plugin to audiovisualizers --- configure.ac | 14 +++++------ gst/{scopes => audiovisualizers}/Makefile.am | 24 +++++++++---------- .../gstbasescope.c | 0 .../gstbasescope.h | 0 .../gstspectrascope.c | 0 .../gstspectrascope.h | 0 .../gstsynaescope.c | 0 .../gstsynaescope.h | 0 .../gstwavescope.c | 0 .../gstwavescope.h | 0 gst/{scopes => audiovisualizers}/plugin.c | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) rename gst/{scopes => audiovisualizers}/Makefile.am (53%) rename gst/{scopes => audiovisualizers}/gstbasescope.c (100%) rename gst/{scopes => audiovisualizers}/gstbasescope.h (100%) rename gst/{scopes => audiovisualizers}/gstspectrascope.c (100%) rename gst/{scopes => audiovisualizers}/gstspectrascope.h (100%) rename gst/{scopes => audiovisualizers}/gstsynaescope.c (100%) rename gst/{scopes => audiovisualizers}/gstsynaescope.h (100%) rename gst/{scopes => audiovisualizers}/gstwavescope.c (100%) rename gst/{scopes => audiovisualizers}/gstwavescope.h (100%) rename gst/{scopes => audiovisualizers}/plugin.c (98%) diff --git a/configure.ac b/configure.ac index 56ac549ebc..b01c375b9f 100644 --- a/configure.ac +++ b/configure.ac @@ -297,6 +297,7 @@ AG_GST_CHECK_PLUGIN(adpcmdec) AG_GST_CHECK_PLUGIN(adpcmenc) AG_GST_CHECK_PLUGIN(aiff) AG_GST_CHECK_PLUGIN(asfmux) +AG_GST_CHECK_PLUGIN(audiovisualizers) AG_GST_CHECK_PLUGIN(autoconvert) AG_GST_CHECK_PLUGIN(bayer) AG_GST_CHECK_PLUGIN(camerabin) @@ -346,7 +347,6 @@ AG_GST_CHECK_PLUGIN(real) AG_GST_CHECK_PLUGIN(rtpmux) AG_GST_CHECK_PLUGIN(rtpvp8) AG_GST_CHECK_PLUGIN(scaletempo) -AG_GST_CHECK_PLUGIN(scopes) AG_GST_CHECK_PLUGIN(sdi) AG_GST_CHECK_PLUGIN(sdp) AG_GST_CHECK_PLUGIN(segmentclip) @@ -1036,7 +1036,7 @@ dnl *** ladspa *** translit(dnm, m, l) AM_CONDITIONAL(USE_LADSPA, true) AG_GST_CHECK_FEATURE(LADSPA, [ladspa], ladspa, [ AC_CHECK_HEADER(ladspa.h, HAVE_LADSPA="yes", HAVE_LADSPA="no") - + PKG_CHECK_MODULES(LRDF, lrdf, HAVE_LRDF=yes, HAVE_LRDF=no) if test $HAVE_LRDF = "yes"; then AC_DEFINE(HAVE_LRDF, 1, [Define if we have liblrdf]) @@ -1481,7 +1481,7 @@ AG_GST_CHECK_FEATURE(SOUNDTOUCH, [soundtouch plug-in], soundtouch, [ [PKG_CHECK_MODULES(SOUNDTOUCH, soundtouch-1.0, [HAVE_SOUNDTOUCH=yes HAVE_SOUNDTOUCH_1_4=no - SOUNDTOUCH_LIBS="$SOUNDTOUCH_LIBS -lBPM"], + SOUNDTOUCH_LIBS="$SOUNDTOUCH_LIBS -lBPM"], [PKG_CHECK_MODULES(SOUNDTOUCH, libSoundTouch >= 1.4, [HAVE_SOUNDTOUCH=yes], [PKG_CHECK_MODULES(SOUNDTOUCH, libSoundTouch, @@ -1616,7 +1616,7 @@ AG_GST_CHECK_FEATURE(VDPAU, [VDPAU], vdpau, [ if test "$HAVE_VDPAU" = "no"; then saved_CPPFLAGS="$CPPFLAGS" AC_CHECK_HEADER([vdpau/vdpau.h], [HAVE_VDPAU_H=yes]) - + if test -z "$HAVE_VDPAU_H"; then dnl Didn't find VDPAU header straight away. dnl Try /usr/include/nvidia. Need to clear caching vars first @@ -1628,9 +1628,9 @@ AG_GST_CHECK_FEATURE(VDPAU, [VDPAU], vdpau, [ CPPFLAGS="$VDPAU_CFLAGS $saved_CPPFLAGS" AC_CHECK_HEADER([vdpau/vdpau.h], [HAVE_VDPAU_H=yes]) fi - + AC_CHECK_HEADER([vdpau/vdpau_x11.h], [HAVE_VDPAU_X11_H=yes]) - + if test "x$HAVE_VDPAU_H" = "xyes" -a "x$HAVE_VDPAU_X11_H" = "xyes"; then dnl Found the headers - look for the lib AC_MSG_NOTICE([VDPAU headers found. Checking libraries]) @@ -1848,6 +1848,7 @@ gst/adpcmdec/Makefile gst/adpcmenc/Makefile gst/aiff/Makefile gst/asfmux/Makefile +gst/audiovisualizers/Makefile gst/autoconvert/Makefile gst/bayer/Makefile gst/camerabin/Makefile @@ -1898,7 +1899,6 @@ gst/real/Makefile gst/rtpmux/Makefile gst/rtpvp8/Makefile gst/scaletempo/Makefile -gst/scopes/Makefile gst/sdi/Makefile gst/sdp/Makefile gst/segmentclip/Makefile diff --git a/gst/scopes/Makefile.am b/gst/audiovisualizers/Makefile.am similarity index 53% rename from gst/scopes/Makefile.am rename to gst/audiovisualizers/Makefile.am index fa393d789b..ac999a582f 100644 --- a/gst/scopes/Makefile.am +++ b/gst/audiovisualizers/Makefile.am @@ -1,33 +1,33 @@ -plugin_LTLIBRARIES = libgstscopes.la +plugin_LTLIBRARIES = libgstaudiovisualizers.la -libgstscopes_la_SOURCES = \ - gstbasescope.c plugin.c \ +libgstaudiovisualizers_la_SOURCES = plugin.c \ + gstbaseaudiovisualizer.c gstbaseaudiovisualizer.h \ gstspectrascope.c gstspectrascope.h \ gstsynaescope.c gstsynaescope.h \ gstwavescope.c gstwavescope.h -libgstscopes_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) \ +libgstaudiovisualizers_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS) -libgstscopes_la_LIBADD = \ +libgstaudiovisualizers_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \ -lgstvideo-$(GST_MAJORMINOR) -lgstfft-$(GST_MAJORMINOR) \ $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(GST_LIBS) $(LIBM) -libgstscopes_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -libgstscopes_la_LIBTOOLFLAGS = --tag=disable-static +libgstaudiovisualizers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstaudiovisualizers_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = gstbasescope.h \ gstspectrascope.h gstsynaescope.h gstwavescope.h Android.mk: Makefile.am $(BUILT_SOURCES) androgenizer \ - -:PROJECT scopes -:SHARED scopes \ + -:PROJECT audiovisualizers -:SHARED audiovisualizers \ -:TAGS eng debug \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ - -:SOURCES $(libgstscopes_la_SOURCES) \ - -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstscopes_la_CFLAGS) \ - -:LDFLAGS $(libgstscopes_la_LDFLAGS) \ - $(libgstscopes_la_LIBADD) \ + -:SOURCES $(libgstaudiovisualizers_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstaudiovisualizers_la_CFLAGS) \ + -:LDFLAGS $(libgstaudiovisualizers_la_LDFLAGS) \ + $(libgstaudiovisualizers_la_LIBADD) \ -ldl \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ diff --git a/gst/scopes/gstbasescope.c b/gst/audiovisualizers/gstbasescope.c similarity index 100% rename from gst/scopes/gstbasescope.c rename to gst/audiovisualizers/gstbasescope.c diff --git a/gst/scopes/gstbasescope.h b/gst/audiovisualizers/gstbasescope.h similarity index 100% rename from gst/scopes/gstbasescope.h rename to gst/audiovisualizers/gstbasescope.h diff --git a/gst/scopes/gstspectrascope.c b/gst/audiovisualizers/gstspectrascope.c similarity index 100% rename from gst/scopes/gstspectrascope.c rename to gst/audiovisualizers/gstspectrascope.c diff --git a/gst/scopes/gstspectrascope.h b/gst/audiovisualizers/gstspectrascope.h similarity index 100% rename from gst/scopes/gstspectrascope.h rename to gst/audiovisualizers/gstspectrascope.h diff --git a/gst/scopes/gstsynaescope.c b/gst/audiovisualizers/gstsynaescope.c similarity index 100% rename from gst/scopes/gstsynaescope.c rename to gst/audiovisualizers/gstsynaescope.c diff --git a/gst/scopes/gstsynaescope.h b/gst/audiovisualizers/gstsynaescope.h similarity index 100% rename from gst/scopes/gstsynaescope.h rename to gst/audiovisualizers/gstsynaescope.h diff --git a/gst/scopes/gstwavescope.c b/gst/audiovisualizers/gstwavescope.c similarity index 100% rename from gst/scopes/gstwavescope.c rename to gst/audiovisualizers/gstwavescope.c diff --git a/gst/scopes/gstwavescope.h b/gst/audiovisualizers/gstwavescope.h similarity index 100% rename from gst/scopes/gstwavescope.h rename to gst/audiovisualizers/gstwavescope.h diff --git a/gst/scopes/plugin.c b/gst/audiovisualizers/plugin.c similarity index 98% rename from gst/scopes/plugin.c rename to gst/audiovisualizers/plugin.c index de32911542..42ac8a1b70 100644 --- a/gst/scopes/plugin.c +++ b/gst/audiovisualizers/plugin.c @@ -44,6 +44,6 @@ plugin_init (GstPlugin * plugin) GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "scopes", + "audiovisualizers", "Creates video visualizations of audio input", plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)