nds: moved NDS client element into separate plugin

configure.ac

@@ -20,6 +20,7 @@ AC_CONFIG_FILES([ \
 	python/elements/Makefile \
 	gst/Makefile \
 	gst/cairovis/Makefile \
+	gst/nds/Makefile \
 	gst/lal/Makefile \
 	gst/python/Makefile \
 	bin/Makefile \

gst/Makefile.am

@@ -4,4 +4,10 @@ else
 CAIRO_SUBDIRS = 
 endif
 
-SUBDIRS = lal python $(CAIRO_SUBDIRS)
+if COND_NDS
+NDS_SUBDIRS = nds
+else
+NDS_SUBDIRS =
+endif
+
+SUBDIRS = lal python $(CAIRO_SUBDIRS) $(NDS_SUBDIRS)

gst/lal/Makefile.am

@@ -2,12 +2,6 @@ INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/lib/skymap
 
 plugin_LTLIBRARIES = libgstlal.la
 
-if COND_NDS
-NDSSRC_SOURCES = gstlal_ndssrc.h gstlal_ndssrc.c
-else
-NDSSRC_SOURCES =
-endif
-
 libgstlal_la_SOURCES = \
 	gstlal_plugins.h gstlal.c \
 	gstlal_framesrc.h gstlal_framesrc.c \
@@ -32,10 +26,9 @@ libgstlal_la_SOURCES = \
 	gstlal_nofakedisconts.h gstlal_nofakedisconts.c \
 	gstlal_reblock.h gstlal_reblock.c \
 	gstlal_delay.h gstlal_delay.c \
-	gstlal_iirbank.h gstlal_iirbank.c \
-	$(NDSSRC_SOURCES)
-libgstlal_la_CFLAGS = -O2 $(AM_CFLAGS) $(CFLAGS) ${gstreamer_CFLAGS} ${LAL_CFLAGS} ${GSL_CFLAGS} ${FFTW_CFLAGS} ${NDS_CFLAGS}
-libgstlal_la_LIBADD = ${gstreamer_LIBS} ${LAL_LIBS} ${GSL_LIBS} ${FFTW_LIBS} ${NDS_LIBS} $(top_srcdir)/lib/skymap/libwanalysis.la $(top_srcdir)/lib/libgstlal.la $(top_srcdir)/lib/libgstlaltags.la
+	gstlal_iirbank.h gstlal_iirbank.c
+libgstlal_la_CFLAGS = -O2 $(AM_CFLAGS) $(CFLAGS) ${gstreamer_CFLAGS} ${LAL_CFLAGS} ${GSL_CFLAGS} ${FFTW_CFLAGS}
+libgstlal_la_LIBADD = ${gstreamer_LIBS} ${LAL_LIBS} ${GSL_LIBS} ${FFTW_LIBS} $(top_srcdir)/lib/skymap/libwanalysis.la $(top_srcdir)/lib/libgstlal.la $(top_srcdir)/lib/libgstlaltags.la
 libgstlal_la_LDFLAGS = ${GSTREAMER_PLUGIN_LDFLAGS}
 
 noinst_HEADERS = gstlal_plugins.h

gst/lal/gstlal.c

@@ -73,9 +73,6 @@
 #include <gstlal_reblock.h>
 #include <gstlal_delay.h>
 #include <gstlal_iirbank.h>
-#ifdef HAVE_NDS
-#include <gstlal_ndssrc.h>
-#endif
 
 
 /*
@@ -126,9 +123,6 @@ static gboolean plugin_init(GstPlugin *plugin)
 		{"lal_reblock", GSTLAL_REBLOCK_TYPE},
 		{"lal_delay", GSTLAL_DELAY_TYPE},
 		{"lal_iirbank", GSTLAL_IIRBANK_TYPE},
-#ifdef HAVE_NDS
-		{"ndssrc", GSTLAL_NDSSRC_TYPE},
-#endif
 		{NULL, 0},
 	};
 

gst/lal/gstlal_ndssrc.c → gst/nds/ndssrc.c

@@ -52,9 +52,8 @@
  */
 
 
-#include <gstlal.h>
 #include <gstlal_tags.h>
-#include <gstlal_ndssrc.h>
+#include <ndssrc.h>
 #include <daqc_internal.h>
 #include <daqc_response.h>
 
@@ -938,3 +937,21 @@ GType gstlal_ndssrc_get_type(void)
 
 	return type;
 }
+
+
+static gboolean plugin_init(GstPlugin *plugin)
+{
+	if (!gst_element_register(plugin, "ndssrc", GST_RANK_NONE, GSTLAL_NDSSRC_TYPE))
+		return FALSE;
+
+	/*
+	 * Tell GStreamer about the custom tags.
+	 */
+
+	gstlal_register_tags();
+
+	return TRUE;
+}
+
+
+GST_PLUGIN_DEFINE(GST_VERSION_MAJOR, GST_VERSION_MINOR, "nds", "LIGO Network Data Server (NDS) v1/v2 elements", plugin_init, PACKAGE_VERSION, "GPL", PACKAGE_NAME, "http://www.lsc-group.phys.uwm.edu/daswg")