[farsight2/master] Add empty libnice transmitter
Olivier Crête
olivier.crete at collabora.co.uk
Tue Dec 23 15:26:07 PST 2008
---
configure.ac | 23 ++++++++++++++++++++++-
transmitters/nice/Makefile.am | 21 +++++++++++++++++++++
transmitters/nice/fs-nice-transmitter.c | 3 +++
3 files changed, 46 insertions(+), 1 deletions(-)
create mode 100644 transmitters/nice/Makefile.am
create mode 100644 transmitters/nice/fs-nice-stream-transmitter.c
create mode 100644 transmitters/nice/fs-nice-stream-transmitter.h
create mode 100644 transmitters/nice/fs-nice-transmitter.c
create mode 100644 transmitters/nice/fs-nice-transmitter.h
diff --git a/configure.ac b/configure.ac
index 6dacd27..8b191fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -141,7 +141,8 @@ dnl *** path for our local plugins ***
dnl these are all the transmitter plug-ins
FS2_TRANSMITTER_PLUGINS_ALL=" \
rawudp \
- multicast
+ multicast \
+ nice
"
AC_SUBST(FS2_TRANSMITTER_PLUGINS_ALL)
@@ -160,6 +161,25 @@ AC_ARG_WITH(transmitter-plugins,
done],
[FS2_TRANSMITTER_PLUGINS_SELECTED=$FS2_TRANSMITTER_PLUGINS_ALL])
+
+
+dnl check for libnice
+if echo $FS2_TRANSMITTER_PLUGINS_SELECTED | grep -qi nice; then
+
+ NICE_REQUIRED=0.0.1
+
+ PKG_CHECK_MODULES(NICE, \
+ nice >= $NICE_REQUIRED,
+ HAVE_NICE=yes,
+ HAVE_NICE=no)
+ AC_SUBST(NICE_CFLAGS)
+ AC_SUBST(NICE_LIBS)
+else
+ AC_MSG_NOTICE(nice transmitter disabled by user request)
+fi
+
+AM_CONDITIONAL(USE_NICE, test "x$HAVE_NICE" == "xyes")
+
AC_SUBST(FS2_TRANSMITTER_PLUGINS_SELECTED)
dnl set the plugindir where plugins should be installed
@@ -407,6 +427,7 @@ gst-libs/gst/farsight/Makefile
transmitters/Makefile
transmitters/rawudp/Makefile
transmitters/multicast/Makefile
+transmitters/nice/Makefile
dnl pkgconfig/Makefile
dnl pkgconfig/farsight2.pc
dnl pkgconfig/farsight2-uninstalled.pc
diff --git a/transmitters/nice/Makefile.am b/transmitters/nice/Makefile.am
new file mode 100644
index 0000000..2cd7abc
--- /dev/null
+++ b/transmitters/nice/Makefile.am
@@ -0,0 +1,21 @@
+
+plugindir = $(FS2_PLUGIN_PATH)
+
+plugin_LTLIBRARIES = libnice-transmitter.la
+
+# sources used to compile this lib
+libnice_transmitter_la_SOURCES = \
+ fs-nice-transmitter.c \
+ fs-nice-stream-transmitter.c
+
+# flags used to compile this plugin
+libnice_transmitter_la_CFLAGS = $(FS2_INTERNAL_CFLAGS) $(FS2_CFLAGS) \
+ $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(NICE_CFLAGS)
+libnice_transmitter_la_LDFLAGS = $(FS2_PLUGIN_LDFLAGS)
+libnice_transmitter_la_LIBADD = \
+ $(top_builddir)/gst-libs/gst/farsight/libgstfarsight-0.10.la \
+ $(FS2_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(NICE_LIBS)
+
+noinst_HEADERS = \
+ fs-nice-transmitter.h \
+ fs-nice-stream-transmitter.h
diff --git a/transmitters/nice/fs-nice-stream-transmitter.c b/transmitters/nice/fs-nice-stream-transmitter.c
new file mode 100644
index 0000000..e69de29
diff --git a/transmitters/nice/fs-nice-stream-transmitter.h b/transmitters/nice/fs-nice-stream-transmitter.h
new file mode 100644
index 0000000..e69de29
diff --git a/transmitters/nice/fs-nice-transmitter.c b/transmitters/nice/fs-nice-transmitter.c
new file mode 100644
index 0000000..3de6988
--- /dev/null
+++ b/transmitters/nice/fs-nice-transmitter.c
@@ -0,0 +1,3 @@
+void fs_init_plugin (void *aa)
+{
+}
diff --git a/transmitters/nice/fs-nice-transmitter.h b/transmitters/nice/fs-nice-transmitter.h
new file mode 100644
index 0000000..e69de29
--
1.5.6.5
More information about the farsight-commits
mailing list