summaryrefslogtreecommitdiff
authorOlivier CrĂȘte <olivier.crete@collabora.com>2011-10-11 18:55:29 (GMT)
committer Olivier CrĂȘte <olivier.crete@collabora.com>2011-10-11 20:14:07 (GMT)
commite33572c56e93ad1a0f644047f30fc23ab5e01372 (patch) (side-by-side diff)
tree2347860066da7fa0c91df89dc86a06e4e012236c
parent449a53f65146448d70f761cc1257171702c83db4 (diff)
downloadfarstream-e33572c56e93ad1a0f644047f30fc23ab5e01372.tar.gz
farstream-e33572c56e93ad1a0f644047f30fc23ab5e01372.tar.bz2
Rename Farsight 2 to Farstream
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--.gitignore66
-rw-r--r--Makefile.am4
-rw-r--r--README6
-rwxr-xr-xautogen.sh4
-rw-r--r--common-modified/gtk-doc-plugins.mak6
-rw-r--r--configure.ac134
-rw-r--r--docs/codingstyle.txt14
-rw-r--r--docs/diagrams/farsight2-references.svg4
-rw-r--r--docs/libs/Makefile.am8
-rw-r--r--docs/libs/farsight2-libs-docs.sgml18
-rw-r--r--docs/libs/farsight2-libs-sections.txt24
-rw-r--r--docs/libs/farsight2-libs.types14
-rw-r--r--docs/multi-party-negotiation.txt2
-rw-r--r--docs/plugins/Makefile.am12
-rw-r--r--docs/plugins/farsight2-plugins-docs.sgml8
-rw-r--r--docs/plugins/farsight2-transmitters.types.in2
-rw-r--r--docs/version.entities.in2
-rw-r--r--examples/commandline/Makefile.am6
-rw-r--r--examples/commandline/simple-call-shm.c20
-rw-r--r--examples/commandline/simple-call.c20
-rw-r--r--examples/gui/Makefile.am12
-rw-r--r--examples/gui/fs-gui-dtmf.ui (renamed from examples/gui/fs2-gui-dtmf.ui)0
-rw-r--r--examples/gui/fs-gui-main-window.ui (renamed from examples/gui/fs2-gui-main-window.ui)0
-rw-r--r--examples/gui/fs-gui-startup.ui (renamed from examples/gui/fs2-gui-startup.ui)0
-rwxr-xr-xexamples/gui/fs-gui.py (renamed from examples/gui/fs2-gui.py)92
-rw-r--r--examples/gui/fs_gui_net.py (renamed from examples/gui/fs2_gui_net.py)20
-rw-r--r--farstream.pc.in (renamed from farsight2.pc.in)8
-rw-r--r--gst-libs/gst/Makefile.am2
-rw-r--r--gst-libs/gst/farstream/Makefile.am (renamed from gst-libs/gst/farsight/Makefile.am)62
-rw-r--r--gst-libs/gst/farstream/fs-candidate.c (renamed from gst-libs/gst/farsight/fs-candidate.c)6
-rw-r--r--gst-libs/gst/farstream/fs-candidate.h (renamed from gst-libs/gst/farsight/fs-candidate.h)4
-rw-r--r--gst-libs/gst/farstream/fs-codec.c (renamed from gst-libs/gst/farsight/fs-codec.c)8
-rw-r--r--gst-libs/gst/farstream/fs-codec.h (renamed from gst-libs/gst/farsight/fs-codec.h)4
-rw-r--r--gst-libs/gst/farstream/fs-conference.c (renamed from gst-libs/gst/farsight/fs-conference.c)20
-rw-r--r--gst-libs/gst/farstream/fs-conference.h (renamed from gst-libs/gst/farsight/fs-conference.h)14
-rw-r--r--gst-libs/gst/farstream/fs-element-added-notifier.c (renamed from gst-libs/gst/farsight/fs-element-added-notifier.c)2
-rw-r--r--gst-libs/gst/farstream/fs-element-added-notifier.h (renamed from gst-libs/gst/farsight/fs-element-added-notifier.h)2
-rw-r--r--gst-libs/gst/farstream/fs-participant.c (renamed from gst-libs/gst/farsight/fs-participant.c)8
-rw-r--r--gst-libs/gst/farstream/fs-participant.h (renamed from gst-libs/gst/farsight/fs-participant.h)4
-rw-r--r--gst-libs/gst/farstream/fs-plugin.c (renamed from gst-libs/gst/farsight/fs-plugin.c)10
-rw-r--r--gst-libs/gst/farstream/fs-plugin.h (renamed from gst-libs/gst/farsight/fs-plugin.h)8
-rw-r--r--gst-libs/gst/farstream/fs-private.h (renamed from gst-libs/gst/farsight/fs-private.h)4
-rw-r--r--gst-libs/gst/farstream/fs-rtp.c (renamed from gst-libs/gst/farsight/fs-rtp.c)4
-rw-r--r--gst-libs/gst/farstream/fs-rtp.h (renamed from gst-libs/gst/farsight/fs-rtp.h)6
-rw-r--r--gst-libs/gst/farstream/fs-session.c (renamed from gst-libs/gst/farsight/fs-session.c)22
-rw-r--r--gst-libs/gst/farstream/fs-session.h (renamed from gst-libs/gst/farsight/fs-session.h)10
-rw-r--r--gst-libs/gst/farstream/fs-stream-transmitter.c (renamed from gst-libs/gst/farsight/fs-stream-transmitter.c)10
-rw-r--r--gst-libs/gst/farstream/fs-stream-transmitter.h (renamed from gst-libs/gst/farsight/fs-stream-transmitter.h)6
-rw-r--r--gst-libs/gst/farstream/fs-stream.c (renamed from gst-libs/gst/farsight/fs-stream.c)22
-rw-r--r--gst-libs/gst/farstream/fs-stream.h (renamed from gst-libs/gst/farsight/fs-stream.h)8
-rw-r--r--gst-libs/gst/farstream/fs-transmitter.c (renamed from gst-libs/gst/farsight/fs-transmitter.c)12
-rw-r--r--gst-libs/gst/farstream/fs-transmitter.h (renamed from gst-libs/gst/farsight/fs-transmitter.h)10
-rw-r--r--gst-libs/gst/farstream/fs-utils.c (renamed from gst-libs/gst/farsight/fs-utils.c)8
-rw-r--r--gst-libs/gst/farstream/fs-utils.h (renamed from gst-libs/gst/farsight/fs-utils.h)4
-rw-r--r--gst/Makefile.am4
-rw-r--r--gst/fsmsnconference/Makefile.am8
-rw-r--r--gst/fsmsnconference/fs-msn-cam-recv-conference.c10
-rw-r--r--gst/fsmsnconference/fs-msn-cam-recv-conference.h4
-rw-r--r--gst/fsmsnconference/fs-msn-cam-send-conference.c10
-rw-r--r--gst/fsmsnconference/fs-msn-cam-send-conference.h4
-rw-r--r--gst/fsmsnconference/fs-msn-conference.c14
-rw-r--r--gst/fsmsnconference/fs-msn-conference.h6
-rw-r--r--gst/fsmsnconference/fs-msn-connection.c2
-rw-r--r--gst/fsmsnconference/fs-msn-connection.h2
-rw-r--r--gst/fsmsnconference/fs-msn-participant.c4
-rw-r--r--gst/fsmsnconference/fs-msn-participant.h6
-rw-r--r--gst/fsmsnconference/fs-msn-session.c4
-rw-r--r--gst/fsmsnconference/fs-msn-session.h6
-rw-r--r--gst/fsmsnconference/fs-msn-stream.c14
-rw-r--r--gst/fsmsnconference/fs-msn-stream.h6
-rw-r--r--gst/fsrawconference/Makefile.am8
-rw-r--r--gst/fsrawconference/fs-raw-conference-plugin.c10
-rw-r--r--gst/fsrawconference/fs-raw-conference.c8
-rw-r--r--gst/fsrawconference/fs-raw-conference.h6
-rw-r--r--gst/fsrawconference/fs-raw-participant.c4
-rw-r--r--gst/fsrawconference/fs-raw-participant.h6
-rw-r--r--gst/fsrawconference/fs-raw-session.c8
-rw-r--r--gst/fsrawconference/fs-raw-session.h6
-rw-r--r--gst/fsrawconference/fs-raw-stream.c12
-rw-r--r--gst/fsrawconference/fs-raw-stream.h8
-rw-r--r--gst/fsrtpconference/Makefile.am10
-rw-r--r--gst/fsrtpconference/fs-rtp-bitrate-adapter.c4
-rw-r--r--gst/fsrtpconference/fs-rtp-bitrate-adapter.h2
-rw-r--r--gst/fsrtpconference/fs-rtp-codec-cache.c10
-rw-r--r--gst/fsrtpconference/fs-rtp-codec-cache.h4
-rw-r--r--gst/fsrtpconference/fs-rtp-codec-negotiation.c12
-rw-r--r--gst/fsrtpconference/fs-rtp-codec-negotiation.h4
-rw-r--r--gst/fsrtpconference/fs-rtp-codec-specific.c2
-rw-r--r--gst/fsrtpconference/fs-rtp-codec-specific.h4
-rw-r--r--gst/fsrtpconference/fs-rtp-conference-plugin.c10
-rw-r--r--gst/fsrtpconference/fs-rtp-conference.c16
-rw-r--r--gst/fsrtpconference/fs-rtp-conference.h6
-rw-r--r--gst/fsrtpconference/fs-rtp-discover-codecs.c10
-rw-r--r--gst/fsrtpconference/fs-rtp-discover-codecs.h6
-rw-r--r--gst/fsrtpconference/fs-rtp-dtmf-event-source.c6
-rw-r--r--gst/fsrtpconference/fs-rtp-dtmf-event-source.h4
-rw-r--r--gst/fsrtpconference/fs-rtp-dtmf-sound-source.c6
-rw-r--r--gst/fsrtpconference/fs-rtp-dtmf-sound-source.h4
-rw-r--r--gst/fsrtpconference/fs-rtp-keyunit-manager.c4
-rw-r--r--gst/fsrtpconference/fs-rtp-keyunit-manager.h6
-rw-r--r--gst/fsrtpconference/fs-rtp-packet-modder.c4
-rw-r--r--gst/fsrtpconference/fs-rtp-packet-modder.h2
-rw-r--r--gst/fsrtpconference/fs-rtp-participant.c4
-rw-r--r--gst/fsrtpconference/fs-rtp-participant.h6
-rw-r--r--gst/fsrtpconference/fs-rtp-session.c26
-rw-r--r--gst/fsrtpconference/fs-rtp-session.h6
-rw-r--r--gst/fsrtpconference/fs-rtp-special-source.c6
-rw-r--r--gst/fsrtpconference/fs-rtp-special-source.h6
-rw-r--r--gst/fsrtpconference/fs-rtp-stream.c16
-rw-r--r--gst/fsrtpconference/fs-rtp-stream.h8
-rw-r--r--gst/fsrtpconference/fs-rtp-substream.c8
-rw-r--r--gst/fsrtpconference/fs-rtp-substream.h4
-rw-r--r--gst/fsrtpconference/fs-rtp-tfrc.c8
-rw-r--r--gst/fsrtpconference/fs-rtp-tfrc.h4
-rw-r--r--gst/fsrtpconference/tfrc.c2
-rw-r--r--gst/fsrtpconference/tfrc.h2
-rw-r--r--gst/funnel/Makefile.am4
-rw-r--r--gst/funnel/fs-funnel.c10
-rw-r--r--gst/funnel/fs-funnel.h2
-rw-r--r--gst/rtcpfilter/Makefile.am4
-rw-r--r--gst/rtcpfilter/fs-rtcp-filter.c6
-rw-r--r--gst/rtcpfilter/fs-rtcp-filter.h2
-rw-r--r--gst/videoanyrate/Makefile.am4
-rw-r--r--gst/videoanyrate/videoanyrate.c6
-rw-r--r--gst/videoanyrate/videoanyrate.h2
-rw-r--r--python/Makefile.am38
-rw-r--r--python/example.py20
-rw-r--r--python/pyfarstream-filter.defs (renamed from python/pyfarsight-filter.defs)0
-rw-r--r--python/pyfarstream.defs (renamed from python/pyfarsight.defs)11
-rw-r--r--python/pyfarstream.override (renamed from python/pyfarsight.override)6
-rw-r--r--python/pyfarstreammodule.c (renamed from python/pyfarsightmodule.c)10
-rwxr-xr-xpython/rebuild-defs.sh6
-rw-r--r--tests/check/Makefile.am12
-rw-r--r--tests/check/base/fscodec.c6
-rw-r--r--tests/check/base/fstransmitter.c6
-rw-r--r--tests/check/elements/funnel.c2
-rw-r--r--tests/check/elements/rtcpfilter.c2
-rw-r--r--tests/check/msn/conference.c22
-rw-r--r--tests/check/raw/conference.c54
-rw-r--r--tests/check/rtp/codecs.c42
-rw-r--r--tests/check/rtp/conference.c56
-rw-r--r--tests/check/rtp/generic.c4
-rw-r--r--tests/check/rtp/generic.h4
-rw-r--r--tests/check/rtp/recvcodecs.c12
-rw-r--r--tests/check/rtp/sendcodecs.c16
-rw-r--r--tests/check/testutils.c2
-rw-r--r--tests/check/testutils.h2
-rw-r--r--tests/check/transmitter/fake-filter.c8
-rw-r--r--tests/check/transmitter/fake-filter.h2
-rw-r--r--tests/check/transmitter/generic.c6
-rw-r--r--tests/check/transmitter/generic.h4
-rw-r--r--tests/check/transmitter/multicast.c6
-rw-r--r--tests/check/transmitter/nice.c6
-rw-r--r--tests/check/transmitter/rawudp-upnp.c2
-rw-r--r--tests/check/transmitter/rawudp-upnp.h2
-rw-r--r--tests/check/transmitter/rawudp.c6
-rw-r--r--tests/check/transmitter/shm.c6
-rw-r--r--tests/check/transmitter/stunalternd.c2
-rw-r--r--tests/check/transmitter/stunalternd.h2
-rw-r--r--tests/check/utils/binadded.c4
-rw-r--r--tests/rtp/Makefile.am6
-rw-r--r--tests/rtp/codec-discovery.c10
-rw-r--r--transmitters/Makefile.am4
-rw-r--r--transmitters/multicast/Makefile.am12
-rw-r--r--transmitters/multicast/fs-multicast-stream-transmitter.c8
-rw-r--r--transmitters/multicast/fs-multicast-stream-transmitter.h8
-rw-r--r--transmitters/multicast/fs-multicast-transmitter.c10
-rw-r--r--transmitters/multicast/fs-multicast-transmitter.h6
-rw-r--r--transmitters/nice/Makefile.am12
-rw-r--r--transmitters/nice/fs-nice-agent.c2
-rw-r--r--transmitters/nice/fs-nice-agent.h6
-rw-r--r--transmitters/nice/fs-nice-stream-transmitter.c2
-rw-r--r--transmitters/nice/fs-nice-stream-transmitter.h8
-rw-r--r--transmitters/nice/fs-nice-transmitter.c10
-rw-r--r--transmitters/nice/fs-nice-transmitter.h6
-rw-r--r--transmitters/rawudp/Makefile.am12
-rw-r--r--transmitters/rawudp/fs-rawudp-component.c8
-rw-r--r--transmitters/rawudp/fs-rawudp-component.h8
-rw-r--r--transmitters/rawudp/fs-rawudp-stream-transmitter.c8
-rw-r--r--transmitters/rawudp/fs-rawudp-stream-transmitter.h8
-rw-r--r--transmitters/rawudp/fs-rawudp-transmitter.c10
-rw-r--r--transmitters/rawudp/fs-rawudp-transmitter.h6
-rw-r--r--transmitters/shm/Makefile.am12
-rw-r--r--transmitters/shm/fs-shm-stream-transmitter.c10
-rw-r--r--transmitters/shm/fs-shm-stream-transmitter.h8
-rw-r--r--transmitters/shm/fs-shm-transmitter.c10
-rw-r--r--transmitters/shm/fs-shm-transmitter.h6
-rwxr-xr-xuninstalled-paths.sh2
188 files changed, 933 insertions, 922 deletions
diff --git a/.gitignore b/.gitignore
index d613c84..4786b24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,41 +22,41 @@ gst/*/*.doc.c
transmitters/rawudp/fs-rawudp-marshal.[ch]
transmitters/rawudp/fs-rawudp-marshal.list
-gst-libs/gst/farsight/fs-marshal.[ch]
-gst-libs/gst/farsight/fs-marshal.list
-gst-libs/gst/farsight/fs-enum-types.h
-gst-libs/gst/farsight/fs-enumtypes.[ch]
+gst-libs/gst/farstream/fs-marshal.[ch]
+gst-libs/gst/farstream/fs-marshal.list
+gst-libs/gst/farstream/fs-enum-types.h
+gst-libs/gst/farstream/fs-enumtypes.[ch]
-docs/libs/farsight2-libs-decl-list.txt
-docs/libs/farsight2-libs-decl-list.txt.bak
-docs/libs/farsight2-libs-decl.txt
-docs/libs/farsight2-libs-decl.txt.bak
-docs/libs/farsight2-libs-undocumented.txt
-docs/libs/farsight2-libs-unused.txt
-docs/libs/farsight2-libs.args
-docs/libs/farsight2-libs.hierarchy
-docs/libs/farsight2-libs.interfaces
-docs/libs/farsight2-libs.prerequisites
-docs/libs/farsight2-libs.signals
-docs/libs/farsight2-libs-undeclared.txt
+docs/libs/farstream-libs-decl-list.txt
+docs/libs/farstream-libs-decl-list.txt.bak
+docs/libs/farstream-libs-decl.txt
+docs/libs/farstream-libs-decl.txt.bak
+docs/libs/farstream-libs-undocumented.txt
+docs/libs/farstream-libs-unused.txt
+docs/libs/farstream-libs.args
+docs/libs/farstream-libs.hierarchy
+docs/libs/farstream-libs.interfaces
+docs/libs/farstream-libs.prerequisites
+docs/libs/farstream-libs.signals
+docs/libs/farstream-libs-undeclared.txt
docs/libs/html
docs/libs/tmpl
docs/libs/xml
docs/libs/doc-registry.xml
-docs/plugins/farsight2-plugins-decl-list.txt
-docs/plugins/farsight2-plugins-decl.txt
-docs/plugins/farsight2-plugins-overrides.txt
-docs/plugins/farsight2-plugins-undeclared.txt
-docs/plugins/farsight2-plugins-undocumented.txt
-docs/plugins/farsight2-plugins-unused.txt
-docs/plugins/farsight2-plugins.args
-docs/plugins/farsight2-plugins.args.new
-docs/plugins/farsight2-plugins.hierarchy
-docs/plugins/farsight2-plugins.interfaces
-docs/plugins/farsight2-plugins.prerequisites
-docs/plugins/farsight2-plugins.signals
-docs/plugins/farsight2-plugins.signals.new
-docs/plugins/farsight2-transmitters.types
+docs/plugins/farstream-plugins-decl-list.txt
+docs/plugins/farstream-plugins-decl.txt
+docs/plugins/farstream-plugins-overrides.txt
+docs/plugins/farstream-plugins-undeclared.txt
+docs/plugins/farstream-plugins-undocumented.txt
+docs/plugins/farstream-plugins-unused.txt
+docs/plugins/farstream-plugins.args
+docs/plugins/farstream-plugins.args.new
+docs/plugins/farstream-plugins.hierarchy
+docs/plugins/farstream-plugins.interfaces
+docs/plugins/farstream-plugins.prerequisites
+docs/plugins/farstream-plugins.signals
+docs/plugins/farstream-plugins.signals.new
+docs/plugins/farstream-transmitters.types
docs/plugins/html/
docs/plugins/inspect-registry.xml
docs/plugins/inspect/
@@ -66,7 +66,7 @@ docs/plugins/xml/
docs/diagrams/*.png
docs/version.entities
-python/pyfarsight.c
+python/pyfarstream.c
python/*.pyo
python/*.pyc
@@ -114,6 +114,6 @@ missing
stamp-h.in
stamp-h1
-farsight2-0.10.pc
-farsight2.pc
+farstream-0.10.pc
+farstream.pc
diff --git a/Makefile.am b/Makefile.am
index 7acedaa..9b5977f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,8 +49,8 @@ check-torture:
true
endif
-pcverfiles = farsight2-@GST_MAJORMINOR@.pc
-pcinfiles = farsight2.pc.in
+pcverfiles = farstream-@GST_MAJORMINOR@.pc
+pcinfiles = farstream.pc.in
%-@GST_MAJORMINOR@.pc: %.pc
cp $< $@
diff --git a/README b/README
index 90a5208..777e468 100644
--- a/README
+++ b/README
@@ -1,9 +1,9 @@
-Farsight 2
+Farstream
==========
-http://farsight.freedesktop.org/
+http://farstream.freedesktop.org/
-Farsight 2 is a collection of GStreamer modules and libraries for
+Farstream is a collection of GStreamer modules and libraries for
videoconferencing. The API is described in the documentation in the
docs/ directory.
diff --git a/autogen.sh b/autogen.sh
index 211beee..c97287d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,8 +2,8 @@
# Run this to generate all the initial makefiles, etc.
DIE=0
-package=farsight2
-srcfile=gst-libs/gst/farsight/fs-candidate.c
+package=farstream
+srcfile=gst-libs/gst/farstream/fs-candidate.c
# Make sure we have common
if test ! -f common/gst-autogen.sh;
diff --git a/common-modified/gtk-doc-plugins.mak b/common-modified/gtk-doc-plugins.mak
index 7950934..f1e4793 100644
--- a/common-modified/gtk-doc-plugins.mak
+++ b/common-modified/gtk-doc-plugins.mak
@@ -1,6 +1,6 @@
# This is an include file specifically tuned for building documentation
# for GStreamer plug-ins
-# It has been further specialized to farsight2 plugins stuff
+# It has been further specialized to farstream plugins stuff
help:
@echo
@@ -321,7 +321,7 @@ scanobj-trans-update:
# We have a scanobj-build.stamp just to prevent both from running at the same
# time as they use temp files with the same name
-scanobj-trans-build.stamp: $(SCANOBJ_DEPS) $(basefiles) scanobj-build.stamp farsight2-transmitters.types
+scanobj-trans-build.stamp: $(SCANOBJ_DEPS) $(basefiles) scanobj-build.stamp farstream-transmitters.types
@echo '*** Scanning Transmitters ***'
if test x"$(srcdir)" = x. ; then \
GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/ext \
@@ -332,7 +332,7 @@ scanobj-trans-build.stamp: $(SCANOBJ_DEPS) $(basefiles) scanobj-build.stamp fars
LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
$(srcdir)/gtkdoc-scangobj-transmitters \
--type-init-func="gst_init(NULL,NULL)" \
- --types=farsight2-transmitters.types \
+ --types=farstream-transmitters.types \
--module=$(DOC_MODULE) && \
$(PYTHON) \
$(top_srcdir)/common/scangobj-merge.py $(DOC_MODULE); \
diff --git a/configure.ac b/configure.ac
index c08303b..f13d8ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,9 +5,9 @@ dnl please read gstreamer/docs/random/autotools before changing this file
dnl initialize autoconf
dnl releases only do -Wall, cvs and prerelease does -Werror too
dnl use a three digit version number for releases, and four for cvs/prerelease
-AC_INIT(Farsight2, 0.0.31.1,
- https://bugs.freedesktop.org/enter_bug.cgi?product=Farsight,
- farsight2)
+AC_INIT(Farstream, 0.1.0.1,
+ https://bugs.freedesktop.org/enter_bug.cgi?product=Farstream,
+ farstream)
AG_GST_INIT
@@ -18,10 +18,10 @@ dnl define PACKAGE_VERSION_* variables
AS_VERSION
dnl check if this is a release version
-AS_NANO(FS2_CVS="no", FS2_CVS="yes")
+AS_NANO(FS_CVS="no", FS_CVS="yes")
dnl can autoconf find the source ?
-AC_CONFIG_SRCDIR([gst-libs/gst/farsight/fs-candidate.c])
+AC_CONFIG_SRCDIR([gst-libs/gst/farstream/fs-candidate.c])
dnl define the output header for config
AM_CONFIG_HEADER([config.h])
@@ -35,10 +35,10 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],
AC_SUBST(AM_DEFAULT_VERBOSITY)])
dnl our libraries and install dirs use major.minor as a version
-FS2_MAJORMINOR=$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR
-AC_SUBST(FS2_MAJORMINOR)
-AC_DEFINE_UNQUOTED(FS2_MAJORMINOR, "$FS2_MAJORMINOR",
- [Farsight2 major.minor version])
+FS_MAJORMINOR=$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR
+AC_SUBST(FS_MAJORMINOR)
+AC_DEFINE_UNQUOTED(FS_MAJORMINOR, "$FS_MAJORMINOR",
+ [Farstream major.minor version])
GST_MAJORMINOR=0.10
AC_SUBST(GST_MAJORMINOR)
@@ -51,8 +51,8 @@ dnl - library source changed -> increment REVISION
dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0
dnl - interfaces added -> increment AGE
dnl - interfaces removed -> AGE = 0
-dnl sets FS2_LT_LDFLAGS
-AS_LIBTOOL(FS2, 9, 1, 9)
+dnl sets FS_LT_LDFLAGS
+AS_LIBTOOL(FS, 0, 0, 0)
dnl FIXME: this macro doesn't actually work;
dnl the generated libtool script has no support for the listed tags.
@@ -106,7 +106,7 @@ AC_DEFINE_UNQUOTED(GST_INSTALL_PLUGINS_HELPER, "$GST_INSTALL_PLUGINS_HELPER",
AC_SUBST(GST_INSTALL_PLUGINS_HELPER)
dnl these are all the gst plug-ins, compilable without additional libs
-FS2_PLUGINS_ALL=" \
+FS_PLUGINS_ALL=" \
fsrawconference \
fsrtpconference \
fsmsnconference \
@@ -114,38 +114,38 @@ FS2_PLUGINS_ALL=" \
rtcpfilter \
videoanyrate
"
-AC_SUBST(FS2_PLUGINS_ALL)
+AC_SUBST(FS_PLUGINS_ALL)
-FS2_PLUGINS_SELECTED=""
+FS_PLUGINS_SELECTED=""
AC_ARG_WITH(plugins,
AC_HELP_STRING([--with-plugins],
[comma-separated list of plug-ins to compile]),
[for i in `echo $withval | tr , ' '`; do
- if echo $FS2_PLUGINS_ALL | grep $i > /dev/null
+ if echo $FS_PLUGINS_ALL | grep $i > /dev/null
then
- FS2_PLUGINS_SELECTED="$FS2_PLUGINS_SELECTED $i"
+ FS_PLUGINS_SELECTED="$FS_PLUGINS_SELECTED $i"
else
echo "plug-in $i not recognized, ignoring..."
fi
done],
- [FS2_PLUGINS_SELECTED=$FS2_PLUGINS_ALL])
+ [FS_PLUGINS_SELECTED=$FS_PLUGINS_ALL])
-AC_SUBST(FS2_PLUGINS_SELECTED)
+AC_SUBST(FS_PLUGINS_SELECTED)
dnl *** path for our local plugins ***
dnl these are all the transmitter plug-ins
-FS2_TRANSMITTER_PLUGINS_ALL=" \
+FS_TRANSMITTER_PLUGINS_ALL=" \
rawudp \
multicast \
nice \
shm
"
-AC_SUBST(FS2_TRANSMITTER_PLUGINS_ALL)
+AC_SUBST(FS_TRANSMITTER_PLUGINS_ALL)
-FS2_TRANSMITTER_PLUGINS_SELECTED=""
+FS_TRANSMITTER_PLUGINS_SELECTED=""
TRANSMITTERS_DEFAULT=yes
@@ -153,15 +153,15 @@ AC_ARG_WITH(transmitter-plugins,
AC_HELP_STRING([--with-transmitter-plugins],
[comma-separated list of plug-ins to compile]),
[for i in `echo $withval | tr , ' '`; do
- if echo $FS2_TRANSMITTER_PLUGINS_ALL | grep $i > /dev/null
+ if echo $FS_TRANSMITTER_PLUGINS_ALL | grep $i > /dev/null
then
- FS2_TRANSMITTER_PLUGINS_SELECTED="$FS2_TRANSMITTER_PLUGINS_SELECTED $i"
+ FS_TRANSMITTER_PLUGINS_SELECTED="$FS_TRANSMITTER_PLUGINS_SELECTED $i"
else
echo "plug-in $i not recognized, ignoring..."
fi
done
TRANSMITTERS_DEFAULT=no],
- [FS2_TRANSMITTER_PLUGINS_SELECTED=$FS2_TRANSMITTER_PLUGINS_ALL])
+ [FS_TRANSMITTER_PLUGINS_SELECTED=$FS_TRANSMITTER_PLUGINS_ALL])
NICE_REQUIRED=0.1.0
@@ -171,12 +171,12 @@ PKG_CHECK_MODULES(NICE, \
AC_SUBST(NICE_CFLAGS)
AC_SUBST(NICE_LIBS)
-AC_SUBST(FS2_TRANSMITTER_PLUGINS_SELECTED)
+AC_SUBST(FS_TRANSMITTER_PLUGINS_SELECTED)
dnl set the plugindir where plugins should be installed
-AS_AC_EXPAND(FS2_PLUGIN_PATH, ${libdir}/farsight2-$FS2_MAJORMINOR)
-AC_SUBST(FS2_PLUGIN_PATH)
-AC_DEFINE_UNQUOTED(FS2_PLUGIN_PATH, "${FS2_PLUGIN_PATH}", [The path were plugins are installed and search by default])
+AS_AC_EXPAND(FS_PLUGIN_PATH, ${libdir}/farstream-$FS_MAJORMINOR)
+AC_SUBST(FS_PLUGIN_PATH)
+AC_DEFINE_UNQUOTED(FS_PLUGIN_PATH, "${FS_PLUGIN_PATH}", [The path were plugins are installed and search by default])
dnl *** checks for platform ***
@@ -257,87 +257,87 @@ AM_CONDITIONAL(HAVE_GST_CHECK, test "x$HAVE_GST_CHECK" = "xyes")
dnl Check for documentation xrefs
GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
-FS2_PREFIX="`$PKG_CONFIG --variable=prefix farsight2-$FS2_MAJORMINOR`"
+FS_PREFIX="`$PKG_CONFIG --variable=prefix farstream-$FS_MAJORMINOR`"
AC_SUBST(GLIB_PREFIX)
-AC_SUBST(FS2_PREFIX)
+AC_SUBST(FS_PREFIX)
dnl *** set variables based on configure arguments ***
dnl set license and copyright notice
-FS2_LICENSE="LGPL"
-AC_DEFINE_UNQUOTED(FS2_LICENSE, "$FS2_LICENSE", [Farsight2 license])
-AC_SUBST(FS2_LICENSE)
+FS_LICENSE="LGPL"
+AC_DEFINE_UNQUOTED(FS_LICENSE, "$FS_LICENSE", [Farstream license])
+AC_SUBST(FS_LICENSE)
dnl set location of plugin directory
AG_GST_SET_PLUGINDIR
dnl define an ERROR_CFLAGS Makefile variable
-AG_GST_SET_ERROR_CFLAGS($FS2_CVS)
+AG_GST_SET_ERROR_CFLAGS($FS_CVS)
dnl define correct level for debugging messages
-AG_GST_SET_LEVEL_DEFAULT($FS2_CVS)
+AG_GST_SET_LEVEL_DEFAULT($FS_CVS)
AC_CHECK_FUNCS(getifaddrs)
dnl *** finalize CFLAGS, LDFLAGS, LIBS
dnl Overview:
-dnl FS2_OPTION_CFLAGS: common flags for profiling, debugging, errors, ...
+dnl FS_OPTION_CFLAGS: common flags for profiling, debugging, errors, ...
dnl GST_*: flags shared by built objects to link against GStreamer
-dnl FS2_INTERNAL_CFLAGS: to link internally against the farsight libs
+dnl FS_INTERNAL_CFLAGS: to link internally against the farstream libs
dnl (compare to other modules) or for i18n
-dnl FS2_ALL_LDFLAGS: linker flags shared by all
-dnl FS2_LIB_LDFLAGS: additional linker flags for all libaries
-dnl FS2_LT_LDFLAGS: library versioning of our libraries
-dnl FS2_PLUGIN_LDFLAGS: flags to be used for all plugins
+dnl FS_ALL_LDFLAGS: linker flags shared by all
+dnl FS_LIB_LDFLAGS: additional linker flags for all libaries
+dnl FS_LT_LDFLAGS: library versioning of our libraries
+dnl FS_PLUGIN_LDFLAGS: flags to be used for all plugins
-dnl FS2_OPTION_CFLAGS
+dnl FS_OPTION_CFLAGS
if test "x$USE_DEBUG" = xyes; then
PROFILE_CFLAGS="-g"
fi
AC_SUBST(PROFILE_CFLAGS)
-dnl every flag in FS2_OPTION_CFLAGS can be overridden at make time
-FS2_OPTION_CFLAGS="\$(WARNING_CFLAGS) \$(ERROR_CFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS)"
-AC_SUBST(FS2_OPTION_CFLAGS)
+dnl every flag in FS_OPTION_CFLAGS can be overridden at make time
+FS_OPTION_CFLAGS="\$(WARNING_CFLAGS) \$(ERROR_CFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS)"
+AC_SUBST(FS_OPTION_CFLAGS)
dnl our libraries need to be versioned correctly
-AC_SUBST(FS2_LT_LDFLAGS)
+AC_SUBST(FS_LT_LDFLAGS)
-dnl FS2_INTERNAL_CFLAGS
+dnl FS_INTERNAL_CFLAGS
dnl prefer internal headers to already installed ones
dnl also add builddir include for enumtypes and marshal
-FS2_INTERNAL_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs"
-AC_SUBST(FS2_INTERNAL_CFLAGS)
+FS_INTERNAL_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs"
+AC_SUBST(FS_INTERNAL_CFLAGS)
dnl FIXME: do we want to rename to GST_ALL_* ?
-dnl add FS2_OPTION_CFLAGS, but overridable
-FS2_CFLAGS="$GST_CFLAGS \$(FS2_OPTION_CFLAGS)"
-AC_SUBST(FS2_CFLAGS)
+dnl add FS_OPTION_CFLAGS, but overridable
+FS_CFLAGS="$GST_CFLAGS \$(FS_OPTION_CFLAGS)"
+AC_SUBST(FS_CFLAGS)
dnl add GCOV libs because libtool strips -fprofile-arcs -ftest-coverage
-FS2_LIBS="$GST_LIBS \$(GCOV_LIBS)"
-AC_SUBST(FS2_LIBS)
+FS_LIBS="$GST_LIBS \$(GCOV_LIBS)"
+AC_SUBST(FS_LIBS)
dnl LDFLAGS really should only contain flags, not libs - they get added before
dnl whatevertarget_LIBS and -L flags here affect the rest of the linking
-FS2_ALL_LDFLAGS="-no-undefined"
-AC_SUBST(FS2_ALL_LDFLAGS)
+FS_ALL_LDFLAGS="-no-undefined"
+AC_SUBST(FS_ALL_LDFLAGS)
-dnl FS2_LIB_LDFLAGS
+dnl FS_LIB_LDFLAGS
dnl linker flags shared by all libraries
dnl LDFLAGS modifier defining exported symbols from built libraries
-FS2_LIB_LDFLAGS="-export-symbols-regex ^fs_.*"
-AC_SUBST(FS2_LIB_LDFLAGS)
+FS_LIB_LDFLAGS="-export-symbols-regex ^fs_.*"
+AC_SUBST(FS_LIB_LDFLAGS)
dnl this really should only contain flags, not libs - they get added before
dnl whatevertarget_LIBS and -L flags here affect the rest of the linking
-FS2_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*fs_init_plugin\$\$' $FS2_ALL_LDFLAGS"
-AC_SUBST(FS2_PLUGIN_LDFLAGS)
+FS_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*fs_init_plugin\$\$' $FS_ALL_LDFLAGS"
+AC_SUBST(FS_PLUGIN_LDFLAGS)
dnl this really should only contain flags, not libs - they get added before
dnl whatevertarget_LIBS and -L flags here affect the rest of the linking
-GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc\$\$' $FS2_ALL_LDFLAGS"
+GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc\$\$' $FS_ALL_LDFLAGS"
AC_SUBST(GST_PLUGIN_LDFLAGS)
@@ -351,7 +351,7 @@ AC_ARG_ENABLE([python],
WANT_PYTHON=yes)
if test "x$WANT_PYTHON" = "xyes"; then
AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
- PKG_CHECK_MODULES(PYFARSIGHT, [ pygobject-2.0 >= 2.12.0
+ PKG_CHECK_MODULES(PYFARSTREAM, [ pygobject-2.0 >= 2.12.0
gst-python-0.10 >= 0.10.10] )
PKG_CHECK_MODULES(PYCODEGEN, [ pygobject-2.0 >= 2.16.0 ],
PYCODEGEN=pygobject-codegen-2.0,
@@ -391,7 +391,7 @@ dnl *** output files ***
AC_CONFIG_FILES(
Makefile
-farsight2.pc
+farstream.pc
common/Makefile
common/m4/Makefile
common-modified/Makefile
@@ -404,15 +404,15 @@ gst/rtcpfilter/Makefile
gst/videoanyrate/Makefile
gst-libs/Makefile
gst-libs/gst/Makefile
-gst-libs/gst/farsight/Makefile
+gst-libs/gst/farstream/Makefile
transmitters/Makefile
transmitters/rawudp/Makefile
transmitters/multicast/Makefile
transmitters/nice/Makefile
transmitters/shm/Makefile
dnl pkgconfig/Makefile
-dnl pkgconfig/farsight2.pc
-dnl pkgconfig/farsight2-uninstalled.pc
+dnl pkgconfig/farstream.pc
+dnl pkgconfig/farstream-uninstalled.pc
tests/Makefile
tests/check/Makefile
tests/rtp/Makefile
diff --git a/docs/codingstyle.txt b/docs/codingstyle.txt
index 5f26f82..b671199 100644
--- a/docs/codingstyle.txt
+++ b/docs/codingstyle.txt
@@ -1,7 +1,7 @@
-This page describes the Farsight2 coding style. Respect it or die.
+This page describes the Farstream coding style. Respect it or die.
It is a copy of
-http://farsight.freedesktop.org/wiki/Fs2CodingStyle
+http://farstream.freedesktop.org/wiki/Fs2CodingStyle
They should both be in sync
@@ -27,7 +27,7 @@ Base indent unit is 2 spaces.
The first parameter is on the same line as the function only if the function is a method.
-static void farsight_rtp_stream_get_property (GObject *object,
+static void farstream_rtp_stream_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec);
@@ -37,7 +37,7 @@ static void farsight_rtp_stream_get_property (GObject *object,
The first parameter is on the same line as the function only if the function is a method.
static void
-farsight_rtp_stream_get_property (GObject * object,
+farstream_rtp_stream_get_property (GObject * object,
guint prop_id,
GValue * value,
GParamSpec * pspec)
@@ -90,7 +90,7 @@ switch (var)
==== Casting ====
-FarsightRTPStream *self = (FarsightRTPStream *) stream;
+FarstreamRTPStream *self = (FarstreamRTPStream *) stream;
==== #includes ====
@@ -106,8 +106,8 @@ Finally, #include any private (non-installed) headers from the library or progra
==== Emacs mode ====
-(defun farsight2-c-mode ()
- "C mode with farsight2 style"
+(defun farstream-c-mode ()
+ "C mode with farstream style"
(interactive)
(c-mode)
(c-set-style "GNU")
diff --git a/docs/diagrams/farsight2-references.svg b/docs/diagrams/farsight2-references.svg
index ce59868..b31675e 100644
--- a/docs/diagrams/farsight2-references.svg
+++ b/docs/diagrams/farsight2-references.svg
@@ -15,9 +15,9 @@
sodipodi:version="0.32"
inkscape:version="0.46"
sodipodi:docbase="/home/tester"
- sodipodi:docname="farsight2-references.svg"
+ sodipodi:docname="farstream-references.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
- inkscape:export-filename="/home/tester/farsight2-references.png"
+ inkscape:export-filename="/home/tester/farstream-references.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am
index 9e2ffb4..866b81f 100644
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -5,7 +5,7 @@
# The name of the module, e.g. 'glib'.
#DOC_MODULE=gst-plugins-libs-@GST_MAJORMINOR@
-DOC_MODULE=farsight2-libs
+DOC_MODULE=farstream-libs
# generated basefiles
basefiles = \
@@ -46,7 +46,7 @@ CFILE_GLOB=$(DOC_SOURCE_DIR)/*/*.c
# this is useful ;)
SCANOBJ_DEPS = \
- $(top_builddir)/gst-libs/gst/farsight/libgstfarsight-@GST_MAJORMINOR@.la
+ $(top_builddir)/gst-libs/gst/farstream/libgstfarstream-@GST_MAJORMINOR@.la
# Header files to ignore when scanning.
IGNORE_HFILES = fs-marshal.h fs-enumtypes.h fs-private.h
@@ -62,9 +62,9 @@ extra_files =
# CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib
# contains GtkObjects/GObjects and you want to document signals and properties.
-GTKDOC_CFLAGS = $(FS2_INTERNAL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS)
+GTKDOC_CFLAGS = $(FS_INTERNAL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS)
GTKDOC_LIBS = -static \
- $(top_builddir)/gst-libs/gst/farsight/libgstfarsight-0.10.la \
+ $(top_builddir)/gst-libs/gst/farstream/libgstfarstream-0.10.la \
$(GST_BASE_LIBS) \
$(GCOV_LIBS)
diff --git a/docs/libs/farsight2-libs-docs.sgml b/docs/libs/farsight2-libs-docs.sgml
index fe7d119..305d039 100644
--- a/docs/libs/farsight2-libs-docs.sgml
+++ b/docs/libs/farsight2-libs-docs.sgml
@@ -6,20 +6,20 @@
]>
<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
<bookinfo>
- <title>Farsight2 Reference Manual</title>
+ <title>Farstream Reference Manual</title>
<releaseinfo>
- for version &FS2_VERSION;.
+ for version &FS_VERSION;.
The latest version of this documentation can be found on-line at
- <ulink role="online-location" url="http://farsight.freedesktop.org/apidoc/farsight2/">http://farsight.freedesktop.org/apidoc/farsight2/</ulink>.
+ <ulink role="online-location" url="http://farstream.freedesktop.org/apidoc/farstream/">http://farstream.freedesktop.org/apidoc/farstream/</ulink>.
The bases classes are implemented by multiple plugins described in
- the <ulink url="http://farsight.freedesktop.org/apidoc/farsight2-plugins/">Farsight2 Plugins Manual</ulink>.
+ the <ulink url="http://farstream.freedesktop.org/apidoc/farstream-plugins/">Farstream Plugins Manual</ulink>.
</releaseinfo>
</bookinfo>
<part>
<title>User-oriented classes, interfaces and functions</title>
<chapter>
- <title>Farsight Core Library</title>
+ <title>Farstream Core Library</title>
<xi:include href="xml/fs-conference.xml"/>
<xi:include href="xml/fs-participant.xml"/>
<xi:include href="xml/fs-session.xml"/>
@@ -32,20 +32,20 @@
<xi:include href="xml/fs-rtp.xml"/>
</chapter>
<chapter>
- <title>Farsight Utility Functions and Objects</title>
+ <title>Farstream Utility Functions and Objects</title>
<xi:include href="xml/fs-element-added-notifier.xml"/>
<xi:include href="xml/fs-utils.xml"/>
</chapter>
</part>
<part>
- <title>Classes used to implement Farsight plugins</title>
+ <title>Classes used to implement Farstream plugins</title>
<chapter>
- <title>Farsight Transmitter Classes</title>
+ <title>Farstream Transmitter Classes</title>
<xi:include href="xml/fs-transmitter.xml"/>
<xi:include href="xml/fs-stream-transmitter.xml"/>
</chapter>
<chapter>
- <title>Farsight Plugins Infrastructure</title>
+ <title>Farstream Plugins Infrastructure</title>
<xi:include href="xml/fs-plugin.xml"/>
</chapter>
</part>
diff --git a/docs/libs/farsight2-libs-sections.txt b/docs/libs/farsight2-libs-sections.txt
index 2362eb2..4a220fb 100644
--- a/docs/libs/farsight2-libs-sections.txt
+++ b/docs/libs/farsight2-libs-sections.txt
@@ -1,7 +1,7 @@
<SECTION>
<FILE>fs-participant</FILE>
<TITLE>FsParticipant</TITLE>
-<INCLUDE>gst/farsight/fs-conference.h</INCLUDE>
+<INCLUDE>gst/farstream/fs-conference.h</INCLUDE>
FsParticipant
FsParticipantClass
FS_PARTICIPANT_DATA_LOCK
@@ -21,7 +21,7 @@ FsParticipantPrivate
<SECTION>
<FILE>fs-stream</FILE>
<TITLE>FsStream</TITLE>
-<INCLUDE>gst/farsight/fs-conference.h</INCLUDE>
+<INCLUDE>gst/farstream/fs-conference.h</INCLUDE>
FsStream
FsStreamClass
FsStreamDirection
@@ -52,7 +52,7 @@ FsStreamPrivate
FsDTMFEvent
FsDTMFMethod
<TITLE>FsSession</TITLE>
-<INCLUDE>gst/farsight/fs-conference.h</INCLUDE>
+<INCLUDE>gst/farstream/fs-conference.h</INCLUDE>
FsSession
FsSessionClass
fs_session_new_stream
@@ -84,7 +84,7 @@ FS_IS_CONFERENCE_CLASS
<SECTION>
<FILE>fs-conference</FILE>
<TITLE>FsConference</TITLE>
-<INCLUDE>gst/farsight/fs-conference.h</INCLUDE>
+<INCLUDE>gst/farstream/fs-conference.h</INCLUDE>
FsConference
fs_conference_new_session
fs_conference_new_participant
@@ -104,7 +104,7 @@ fs_error_quark
<SECTION>
<FILE>fs-candidate</FILE>
<TITLE>FsCandidate</TITLE>
-<INCLUDE>gst/farsight/fs-conference.h</INCLUDE>
+<INCLUDE>gst/farstream/fs-conference.h</INCLUDE>
FsCandidate
FsCandidateType
FsNetworkProtocol
@@ -124,7 +124,7 @@ fs_candidate_list_get_type
<SECTION>
<FILE>fs-codec</FILE>
<TITLE>FsCodec</TITLE>
-<INCLUDE>gst/farsight/fs-conference.h</INCLUDE>
+<INCLUDE>gst/farstream/fs-conference.h</INCLUDE>
FsCodec
FsMediaType
FsCodecParameter
@@ -159,7 +159,7 @@ fs_codec_list_get_type
<SECTION>
<FILE>fs-transmitter</FILE>
<TITLE>FsTransmitter</TITLE>
-<INCLUDE>gst/farsight/fs-transmitter.h</INCLUDE>
+<INCLUDE>gst/farstream/fs-transmitter.h</INCLUDE>
FsTransmitter
FsTransmitterClass
fs_transmitter_new
@@ -183,7 +183,7 @@ fs_transmitter_get_type
<SECTION>
<FILE>fs-stream-transmitter</FILE>
<TITLE>FsStreamTransmitter</TITLE>
-<INCLUDE>gst/farsight/fs-transmitter.h</INCLUDE>
+<INCLUDE>gst/farstream/fs-transmitter.h</INCLUDE>
FsStreamTransmitter
FsStreamTransmitterClass
fs_stream_transmitter_add_remote_candidates
@@ -206,7 +206,7 @@ fs_stream_transmitter_get_type
<SECTION>
<FILE>fs-plugin</FILE>
<TITLE>FsPlugin</TITLE>
-<INCLUDE>gst/farsight/fs-plugin.h</INCLUDE>
+<INCLUDE>gst/farstream/fs-plugin.h</INCLUDE>
FsPlugin
fs_plugin_create_valist
fs_plugin_create
@@ -227,7 +227,7 @@ fs_plugin_get_type
<SECTION>
<FILE>fs-element-added-notifier</FILE>
<TITLE>FsElementAddedNotifier</TITLE>
-<INCLUDE>gst/farsight/fs-element-added-notifier.h</INCLUDE>
+<INCLUDE>gst/farstream/fs-element-added-notifier.h</INCLUDE>
FsElementAddedNotifier
fs_element_added_notifier_new
fs_element_added_notifier_add
@@ -249,7 +249,7 @@ fs_element_added_notifier_get_type
<SECTION>
<FILE>fs-rtp</FILE>
<TITLE>RTP Specific types</TITLE>
-<INCLUDE>gst/farsight/fs-rtp.h</INCLUDE>
+<INCLUDE>gst/farstream/fs-rtp.h</INCLUDE>
FsRtpHeaderExtension
fs_rtp_header_extension_new
fs_rtp_header_extension_copy
@@ -270,7 +270,7 @@ fs_rtp_header_extension_list_get_type
<SECTION>
<FILE>fs-utils</FILE>
<TITLE>Utility functions</TITLE>
-<INCLUDE>gst/farsight/fs-utils.h</INCLUDE>
+<INCLUDE>gst/farstream/fs-utils.h</INCLUDE>
fs_utils_set_bitrate
fs_utils_get_default_codec_preferences
fs_utils_get_default_element_properties
diff --git a/docs/libs/farsight2-libs.types b/docs/libs/farsight2-libs.types
index cd86714..3c50eee 100644
--- a/docs/libs/farsight2-libs.types
+++ b/docs/libs/farsight2-libs.types
@@ -6,13 +6,13 @@
% - change output file name from gstreamer-(whatever).html to (whatever).html
% - document properties and signals
-#include "../../gst-libs/gst/farsight/fs-participant.h"
-#include "../../gst-libs/gst/farsight/fs-session.h"
-#include "../../gst-libs/gst/farsight/fs-stream.h"
-#include "../../gst-libs/gst/farsight/fs-conference.h"
-#include "../../gst-libs/gst/farsight/fs-transmitter.h"
-#include "../../gst-libs/gst/farsight/fs-stream-transmitter.h"
-#include "../../gst-libs/gst/farsight/fs-element-added-notifier.h"
+#include "../../gst-libs/gst/farstream/fs-participant.h"
+#include "../../gst-libs/gst/farstream/fs-session.h"
+#include "../../gst-libs/gst/farstream/fs-stream.h"
+#include "../../gst-libs/gst/farstream/fs-conference.h"
+#include "../../gst-libs/gst/farstream/fs-transmitter.h"
+#include "../../gst-libs/gst/farstream/fs-stream-transmitter.h"
+#include "../../gst-libs/gst/farstream/fs-element-added-notifier.h"
fs_participant_get_type
fs_session_get_type
diff --git a/docs/multi-party-negotiation.txt b/docs/multi-party-negotiation.txt
index fc69ea0..c970bab 100644
--- a/docs/multi-party-negotiation.txt
+++ b/docs/multi-party-negotiation.txt
@@ -11,7 +11,7 @@ RTP multi-party conferencing requires that all parties use the same list of code
- Negotiated the common list in a decentralized manner
-Farsight 2 supports the first two techniques, but not the third (which
+Farstream supports the first two techniques, but not the third (which
is a lot more complicated and error-prone).
To use technique one, one just needs to call
diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 9f81f9a..8ba1c7f 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -4,7 +4,7 @@ GST_DOC_SCANOBJ = $(top_srcdir)/common/gstdoc-scangobj
# The name of the module, e.g. 'glib'.
#DOC_MODULE=gst-plugins-libs-@GST_MAJORMINOR@
-MODULE=farsight2
+MODULE=farstream
DOC_MODULE=$(MODULE)-plugins
# generated basefiles
@@ -111,22 +111,22 @@ content_files =
# Other files to distribute.
extra_files = \
- farsight2-transmitters.types.in \
+ farstream-transmitters.types.in \
gtkdoc-scangobj-transmitters
-farsight2-transmitters.types: farsight2-transmitters.types.in Makefile
+farstream-transmitters.types: farstream-transmitters.types.in Makefile
cat $< > $@
- for i in "$(FS2_TRANSMITTER_PLUGINS_SELECTED)"; do \
+ for i in "$(FS_TRANSMITTER_PLUGINS_SELECTED)"; do \
echo "${i}" >> $@ ;\
done
-CLEANFILES = farsight2-transmitters.types
+CLEANFILES = farstream-transmitters.types
# CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib
# contains GtkObjects/GObjects and you want to document signals and properties.
GTKDOC_CFLAGS = $(GST_BASE_CFLAGS) -I$(top_builddir) -I$(top_builddir)/gst-libs
GTKDOC_LIBS = \
- $(top_builddir)/gst-libs/gst/farsight/libgstfarsight-0.10.la \
+ $(top_builddir)/gst-libs/gst/farstream/libgstfarstream-0.10.la \
$(top_builddir)/gst/fsrtpconference/libfsrtpconference_doc.la \
$(top_builddir)/gst/fsrawconference/libfsrawconference_doc.la \
$(top_builddir)/gst/fsmsnconference/libfsmsnconference_doc.la \
diff --git a/docs/plugins/farsight2-plugins-docs.sgml b/docs/plugins/farsight2-plugins-docs.sgml
index ab53be1..9495f3a 100644
--- a/docs/plugins/farsight2-plugins-docs.sgml
+++ b/docs/plugins/farsight2-plugins-docs.sgml
@@ -6,14 +6,14 @@
]>
<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
<bookinfo>
- <title>Farsight2 Plugins Manual</title>
+ <title>Farstream Plugins Manual</title>
<releaseinfo>
- for version &FS2_VERSION;.
+ for version &FS_VERSION;.
The latest version of this documentation can be found on-line at
- <ulink role="online-location" url="http://farsight.freedesktop.org/apidoc/farsight2-plugins/">http://farsight.freedesktop.org/apidoc/farsight2-plugins/</ulink>.
+ <ulink role="online-location" url="http://farstream.freedesktop.org/apidoc/farstream-plugins/">http://farstream.freedesktop.org/apidoc/farstream-plugins/</ulink>.
These plugins are to be used with the base classes and other utility
objects and functions described in the
- <ulink url="http://farsight.freedesktop.org/apidoc/farsight2/">Farsight2 Reference Manual</ulink>.
+ <ulink url="http://farstream.freedesktop.org/apidoc/farstream/">Farstream Reference Manual</ulink>.
</releaseinfo>
</bookinfo>
diff --git a/docs/plugins/farsight2-transmitters.types.in b/docs/plugins/farsight2-transmitters.types.in
index 7f74447..5d8e5bd 100644
--- a/docs/plugins/farsight2-transmitters.types.in
+++ b/docs/plugins/farsight2-transmitters.types.in
@@ -1 +1 @@
-#include <gst/farsight/fs-transmitter.h>
+#include <gst/farstream/fs-transmitter.h>
diff --git a/docs/version.entities.in b/docs/version.entities.in
index 6494998..662fc76 100644
--- a/docs/version.entities.in
+++ b/docs/version.entities.in
@@ -1,2 +1,2 @@
<!ENTITY GST_MAJORMINOR "@GST_MAJORMINOR@">
-<!ENTITY FS2_VERSION "@VERSION@">
+<!ENTITY FS_VERSION "@VERSION@">
diff --git a/examples/commandline/Makefile.am b/examples/commandline/Makefile.am
index f1cfa99..bc31a4e 100644
--- a/examples/commandline/Makefile.am
+++ b/examples/commandline/Makefile.am
@@ -4,13 +4,13 @@ noinst_PROGRAMS = simple-call simple-call-shm
AM_CFLAGS = \
-I$(top_srcdir)/gst/fsrtpconference/ \
- $(FS2_INTERNAL_CFLAGS) \
- $(FS2_CFLAGS) \
+ $(FS_INTERNAL_CFLAGS) \
+ $(FS_CFLAGS) \
$(GST_CFLAGS) \
$(CFLAGS)
LDADD = \
- $(top_builddir)/gst-libs/gst/farsight/libgstfarsight-0.10.la \
+ $(top_builddir)/gst-libs/gst/farstream/libgstfarstream-0.10.la \
$(GST_LIBS)
diff --git a/examples/commandline/simple-call-shm.c b/examples/commandline/simple-call-shm.c
index 325c912..f9fcb51 100644
--- a/examples/commandline/simple-call-shm.c
+++ b/examples/commandline/simple-call-shm.c
@@ -1,4 +1,4 @@
-/* Farsight 2 ad-hoc test for simple calls.
+/* Farstream ad-hoc test for simple calls.
*
* Copyright (C) 2008 Collabora, Nokia
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
@@ -21,7 +21,7 @@
/*
* WARNING:
*
- * Do not use this as an example of a proper use of farsight, it assumes that
+ * Do not use this as an example of a proper use of farstream, it assumes that
* both ends have the EXACT same list of codec installed in the EXACT same order
*/
@@ -34,7 +34,7 @@
#include <gio/gunixinputstream.h>
#include <gst/gst.h>
-#include <gst/farsight/fs-conference.h>
+#include <gst/farstream/fs-conference.h>
#define DEFAULT_AUDIOSRC "audiotestsrc is-live=1 ! audio/x-raw-int, rate=8000 ! identity"
#define DEFAULT_AUDIOSINK "alsasink sync=false async=false"
@@ -201,7 +201,7 @@ async_bus_cb (GstBus *bus, GstMessage *message, gpointer user_data)
{
const GstStructure *s = gst_message_get_structure (message);
- if (gst_structure_has_name (s, "farsight-error"))
+ if (gst_structure_has_name (s, "farstream-error"))
{
gint error;
const gchar *error_msg = gst_structure_get_string (s, "error-msg");
@@ -211,13 +211,13 @@ async_bus_cb (GstBus *bus, GstMessage *message, gpointer user_data)
&error));
if (FS_ERROR_IS_FATAL (error))
- g_error ("Farsight fatal error: %d %s %s", error, error_msg,
+ g_error ("Farstream fatal error: %d %s %s", error, error_msg,
debug_msg);
else
- g_warning ("Farsight non-fatal error: %d %s %s", error, error_msg,
+ g_warning ("Farstream non-fatal error: %d %s %s", error, error_msg,
debug_msg);
}
- else if (gst_structure_has_name (s, "farsight-new-local-candidate"))
+ else if (gst_structure_has_name (s, "farstream-new-local-candidate"))
{
const GValue *val = gst_structure_get_value (s, "candidate");
FsCandidate *cand = NULL;
@@ -229,11 +229,11 @@ async_bus_cb (GstBus *bus, GstMessage *message, gpointer user_data)
g_print ("You can press ENTER on the other side\n");
}
else if (gst_structure_has_name (s,
- "farsight-local-candidates-prepared"))
+ "farstream-local-candidates-prepared"))
{
g_print ("Local candidates prepared\n");
}
- else if (gst_structure_has_name (s, "farsight-recv-codecs-changed"))
+ else if (gst_structure_has_name (s, "farstream-recv-codecs-changed"))
{
const GValue *val = gst_structure_get_value (s, "codecs");
GList *codecs = NULL;
@@ -250,7 +250,7 @@ async_bus_cb (GstBus *bus, GstMessage *message, gpointer user_data)
g_free (tmp);
}
}
- else if (gst_structure_has_name (s, "farsight-send-codec-changed"))
+ else if (gst_structure_has_name (s, "farstream-send-codec-changed"))
{
const GValue *val = gst_structure_get_value (s, "codec");
FsCodec *codec = NULL;
diff --git a/examples/commandline/simple-call.c b/examples/commandline/simple-call.c
index 2d6a154..50a408d 100644
--- a/examples/commandline/simple-call.c
+++ b/examples/commandline/simple-call.c
@@ -1,4 +1,4 @@
-/* Farsight 2 ad-hoc test for simple calls.
+/* Farstream ad-hoc test for simple calls.
*
* Copyright (C) 2008 Collabora, Nokia
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
@@ -21,7 +21,7 @@
/*
* WARNING:
*
- * Do not use this as an example of a proper use of farsight, it assumes that
+ * Do not use this as an example of a proper use of farstream, it assumes that
* both ends have the EXACT same list of codec installed in the EXACT same order
*/
@@ -30,7 +30,7 @@
#include <glib.h>
#include <gst/gst.h>
-#include <gst/farsight/fs-conference.h>
+#include <gst/farstream/fs-conference.h>
#define DEFAULT_AUDIOSRC "alsasrc"
#define DEFAULT_AUDIOSINK "audioconvert ! audioresample ! audioconvert ! alsasink"
@@ -202,7 +202,7 @@ async_bus_cb (GstBus *bus, GstMessage *message, gpointer user_data)
{
const GstStructure *s = gst_message_get_structure (message);
- if (gst_structure_has_name (s, "farsight-error"))
+ if (gst_structure_has_name (s, "farstream-error"))
{
gint error;
const gchar *error_msg = gst_structure_get_string (s, "error-msg");
@@ -211,11 +211,11 @@ async_bus_cb (GstBus *bus, GstMessage *message, gpointer user_data)
&error));
if (FS_ERROR_IS_FATAL (error))
- g_error ("Farsight fatal error: %d %s", error, error_msg);
+ g_error ("Farstream fatal error: %d %s", error, error_msg);
else
- g_warning ("Farsight non-fatal error: %d %s", error, error_msg);
+ g_warning ("Farstream non-fatal error: %d %s", error, error_msg);
}
- else if (gst_structure_has_name (s, "farsight-new-local-candidate"))
+ else if (gst_structure_has_name (s, "farstream-new-local-candidate"))
{
const GValue *val = gst_structure_get_value (s, "candidate");
FsCandidate *cand = NULL;
@@ -226,11 +226,11 @@ async_bus_cb (GstBus *bus, GstMessage *message, gpointer user_data)
g_print ("New candidate: %s %d\n", cand->ip, cand->port);
}
else if (gst_structure_has_name (s,
- "farsight-local-candidates-prepared"))
+ "farstream-local-candidates-prepared"))
{
g_print ("Local candidates prepared\n");
}
- else if (gst_structure_has_name (s, "farsight-recv-codecs-changed"))
+ else if (gst_structure_has_name (s, "farstream-recv-codecs-changed"))
{
const GValue *val = gst_structure_get_value (s, "codecs");
GList *codecs = NULL;
@@ -247,7 +247,7 @@ async_bus_cb (GstBus *bus, GstMessage *message, gpointer user_data)
g_free (tmp);
}
}
- else if (gst_structure_has_name (s, "farsight-send-codec-changed"))
+ else if (gst_structure_has_name (s, "farstream-send-codec-changed"))
{
const GValue *val = gst_structure_get_value (s, "codec");
FsCodec *codec = NULL;
diff --git a/examples/gui/Makefile.am b/examples/gui/Makefile.am
index d2256e8..80397ef 100644
--- a/examples/gui/Makefile.am
+++ b/examples/gui/Makefile.am
@@ -1,7 +1,7 @@
EXTRA_DIST = \
- fs2_gui_net.py \
- fs2-gui.py \
- fs2-gui-dtmf.ui \
- fs2-gui-main-window.ui \
- fs2-gui-startup.ui \
- fs2-gui-user-frame.ui
+ fs_gui_net.py \
+ fs-gui.py \
+ fs-gui-dtmf.ui \
+ fs-gui-main-window.ui \
+ fs-gui-startup.ui \
+ fs-gui-user-frame.ui
diff --git a/examples/gui/fs2-gui-dtmf.ui b/examples/gui/fs-gui-dtmf.ui
index 9235964..9235964 100644
--- a/examples/gui/fs2-gui-dtmf.ui
+++ b/examples/gui/fs-gui-dtmf.ui
diff --git a/examples/gui/fs2-gui-main-window.ui b/examples/gui/fs-gui-main-window.ui
index 977c478..977c478 100644
--- a/examples/gui/fs2-gui-main-window.ui
+++ b/examples/gui/fs-gui-main-window.ui
diff --git a/examples/gui/fs2-gui-startup.ui b/examples/gui/fs-gui-startup.ui
index a03c3fd..a03c3fd 100644
--- a/examples/gui/fs2-gui-startup.ui
+++ b/examples/gui/fs-gui-startup.ui
diff --git a/examples/gui/fs2-gui.py b/examples/gui/fs-gui.py
index c6bda85..610592b 100755
--- a/examples/gui/fs2-gui.py
+++ b/examples/gui/fs-gui.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
-# Farsight 2 demo GUI program
+# Farstream demo GUI program
#
# Copyright (C) 2007 Collabora, Nokia
# @author: Olivier Crete <olivier.crete@collabora.co.uk>
@@ -44,18 +44,18 @@ try:
except ImportError, e:
raise SystemExit("Gst-Python couldn't be found! (%s)" % (e[0]))
try:
- import farsight
+ import farstream
except:
try:
sys.path.append(os.path.join(os.path.dirname(__file__),
'..', '..', 'python', '.libs'))
- import farsight
+ import farstream
except ImportError, e:
- raise SystemExit("Farsight couldn't be found! (%s)" % (e[0]))
+ raise SystemExit("Farstream couldn't be found! (%s)" % (e[0]))
-from fs2_gui_net import FsUIClient, FsUIListener, FsUIServer
+from fs_gui_net import FsUIClient, FsUIListener, FsUIServer
CAMERA=False
@@ -67,7 +67,7 @@ SERVER=2
TRANSMITTER="nice"
-builderprefix = os.path.join(os.path.dirname(__file__),"fs2-gui-")
+builderprefix = os.path.join(os.path.dirname(__file__),"fs-gui-")
def make_video_sink(pipeline, xid, name, async=True):
@@ -101,7 +101,7 @@ class FsUIPipeline:
def __init__(self, elementname="fsrtpconference"):
self.pipeline = gst.Pipeline()
signal.signal(signal.SIGINT, self.int_handler)
- self.notifier = farsight.ElementAddedNotifier()
+ self.notifier = farstream.ElementAddedNotifier()
self.notifier.connect("element-added", self.element_added_cb)
self.notifier.add(self.pipeline)
self.pipeline.get_bus().set_sync_handler(self.sync_handler)
@@ -146,33 +146,33 @@ class FsUIPipeline:
elif message.type == gst.MESSAGE_ELEMENT:
if message.structure.has_name("dtmf-event"):
print "dtmf-event: %d" % message.structure["number"]
- elif message.structure.has_name("farsight-local-candidates-prepared"):
+ elif message.structure.has_name("farstream-local-candidates-prepared"):
message.structure["stream"].uistream.local_candidates_prepared()
- elif message.structure.has_name("farsight-new-local-candidate"):
+ elif message.structure.has_name("farstream-new-local-candidate"):
message.structure["stream"].uistream.new_local_candidate(
message.structure["candidate"])
- elif message.structure.has_name("farsight-codecs-changed"):
+ elif message.structure.has_name("farstream-codecs-changed"):
print message.src.get_name(), ": ", message.structure.get_name()
message.structure["session"].uisession.codecs_changed()
if AUDIO and message.structure["session"] == self.audiosession.fssession:
self.codecs_changed_audio()
if VIDEO and message.structure["session"] == self.videosession.fssession:
self.codecs_changed_video()
- elif message.structure.has_name("farsight-send-codec-changed"):
+ elif message.structure.has_name("farstream-send-codec-changed"):
print message.src.get_name(), ": ", message.structure.get_name()
print "send codec changed: " + message.structure["codec"].to_string()
if AUDIO and message.structure["session"] == self.audiosession.fssession:
self.codecs_changed_audio()
if VIDEO and message.structure["session"] == self.videosession.fssession:
self.codecs_changed_video()
- elif message.structure.has_name("farsight-recv-codecs-changed"):
+ elif message.structure.has_name("farstream-recv-codecs-changed"):
print message.src.get_name(), ": ", message.structure.get_name()
message.structure["stream"].uistream.recv_codecs_changed( \
message.structure["codecs"])
- elif message.structure.has_name("farsight-error"):
+ elif message.structure.has_name("farstream-error"):
print "Async error ("+ str(message.structure["error-no"]) +"): " + message.structure["error-msg"]
else:
print message.src.get_name(), ": ", message.structure.get_name()
@@ -302,7 +302,7 @@ class FsUIVideoSource(FsUISource):
"A Video source"
def get_type(self):
- return farsight.MEDIA_TYPE_VIDEO
+ return farstream.MEDIA_TYPE_VIDEO
def make_source(self):
bin = gst.Bin()
@@ -338,7 +338,7 @@ class FsUIAudioSource(FsUISource):
"An audio source"
def get_type(self):
- return farsight.MEDIA_TYPE_AUDIO
+ return farstream.MEDIA_TYPE_AUDIO
def make_source(self):
source = gst.element_factory_make("audiotestsrc")
@@ -359,48 +359,48 @@ class FsUISession:
self.streams = []
self.fssession = conference.new_session(source.get_type())
self.fssession.uisession = self
- if source.get_type() == farsight.MEDIA_TYPE_VIDEO:
+ if source.get_type() == farstream.MEDIA_TYPE_VIDEO:
# We prefer H263-1998 because we know it works
# We don't know if the others do work
# We know H264 doesn't work for now or anything else
# that needs to send config data
self.fssession.set_codec_preferences( [ \
- farsight.Codec(farsight.CODEC_ID_ANY,
+ farstream.Codec(farstream.CODEC_ID_ANY,
"THEORA",
- farsight.MEDIA_TYPE_VIDEO,
+ farstream.MEDIA_TYPE_VIDEO,
90000),
- farsight.Codec(farsight.CODEC_ID_ANY,
+ farstream.Codec(farstream.CODEC_ID_ANY,
"H264",
- farsight.MEDIA_TYPE_VIDEO,
+ farstream.MEDIA_TYPE_VIDEO,
0),
- farsight.Codec(farsight.CODEC_ID_ANY,
+ farstream.Codec(farstream.CODEC_ID_ANY,
"H263-1998",
- farsight.MEDIA_TYPE_VIDEO,
+ farstream.MEDIA_TYPE_VIDEO,
0),
- farsight.Codec(farsight.CODEC_ID_ANY,
+ farstream.Codec(farstream.CODEC_ID_ANY,
"H263",
- farsight.MEDIA_TYPE_VIDEO,
+ farstream.MEDIA_TYPE_VIDEO,
0)
])
- elif source.get_type() == farsight.MEDIA_TYPE_AUDIO:
+ elif source.get_type() == farstream.MEDIA_TYPE_AUDIO:
self.fssession.set_codec_preferences( [ \
- farsight.Codec(farsight.CODEC_ID_ANY,
+ farstream.Codec(farstream.CODEC_ID_ANY,
"PCMA",
- farsight.MEDIA_TYPE_AUDIO,
+ farstream.MEDIA_TYPE_AUDIO,
0),
- farsight.Codec(farsight.CODEC_ID_ANY,
+ farstream.Codec(farstream.CODEC_ID_ANY,
"PCMU",
- farsight.MEDIA_TYPE_AUDIO,
+ farstream.MEDIA_TYPE_AUDIO,
0),
# The gst speexenc element breaks timestamps
- farsight.Codec(farsight.CODEC_ID_DISABLE,
+ farstream.Codec(farstream.CODEC_ID_DISABLE,
"SPEEX",
- farsight.MEDIA_TYPE_AUDIO,
+ farstream.MEDIA_TYPE_AUDIO,
16000),
# Sadly, vorbis is not currently compatible with live streaming :-(
- farsight.Codec(farsight.CODEC_ID_DISABLE,
+ farstream.Codec(farstream.CODEC_ID_DISABLE,
"VORBIS",
- farsight.MEDIA_TYPE_AUDIO,
+ farstream.MEDIA_TYPE_AUDIO,
0),
])
@@ -418,14 +418,14 @@ class FsUISession:
transmitter_params = {}
# If its video, we start at port 9078, to make it more easy
# to differentiate it in a tcpdump log
- if self.source.get_type() == farsight.MEDIA_TYPE_VIDEO and \
+ if self.source.get_type() == farstream.MEDIA_TYPE_VIDEO and \
TRANSMITTER == "rawudp":
- cand = farsight.Candidate()
- cand.component_id = farsight.COMPONENT_RTP
+ cand = farstream.Candidate()
+ cand.component_id = farstream.COMPONENT_RTP
cand.port = 9078
transmitter_params["preferred-local-candidates"] = [cand]
realstream = self.fssession.new_stream(participant.fsparticipant,
- farsight.DIRECTION_BOTH,
+ farstream.DIRECTION_BOTH,
TRANSMITTER, transmitter_params)
stream = FsUIStream(id, self, participant, realstream)
self.streams.append(weakref.ref(stream, self.__stream_finalized))
@@ -433,9 +433,9 @@ class FsUISession:
def dtmf_start(self, event, method):
if (event == "*"):
- event = farsight.DTMF_EVENT_STAR
+ event = farstream.DTMF_EVENT_STAR
elif (event == "#"):
- event = farsight.DTMF_EVENT_POUND
+ event = farstream.DTMF_EVENT_POUND
else:
event = int(event)
self.fssession.start_telephony_event(event, 2, method)
@@ -490,7 +490,7 @@ class FsUIStream:
self.connect.send_candidate(self.participant.id, self.id, candidate)
def __src_pad_added(self, stream, pad, codec):
"Callback from FsStream"
- if self.session.source.get_type() == farsight.MEDIA_TYPE_VIDEO:
+ if self.session.source.get_type() == farstream.MEDIA_TYPE_VIDEO:
self.participant.link_video_sink(pad)
else:
self.participant.pipeline.link_audio_sink(pad)
@@ -586,13 +586,13 @@ class FsUIParticipant:
self.make_widget()
self.streams = {}
if VIDEO:
- self.streams[int(farsight.MEDIA_TYPE_VIDEO)] = \
+ self.streams[int(farstream.MEDIA_TYPE_VIDEO)] = \
pipeline.videosession.new_stream(
- int(farsight.MEDIA_TYPE_VIDEO), self)
+ int(farstream.MEDIA_TYPE_VIDEO), self)
if AUDIO:
- self.streams[int(farsight.MEDIA_TYPE_AUDIO)] = \
+ self.streams[int(farstream.MEDIA_TYPE_AUDIO)] = \
pipeline.audiosession.new_stream(
- int(farsight.MEDIA_TYPE_AUDIO), self)
+ int(farstream.MEDIA_TYPE_AUDIO), self)
def candidate(self, media, candidate):
"Callback for the network object."
@@ -861,9 +861,9 @@ class FsMainUI:
def dtmf_start(self, button):
if (self.dtmf_builder.get_object("dtmf_as_event").get_active()):
- self.dtmf_last_method = farsight.DTMF_METHOD_RTP_RFC4733
+ self.dtmf_last_method = farstream.DTMF_METHOD_RTP_RFC4733
elif (self.dtmf_builder.get_object("dtmf_as_sound").get_active()):
- self.dtmf_last_method = farsight.DTMF_METHOD_IN_BAND
+ self.dtmf_last_method = farstream.DTMF_METHOD_IN_BAND
else:
print "Invalid DTMF Method"
return
diff --git a/examples/gui/fs2_gui_net.py b/examples/gui/fs_gui_net.py
index c834d77..028d1ba 100644
--- a/examples/gui/fs2_gui_net.py
+++ b/examples/gui/fs_gui_net.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
-# Farsight 2 simple network signalling library for the demo GUI
+# Farstream simple network signalling library for the demo GUI
#
# Copyright (C) 2007 Collabora, Nokia
# @author: Olivier Crete <olivier.crete@collabora.co.uk>
@@ -21,7 +21,7 @@
#
#
-# This is the signalling code used by fs2-gui.py
+# This is the signalling code used by fs-gui.py
#
import sys, os, pwd, os.path
@@ -38,11 +38,11 @@ except ImportError, e:
raise SystemExit("Gst-Python couldn't be found! (%s)" % (e[0]))
try:
- import farsight
+ import farstream
except:
sys.path.append(os.path.join(os.path.dirname(__file__),
'..', '..', 'python', '.libs'))
- import farsight
+ import farstream
import gobject
@@ -181,7 +181,7 @@ class FsUIConnect:
candidate.password))
def __candidate_from_string(self, string):
- candidate = farsight.Candidate()
+ candidate = farstream.Candidate()
(candidate.foundation,
component_id,
candidate.ip,
@@ -222,7 +222,7 @@ class FsUIConnect:
for substring in string.split("\n"):
(start,end) = substring.split("|")
(id, encoding_name, media_type, clock_rate, channels) = start.split(" ")
- codec = farsight.Codec(int(id), encoding_name, int(media_type),
+ codec = farstream.Codec(int(id), encoding_name, int(media_type),
int(clock_rate))
codec.channels = int(channels)
if len(end):
@@ -381,7 +381,7 @@ if __name__ == "__main__":
self.pid = pid
self.id = id
self.connect = connect
- candidate = farsight.Candidate()
+ candidate = farstream.Candidate()
candidate.component_id = 1
connect.send_candidate(self.pid, self.id, candidate)
connect.send_candidates_done(self.pid, self.id)
@@ -392,7 +392,7 @@ if __name__ == "__main__":
def codecs(self, codecs):
if self.connect.myid != 1:
self.connect.send_codecs(1, self.id,
- [farsight.Codec(self.connect.myid,
+ [farstream.Codec(self.connect.myid,
"codec-name",
self.pid,
self.id)])
@@ -400,12 +400,12 @@ if __name__ == "__main__":
def send_local_codecs(self):
print "Send local codecs to %s for media %s" % (self.pid, self.id)
self.connect.send_codecs(self.pid, self.id,
- [farsight.Codec(self.connect.myid,
+ [farstream.Codec(self.connect.myid,
"local_codec",
self.pid,
self.id)])
def get_codecs(self):
- return [farsight.Codec(self.connect.myid,
+ return [farstream.Codec(self.connect.myid,
"nego-codecs",
self.pid,
self.id)]
diff --git a/farsight2.pc.in b/farstream.pc.in
index a35526e..c653523 100644
--- a/farsight2.pc.in
+++ b/farstream.pc.in
@@ -2,12 +2,12 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
-pluginsdir=@libdir@/farsight2-@FS2_MAJORMINOR@
+pluginsdir=@libdir@/farstream-@FS_MAJORMINOR@
-Name: Farsight2
-Description: Farsight2 base classes and utilities
+Name: Farstream
+Description: Farstream base classes and utilities
Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@
Version: @VERSION@
-Libs: -L${libdir} -lgstfarsight-@GST_MAJORMINOR@
+Libs: -L${libdir} -lfarstream-@FS_MAJORMINOR@
Cflags: -I${includedir}
diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am
index c8fa787..5078388 100644
--- a/gst-libs/gst/Makefile.am
+++ b/gst-libs/gst/Makefile.am
@@ -3,6 +3,6 @@
# plugins in the other directories.
# Also, the tag directory has to be built before the cdda directory.
SUBDIRS = \
- farsight
+ farstream
noinst_HEADERS =
diff --git a/gst-libs/gst/farsight/Makefile.am b/gst-libs/gst/farstream/Makefile.am
index 7f1259f..91445da 100644
--- a/gst-libs/gst/farsight/Makefile.am
+++ b/gst-libs/gst/farstream/Makefile.am
@@ -1,6 +1,6 @@
-libgstfarsightincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/farsight
+libgstfarstreamincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/farstream
-libgstfarsightinclude_HEADERS = \
+libgstfarstreaminclude_HEADERS = \
fs-candidate.h \
fs-codec.h \
fs-participant.h \
@@ -14,19 +14,19 @@ libgstfarsightinclude_HEADERS = \
fs-utils.h \
fs-rtp.h
-nodist_libgstfarsightinclude_HEADERS = \
+nodist_libgstfarstreaminclude_HEADERS = \
fs-enumtypes.h
-lib_LTLIBRARIES = libgstfarsight-@GST_MAJORMINOR@.la
+lib_LTLIBRARIES = libgstfarstream-@GST_MAJORMINOR@.la
BUILT_SOURCES = \
- $(nodist_libgstfarsight_@GST_MAJORMINOR@_la_SOURCES) \
- $(nodist_libgstfarsightinclude_HEADERS)
+ $(nodist_libgstfarstream_@GST_MAJORMINOR@_la_SOURCES) \
+ $(nodist_libgstfarstreaminclude_HEADERS)
CLEANFILES = $(BUILT_SOURCES) fs-marshal.list
-libgstfarsight_@GST_MAJORMINOR@_la_SOURCES = \
+libgstfarstream_@GST_MAJORMINOR@_la_SOURCES = \
fs-candidate.c \
fs-codec.c \
fs-participant.c \
@@ -41,16 +41,16 @@ libgstfarsight_@GST_MAJORMINOR@_la_SOURCES = \
fs-rtp.c \
fs-private.h
-nodist_libgstfarsight_@GST_MAJORMINOR@_la_SOURCES = \
+nodist_libgstfarstream_@GST_MAJORMINOR@_la_SOURCES = \
fs-marshal.c \
fs-marshal.h \
fs-enumtypes.c
-fs-marshal.list: $(libgstfarsight_@GST_MAJORMINOR@_la_SOURCES) Makefile.am
+fs-marshal.list: $(libgstfarstream_@GST_MAJORMINOR@_la_SOURCES) Makefile.am
$(AM_V_GEN) ( cd $(srcdir) && \
sed -n -e 's/.*_fs_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
- $(libgstfarsight_@GST_MAJORMINOR@_la_SOURCES) ) \
+ $(libgstfarstream_@GST_MAJORMINOR@_la_SOURCES) ) \
| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
@if cmp -s $@.tmp $@; then \
rm $@.tmp; \
@@ -59,18 +59,18 @@ fs-marshal.list: $(libgstfarsight_@GST_MAJORMINOR@_la_SOURCES) Makefile.am
mv $@.tmp $@; \
fi
-libgstfarsight_@GST_MAJORMINOR@_la_CFLAGS = \
- $(FS2_INTERNAL_CFLAGS) $(FS2_CFLAGS) \
+libgstfarstream_@GST_MAJORMINOR@_la_CFLAGS = \
+ $(FS_INTERNAL_CFLAGS) $(FS_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) \
$(GST_CFLAGS)
-libgstfarsight_@GST_MAJORMINOR@_la_LIBADD = \
+libgstfarstream_@GST_MAJORMINOR@_la_LIBADD = \
$(GST_BASE_LIBS) \
$(GST_LIBS)
-libgstfarsight_@GST_MAJORMINOR@_la_LDFLAGS = \
- $(FS2_LIB_LDFLAGS) \
- $(FS2_ALL_LDFLAGS) \
- $(FS2_LT_LDFLAGS)
+libgstfarstream_@GST_MAJORMINOR@_la_LDFLAGS = \
+ $(FS_LIB_LDFLAGS) \
+ $(FS_ALL_LDFLAGS) \
+ $(FS_LT_LDFLAGS)
public_headers = fs-candidate.h \
@@ -91,22 +91,22 @@ include $(top_srcdir)/common-modified/gst-glib-gen.mak
if HAVE_INTROSPECTION
include $(INTROSPECTION_MAKEFILE)
introspection_sources = \
- $(libgstfarsight_@GST_MAJORMINOR@_la_SOURCES) \
- $(nodist_libgstfarsightinclude_HEADERS) \
- $(libgstfarsightinclude_HEADERS)
-
-INTROSPECTION_GIRS = Farsight-0.0.gir
-Farsight_0_0_gir_NAMESPACE = Farsight
-Farsight_0_0_gir_VERSION = 0.0
-Farsight_0_0_gir_LIBS = libgstfarsight-@GST_MAJORMINOR@.la
-Farsight_0_0_gir_FILES = $(introspection_sources)
-Farsight_0_0_gir_INCLUDES = GObject-2.0 Gst-0.10
-Farsight_0_0_gir_CFLAGS = $(FS2_INTERNAL_CFLAGS)
-Farsight_0_0_gir_SCANNERFLAGS = --identifier-prefix=fs_ --identifier-prefix=Fs
+ $(libgstfarstream_@GST_MAJORMINOR@_la_SOURCES) \
+ $(nodist_libgstfarstreaminclude_HEADERS) \
+ $(libgstfarstreaminclude_HEADERS)
+
+INTROSPECTION_GIRS = Farstream-@FS_MAJORMINOR@.gir
+Farstream_0_1_gir_NAMESPACE = Farstream
+Farstream_0_1_gir_VERSION = @FS_MAJORMINOR@
+Farstream_0_1_gir_LIBS = libgstfarstream-@GST_MAJORMINOR@.la
+Farstream_0_1_gir_FILES = $(introspection_sources)
+Farstream_0_1_gir_INCLUDES = GObject-2.0 Gst-0.10
+Farstream_0_1_gir_CFLAGS = $(FS_INTERNAL_CFLAGS)
+Farstream_0_1_gir_SCANNERFLAGS = --identifier-prefix=fs_ --identifier-prefix=Fs
girdir = $(datadir)/gir-1.0
-dist_gir_DATA = Farsight-0.0.gir
+dist_gir_DATA = Farstream-@FS_MAJORMINOR@.gir
typelibdir = $(libdir)/girepository-1.0
-typelib_DATA = Farsight-0.0.typelib
+typelib_DATA = Farstream-@FS_MAJORMINOR@.typelib
CLEANFILES += $(dist_gir_DATA) $(typelib_DATA)
endif
diff --git a/gst-libs/gst/farsight/fs-candidate.c b/gst-libs/gst/farstream/fs-candidate.c
index f2a72a1..8cb8db7 100644
--- a/gst-libs/gst/farsight/fs-candidate.c
+++ b/gst-libs/gst/farstream/fs-candidate.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight Candidate
+ * Farstream - Farstream Candidate
*
* Copyright 2007 Collabora Ltd.
* @author: Philippe Kalaf <philippe.kalaf@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-candidate.c - A Farsight candidate
+ * fs-candidate.c - A Farstream candidate
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -33,7 +33,7 @@
* @short_description: Structure describing a transport candidate.
*
* An FsCandidate is a way to exchange candidate information between the client
- * and Farsight. This description is compatible with ICE-13. It can also be a
+ * and Farstream. This description is compatible with ICE-13. It can also be a
* multicast address. Candidates are linked to streams. The information
* specified in this structure is usually representative of the codec
* information exchanged in the signaling.
diff --git a/gst-libs/gst/farsight/fs-candidate.h b/gst-libs/gst/farstream/fs-candidate.h
index 8e33963..e5fa45f 100644
--- a/gst-libs/gst/farsight/fs-candidate.h
+++ b/gst-libs/gst/farstream/fs-candidate.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight Candidate
+ * Farstream - Farstream Candidate
*
* Copyright 2007 Collabora Ltd.
* @author: Philippe Kalaf <philippe.kalaf@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-candidate.h - A Farsight candidate
+ * fs-candidate.h - A Farstream candidate
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/gst-libs/gst/farsight/fs-codec.c b/gst-libs/gst/farstream/fs-codec.c
index 9d15359..3306ca9 100644
--- a/gst-libs/gst/farsight/fs-codec.c
+++ b/gst-libs/gst/farstream/fs-codec.c
@@ -1,5 +1,5 @@
/*
- * Farsight2 - Farsight Codec
+ * Farstream - Farstream Codec
*
* Copyright 2007 Collabora Ltd.
* @author: Philippe Kalaf <philippe.kalaf@collabora.co.uk>
@@ -8,7 +8,7 @@
* Copyright 2005 Collabora Ltd.
* @author: Rob Taylor <rob.taylor@collabora.co.uk>
*
- * fs-codec.c - A Farsight codec
+ * fs-codec.c - A Farstream codec
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -42,7 +42,7 @@
* @short_description: Structure representing a media codec
*
* An #FsCodec is a way to exchange codec information between the client and
- * Farsight. The information specified in this structure is usually
+ * Farstream. The information specified in this structure is usually
* representative of the codec information exchanged in the signaling.
*
*/
@@ -501,7 +501,7 @@ fs_media_type_to_string (FsMediaType media_type)
/**
* fs_codec_to_string
- * @codec: A farsight codec
+ * @codec: A farstream codec
*
* Returns a newly-allocated string representing the codec
*
diff --git a/gst-libs/gst/farsight/fs-codec.h b/gst-libs/gst/farstream/fs-codec.h
index ccb0612..978fa00 100644
--- a/gst-libs/gst/farsight/fs-codec.h
+++ b/gst-libs/gst/farstream/fs-codec.h
@@ -1,5 +1,5 @@
/*
- * Farsight2 - Farsight Codec
+ * Farstream - Farstream Codec
*
* Copyright 2007 Collabora Ltd.
* @author: Philippe Kalaf <philippe.kalaf@collabora.co.uk>
@@ -8,7 +8,7 @@
* Copyright 2005 Collabora Ltd.
* @author: Rob Taylor <rob.taylor@collabora.co.uk>
*
- * fs-codec.h - A Farsight codec
+ * fs-codec.h - A Farstream codec
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/gst-libs/gst/farsight/fs-conference.c b/gst-libs/gst/farstream/fs-conference.c
index 50360ea..fd20a1c 100644
--- a/gst-libs/gst/farsight/fs-conference.c
+++ b/gst-libs/gst/farstream/fs-conference.c
@@ -1,12 +1,12 @@
/*
- * Farsight2 - GStreamer interfaces
+ * Farstream - GStreamer interfaces
*
* Copyright 2007-2011 Collabora Ltd.
* @author: Philippe Kalaf <philippe.kalaf@collabora.co.uk>
* @author: Olivier Crete <olivier.crete@collabora.com>
* Copyright 2007-2011 Nokia Corp.
*
- * fs-conference.c - GStreamer interface to be implemented by farsight
+ * fs-conference.c - GStreamer interface to be implemented by farstream
* conference elements
*
* This library is free software; you can redistribute it and/or
@@ -34,17 +34,17 @@
/**
* SECTION:fs-conference
- * @short_description: Interface for farsight conference elements
+ * @short_description: Interface for farstream conference elements
*
- * A Farsight conference is a conversation space that takes place between 2 or
- * more participants. Each conference must have one or more Farsight sessions
+ * A Farstream conference is a conversation space that takes place between 2 or
+ * more participants. Each conference must have one or more Farstream sessions
* that are associated to the conference participants.
*
*
* This will communicate asynchronous events to the user through #GstMessage
* of type #GST_MESSAGE_ELEMENT sent over the #GstBus.
* </para>
- * <refsect2><title>The "<literal>farsight-error</literal>" message</title>
+ * <refsect2><title>The "<literal>farstream-error</literal>" message</title>
* |[
* "src-object" #GObject The object (#FsConference, #FsSession or #FsStream) that emitted the error
* "error-no" #FsError The Error number
@@ -77,7 +77,7 @@ void
_fs_conference_init_debug (void)
{
GST_DEBUG_CATEGORY_INIT (fs_conference_debug, "fsconference", 0,
- "farsight base conference library");
+ "farstream base conference library");
}
static void
@@ -110,7 +110,7 @@ fs_conference_error (GObject *signal_src,
GstMessage *gst_msg = NULL;
GstStructure *error_struct = NULL;
- error_struct = gst_structure_new ("farsight-error",
+ error_struct = gst_structure_new ("farstream-error",
"src-object", G_TYPE_OBJECT, error_src,
"error-no", FS_TYPE_ERROR, error_no,
"error-msg", G_TYPE_STRING, error_msg,
@@ -128,7 +128,7 @@ fs_conference_error (GObject *signal_src,
* @media_type: #FsMediaType of the new session
* @error: location of a #GError, or %NULL if no error occured
*
- * Create a new Farsight session for the given conference.
+ * Create a new Farstream session for the given conference.
*
* Returns: (transfer full): the new #FsSession that has been created.
* The #FsSession must be unref'd by the user when closing the session.
@@ -164,7 +164,7 @@ fs_conference_new_session (FsConference *conf,
* @conference: #FsConference interface of a #GstElement
* @error: location of a #GError, or %NULL if no error occured
*
- * Create a new Farsight Participant for the type of the given conference.
+ * Create a new Farstream Participant for the type of the given conference.
*
* Returns: (transfer full): the new #FsParticipant that has been created.
* The #FsParticipant is owned by the user and he must unref it when he is
diff --git a/gst-libs/gst/farsight/fs-conference.h b/gst-libs/gst/farstream/fs-conference.h
index d220690..57652ff 100644
--- a/gst-libs/gst/farsight/fs-conference.h
+++ b/gst-libs/gst/farstream/fs-conference.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - FsConference Class
+ * Farstream - FsConference Class
*
* Copyright 2007 Collabora Ltd.
* @author: Philippe Kalaf <philippe.kalaf@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-conference.h - Header file for farsight Conference base class
+ * fs-conference.h - Header file for farstream Conference base class
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -27,9 +27,9 @@
#include <gst/gst.h>
-#include <gst/farsight/fs-session.h>
-#include <gst/farsight/fs-codec.h>
-#include <gst/farsight/fs-enumtypes.h>
+#include <gst/farstream/fs-session.h>
+#include <gst/farstream/fs-codec.h>
+#include <gst/farstream/fs-enumtypes.h>
G_BEGIN_DECLS
@@ -106,7 +106,7 @@ GType fs_conference_get_type (void);
* It is a fatal error.
* @FS_ERROR_INVALID_ARGUMENTS: Invalid arguments to the function, this
* is a programming error and should not be reported to the user
- * @FS_ERROR_INTERNAL: An internal error happened in Farsight, it may be in
+ * @FS_ERROR_INTERNAL: An internal error happened in Farstream, it may be in
* an inconsistent state. The object from which this error comes should be
* discarded.
* @FS_ERROR_NETWORK: A network related error, this should probably be
@@ -149,7 +149,7 @@ typedef enum _FsError
/**
* FS_ERROR:
*
- * This quark is used to denote errors coming from Farsight objects
+ * This quark is used to denote errors coming from Farstream objects
*/
#define FS_ERROR (fs_error_quark ())
diff --git a/gst-libs/gst/farsight/fs-element-added-notifier.c b/gst-libs/gst/farstream/fs-element-added-notifier.c
index 54cf931..beac34e 100644
--- a/gst-libs/gst/farsight/fs-element-added-notifier.c
+++ b/gst-libs/gst/farstream/fs-element-added-notifier.c
@@ -1,5 +1,5 @@
/*
- * Farsight2 - Recursive element addition notifier
+ * Farstream - Recursive element addition notifier
*
* Copyright 2007-2008 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
diff --git a/gst-libs/gst/farsight/fs-element-added-notifier.h b/gst-libs/gst/farstream/fs-element-added-notifier.h
index 79fcbdc..f45e010 100644
--- a/gst-libs/gst/farsight/fs-element-added-notifier.h
+++ b/gst-libs/gst/farstream/fs-element-added-notifier.h
@@ -1,5 +1,5 @@
/*
- * Farsight2 - Recursive element addition notifier
+ * Farstream - Recursive element addition notifier
*
* Copyright 2007-2008 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
diff --git a/gst-libs/gst/farsight/fs-participant.c b/gst-libs/gst/farstream/fs-participant.c
index 269e7d6..d8aaf33 100644
--- a/gst-libs/gst/farsight/fs-participant.c
+++ b/gst-libs/gst/farstream/fs-participant.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight Participant
+ * Farstream - Farstream Participant
*
* Copyright 2007 Collabora Ltd.
* @author: Philippe Kalaf <philippe.kalaf@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-participant.c - A Farsight Participant gobject (base implementation)
+ * fs-participant.c - A Farstream Participant gobject (base implementation)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -26,8 +26,8 @@
* SECTION:fs-participant
* @short_description: A participant in a conference
*
- * This object is the base implementation of a Farsight Participant. It needs to be
- * derived and implemented by a farsight conference gstreamer element. A
+ * This object is the base implementation of a Farstream Participant. It needs to be
+ * derived and implemented by a farstream conference gstreamer element. A
* participant represents any source of media in a conference. This could be a
* human-participant or an automaton.
*/
diff --git a/gst-libs/gst/farsight/fs-participant.h b/gst-libs/gst/farstream/fs-participant.h
index eae3060..9ca48f8 100644
--- a/gst-libs/gst/farsight/fs-participant.h
+++ b/gst-libs/gst/farstream/fs-participant.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight Participant
+ * Farstream - Farstream Participant
*
* Copyright 2007 Collabora Ltd.
* @author: Philippe Kalaf <philippe.kalaf@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-participant.h - A Farsight Participant gobject (base implementation)
+ * fs-participant.h - A Farstream Participant gobject (base implementation)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/gst-libs/gst/farsight/fs-plugin.c b/gst-libs/gst/farstream/fs-plugin.c
index a972c49..423cf71 100644
--- a/gst-libs/gst/farsight/fs-plugin.c
+++ b/gst-libs/gst/farstream/fs-plugin.c
@@ -1,7 +1,7 @@
/*
- * fs-plugin.c - Source for farsight plugin infrastructure
+ * fs-plugin.c - Source for farstream plugin infrastructure
*
- * Farsight Voice+Video library
+ * Farstream Voice+Video library
* Copyright (c) 2005 INdT.
* @author Andre Moreira Magalhaes <andre.magalhaes@indt.org.br>
* Copyright 2005-2007 Collabora Ltd.
@@ -40,7 +40,7 @@
/**
* SECTION:fs-plugin
- * @short_description: A class for defining Farsight plugins
+ * @short_description: A class for defining Farstream plugins
*
* This class is a generic class to load GType plugins based on their name.
* With this simple class, you can only have one type per plugin.
@@ -76,7 +76,7 @@ fs_plugin_search_path_init (void)
if (env == NULL)
{
search_paths = g_new (gchar *, 2);
- search_paths[0] = g_strdup (FS2_PLUGIN_PATH);
+ search_paths[0] = g_strdup (FS_PLUGIN_PATH);
search_paths[1] = NULL;
return;
}
@@ -84,7 +84,7 @@ fs_plugin_search_path_init (void)
{
gchar *path;
- path = g_strjoin (":", env, FS2_PLUGIN_PATH, NULL);
+ path = g_strjoin (":", env, FS_PLUGIN_PATH, NULL);
search_paths = g_strsplit (path, ":", -1);
g_free (path);
}
diff --git a/gst-libs/gst/farsight/fs-plugin.h b/gst-libs/gst/farstream/fs-plugin.h
index 0e6e0e7..c6d0a21 100644
--- a/gst-libs/gst/farsight/fs-plugin.h
+++ b/gst-libs/gst/farstream/fs-plugin.h
@@ -1,7 +1,7 @@
/*
- * fs-plugin.h - Header for farsight plugin infrastructure
+ * fs-plugin.h - Header for farstream plugin infrastructure
*
- * Farsight Voice+Video library
+ * Farstream Voice+Video library
* Copyright (c) 2005 INdT.
* @author: Andre Moreira Magalhaes <andre.magalhaes@indt.org.br>
* Copyright (c) 2005-2007 Collabora Ltd.
@@ -108,8 +108,8 @@ gchar **fs_plugin_list_available (const gchar *type_suffix);
* FS_INIT_PLUGIN:
* @type_register_func: A function that register a #GType and returns it
*
- * This macro is used to declare Farsight plugins and must be used once
- * in any farsight plugin.
+ * This macro is used to declare Farstream plugins and must be used once
+ * in any farstream plugin.
*/
#define FS_INIT_PLUGIN(type_register_func) \
diff --git a/gst-libs/gst/farsight/fs-private.h b/gst-libs/gst/farstream/fs-private.h
index a7cbf8d..6f96e16 100644
--- a/gst-libs/gst/farsight/fs-private.h
+++ b/gst-libs/gst/farstream/fs-private.h
@@ -1,12 +1,12 @@
/*
- * Farsight2 - Private declarations
+ * Farstream - Private declarations
*
* Copyright 2008 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2008 Nokia Corp.
*
* fs-conference.h - Header file for gstreamer interface to be
- * implemented by farsight conference elements
+ * implemented by farstream conference elements
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/gst-libs/gst/farsight/fs-rtp.c b/gst-libs/gst/farstream/fs-rtp.c
index 40ab738..c978670 100644
--- a/gst-libs/gst/farsight/fs-rtp.c
+++ b/gst-libs/gst/farstream/fs-rtp.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RTP specific types
+ * Farstream - Farstream RTP specific types
*
* Copyright 2011 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2011 Nokia Corp.
*
- * fs-rtp.c - Farsight RTP specific types
+ * fs-rtp.c - Farstream RTP specific types
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/gst-libs/gst/farsight/fs-rtp.h b/gst-libs/gst/farstream/fs-rtp.h
index 3ebe19f..07fb230 100644
--- a/gst-libs/gst/farsight/fs-rtp.h
+++ b/gst-libs/gst/farstream/fs-rtp.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RTP specific types
+ * Farstream - Farstream RTP specific types
*
* Copyright 2011 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2011 Nokia Corp.
*
- * fs-rtp.h - Farsight RTP specific types
+ * fs-rtp.h - Farstream RTP specific types
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -26,7 +26,7 @@
#define __FS_RTP_H__
#include <gst/gst.h>
-#include <gst/farsight/fs-stream.h>
+#include <gst/farstream/fs-stream.h>
G_BEGIN_DECLS
diff --git a/gst-libs/gst/farsight/fs-session.c b/gst-libs/gst/farstream/fs-session.c
index 062e0a2..59e50d6 100644
--- a/gst-libs/gst/farsight/fs-session.c
+++ b/gst-libs/gst/farstream/fs-session.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight Session
+ * Farstream - Farstream Session
*
* Copyright 2007 Collabora Ltd.
* @author: Philippe Kalaf <philippe.kalaf@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-session.c - A Farsight Session gobject (base implementation)
+ * fs-session.c - A Farstream Session gobject (base implementation)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -28,9 +28,9 @@
* SECTION:fs-session
* @short_description: A session in a conference
*
- * This object is the base implementation of a Farsight Session. It needs to be
- * derived and implemented by a farsight conference gstreamer element. A
- * Farsight session is defined in the same way as an RTP session. It can contain
+ * This object is the base implementation of a Farstream Session. It needs to be
+ * derived and implemented by a farstream conference gstreamer element. A
+ * Farstream session is defined in the same way as an RTP session. It can contain
* one or more participants but represents only one media stream (i.e. One
* session for video and one session for audio in an AV conference). Sessions
* contained in the same conference will be synchronised together during
@@ -40,7 +40,7 @@
* This will communicate asynchronous events to the user through #GstMessage
* of type #GST_MESSAGE_ELEMENT sent over the #GstBus.
* </para>
- * <refsect2><title>The "<literal>farsight-send-codec-changed</literal>"
+ * <refsect2><title>The "<literal>farstream-send-codec-changed</literal>"
* message</title>
* |[
* "session" #FsSession The session that emits the message
@@ -53,7 +53,7 @@
* #FsSession:current-send-codec property changes.
* </para>
* </refsect2>
- * <refsect2><title>The "<literal>farsight-codecs-changed</literal>"
+ * <refsect2><title>The "<literal>farstream-codecs-changed</literal>"
* message</title>
* |[
* "session" #FsSession The session that emits the message
@@ -228,7 +228,7 @@ fs_session_class_init (FsSessionClass *klass)
* If any configuration parameter needs to be discovered, this property
* will be %NULL until they have been discovered. One can always get
* the codecs from #FsSession:codecs-without-config.
- * The "farsight-codecs-changed" message will be emitted whenever the value
+ * The "farstream-codecs-changed" message will be emitted whenever the value
* of this property changes.
*
* It is a #GList of #FsCodec. User must free this codec list using
@@ -260,7 +260,7 @@ fs_session_class_init (FsSessionClass *klass)
* on a #FsStream in this session, when a #FsStream is destroyed or
* asynchronously when new config data is discovered.
*
- * The "farsight-codecs-changed" message will be emitted whenever the value
+ * The "farstream-codecs-changed" message will be emitted whenever the value
* of this property changes.
*
* It is a #GList of #FsCodec. User must free this codec list using
@@ -281,9 +281,9 @@ fs_session_class_init (FsSessionClass *klass)
*
* Indicates the currently active send codec. A user can change the active
* send codec by calling fs_session_set_send_codec(). The send codec could
- * also be automatically changed by Farsight. This property is an
+ * also be automatically changed by Farstream. This property is an
* #FsCodec. User must free the codec using fs_codec_destroy() when done.
- * The "farsight-send-codec-changed" message is emitted on the bus when
+ * The "farstream-send-codec-changed" message is emitted on the bus when
* the value of this property changes.
*/
g_object_class_install_property (gobject_class,
diff --git a/gst-libs/gst/farsight/fs-session.h b/gst-libs/gst/farstream/fs-session.h
index 05af5df..f6a618a 100644
--- a/gst-libs/gst/farsight/fs-session.h
+++ b/gst-libs/gst/farstream/fs-session.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight Session
+ * Farstream - Farstream Session
*
* Copyright 2007 Collabora Ltd.
* @author: Philippe Kalaf <philippe.kalaf@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-session.h - A Farsight Session gobject (base implementation)
+ * fs-session.h - A Farstream Session gobject (base implementation)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -28,9 +28,9 @@
#include <glib.h>
#include <glib-object.h>
-#include <gst/farsight/fs-stream.h>
-#include <gst/farsight/fs-participant.h>
-#include <gst/farsight/fs-codec.h>
+#include <gst/farstream/fs-stream.h>
+#include <gst/farstream/fs-participant.h>
+#include <gst/farstream/fs-codec.h>
G_BEGIN_DECLS
diff --git a/gst-libs/gst/farsight/fs-stream-transmitter.c b/gst-libs/gst/farstream/fs-stream-transmitter.c
index 402e62a..979a2eb 100644
--- a/gst-libs/gst/farsight/fs-stream-transmitter.c
+++ b/gst-libs/gst/farstream/fs-stream-transmitter.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight Stream Transmitter
+ * Farstream - Farstream Stream Transmitter
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-stream-transmitter.c - A Farsight Stream Transmitter gobject
+ * fs-stream-transmitter.c - A Farstream Stream Transmitter gobject
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -27,9 +27,9 @@
* @short_description: A stream transmitter object used to convey per-stream
* information to a transmitter.
*
- * This object is the base implementation of a Farsight Stream Transmitter.
- * It needs to be derived and implement by a Farsight transmitter.
- * A Farsight Stream transmitter is used to convery per-stream information
+ * This object is the base implementation of a Farstream Stream Transmitter.
+ * It needs to be derived and implement by a Farstream transmitter.
+ * A Farstream Stream transmitter is used to convery per-stream information
* to a transmitter, this is mostly local and remote candidates
*
*/
diff --git a/gst-libs/gst/farsight/fs-stream-transmitter.h b/gst-libs/gst/farstream/fs-stream-transmitter.h
index db18423..064255e 100644
--- a/gst-libs/gst/farsight/fs-stream-transmitter.h
+++ b/gst-libs/gst/farstream/fs-stream-transmitter.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight Stream Transmitter
+ * Farstream - Farstream Stream Transmitter
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-stream-transmitter.h - A Farsight Stream Transmitter (base implementation)
+ * fs-stream-transmitter.h - A Farstream Stream Transmitter (base implementation)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -27,7 +27,7 @@
#include <gst/gst.h>
-#include <gst/farsight/fs-candidate.h>
+#include <gst/farstream/fs-candidate.h>
G_BEGIN_DECLS
diff --git a/gst-libs/gst/farsight/fs-stream.c b/gst-libs/gst/farstream/fs-stream.c
index 60144fe..122b7a3 100644
--- a/gst-libs/gst/farsight/fs-stream.c
+++ b/gst-libs/gst/farstream/fs-stream.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight Stream
+ * Farstream - Farstream Stream
*
* Copyright 2007 Collabora Ltd.
* @author: Philippe Kalaf <philippe.kalaf@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-stream.c - A Farsight Stream gobject (base implementation)
+ * fs-stream.c - A Farstream Stream gobject (base implementation)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -26,9 +26,9 @@
* SECTION:fs-stream
* @short_description: A stream in a session in a conference
*
- * This object is the base implementation of a Farsight Stream. It
- * needs to be derived and implemented by a Farsight conference GStreamer
- * element. A Farsight Stream is a media stream originating from a
+ * This object is the base implementation of a Farstream Stream. It
+ * needs to be derived and implemented by a Farstream conference GStreamer
+ * element. A Farstream Stream is a media stream originating from a
* #FsParticipant inside a #FsSession. In fact, a #FsStream instance is
* obtained by adding a participant into a session using
* fs_session_new_stream().
@@ -37,7 +37,7 @@
* This will communicate asynchronous events to the user through #GstMessage
* of type #GST_MESSAGE_ELEMENT sent over the #GstBus.
* </para>
- * <refsect2><title>The "<literal>farsight-new-local-candidate</literal>" message</title>
+ * <refsect2><title>The "<literal>farstream-new-local-candidate</literal>" message</title>
* |[
* "stream" #FsStream The stream that emits the message
* "candidate" #FsCandidate The new candidate
@@ -46,7 +46,7 @@
* This message is emitted when a new local candidate is discovered.
* </para>
* </refsect2>
- * <refsect2><title>The "<literal>farsight-local-candidates-prepared</literal>" message</title>
+ * <refsect2><title>The "<literal>farstream-local-candidates-prepared</literal>" message</title>
* |[
* "stream" #FsStream The stream that emits the message
* ]|
@@ -55,7 +55,7 @@
* prepared, an ICE implementation would send its SDP offer or answer.
* </para>
* </refsect2>
- * <refsect2><title>The "<literal>farsight-new-active-candidate-pair</literal>" message</title>
+ * <refsect2><title>The "<literal>farstream-new-active-candidate-pair</literal>" message</title>
* |[
* "stream" #FsStream The stream that emits the message
* "local-candidate" #FsCandidate Local candidate being used
@@ -69,7 +69,7 @@
* outside the callback scope. This message is emitted once per component.
* </para>
* </refsect2>
- * <refsect2><title>The "<literal>farsight-recv-codecs-changed</literal>" message</title>
+ * <refsect2><title>The "<literal>farstream-recv-codecs-changed</literal>" message</title>
* |[
* "stream" #FsStream The stream that emits the message
* "codecs" #FsCodecGList A #GList of #FsCodec
@@ -83,7 +83,7 @@
* The list of new recv-codecs is included in the message
* </para>
* </refsect2>
- * <refsect2><title>The "<literal>farsight-component-state-changed</literal>" message</title>
+ * <refsect2><title>The "<literal>farstream-component-state-changed</literal>" message</title>
* |[
* "stream" #FsStream The stream that emits the message
* "component" #guint The component whose state changed
@@ -221,7 +221,7 @@ fs_stream_class_init (FsStreamClass *klass)
*
* This is the list of codecs that have been received by this stream.
* The user must free the list if fs_codec_list_destroy().
- * The "farsight-recv-codecs-changed" message is send on the #GstBus
+ * The "farstream-recv-codecs-changed" message is send on the #GstBus
* when the value of this property changes.
* It is normally emitted right after #FsStream::src-pad-added
* only if that codec was not previously received in this stream, but it can
diff --git a/gst-libs/gst/farsight/fs-stream.h b/gst-libs/gst/farstream/fs-stream.h
index ee9d026..762fc93 100644
--- a/gst-libs/gst/farsight/fs-stream.h
+++ b/gst-libs/gst/farstream/fs-stream.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight Stream
+ * Farstream - Farstream Stream
*
* Copyright 2007 Collabora Ltd.
* @author: Philippe Kalaf <philippe.kalaf@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-stream.h - A Farsight Stream (base implementation)
+ * fs-stream.h - A Farstream Stream (base implementation)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -28,8 +28,8 @@
#include <glib.h>
#include <glib-object.h>
-#include <gst/farsight/fs-candidate.h>
-#include <gst/farsight/fs-codec.h>
+#include <gst/farstream/fs-candidate.h>
+#include <gst/farstream/fs-codec.h>
G_BEGIN_DECLS
diff --git a/gst-libs/gst/farsight/fs-transmitter.c b/gst-libs/gst/farstream/fs-transmitter.c
index 73079e7..11c955c 100644
--- a/gst-libs/gst/farsight/fs-transmitter.c
+++ b/gst-libs/gst/farstream/fs-transmitter.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight Transmitter
+ * Farstream - Farstream Transmitter
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-transmitter.c - A Farsight Transmitter gobject (base implementation)
+ * fs-transmitter.c - A Farstream Transmitter gobject (base implementation)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -26,10 +26,10 @@
* SECTION:fs-transmitter
* @short_description: A transmitter object linked to a session
*
- * This object is the base implementation of a Farsight Transmitter.
- * It needs to be derived and implement by a Farsight transmitter. A
- * Farsight Transmitter provides a GStreamer network sink and source to be used
- * for the Farsight Session. It creates #FsStreamTransmitter objects which are
+ * This object is the base implementation of a Farstream Transmitter.
+ * It needs to be derived and implement by a Farstream transmitter. A
+ * Farstream Transmitter provides a GStreamer network sink and source to be used
+ * for the Farstream Session. It creates #FsStreamTransmitter objects which are
* used to set the different per-stream properties
*
*/
diff --git a/gst-libs/gst/farsight/fs-transmitter.h b/gst-libs/gst/farstream/fs-transmitter.h
index 3c96dd8..ecac6d4 100644
--- a/gst-libs/gst/farsight/fs-transmitter.h
+++ b/gst-libs/gst/farstream/fs-transmitter.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight Transmitter
+ * Farstream - Farstream Transmitter
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-transmitter.h - A Farsight Transmitter (base implementation)
+ * fs-transmitter.h - A Farstream Transmitter (base implementation)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -27,9 +27,9 @@
#include <gst/gst.h>
-#include <gst/farsight/fs-participant.h>
-#include <gst/farsight/fs-session.h>
-#include <gst/farsight/fs-stream-transmitter.h>
+#include <gst/farstream/fs-participant.h>
+#include <gst/farstream/fs-session.h>
+#include <gst/farstream/fs-stream-transmitter.h>
G_BEGIN_DECLS
diff --git a/gst-libs/gst/farsight/fs-utils.c b/gst-libs/gst/farstream/fs-utils.c
index 46d5c97..2bb1f76 100644
--- a/gst-libs/gst/farsight/fs-utils.c
+++ b/gst-libs/gst/farstream/fs-utils.c
@@ -1,5 +1,5 @@
/*
- * Farsight2 - Miscellaneous useful functions
+ * Farstream - Miscellaneous useful functions
*
* Copyright 2011 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
@@ -42,7 +42,7 @@ load_default_codec_preferences_from_path (const gchar *element_name,
GList *codec_prefs = NULL;
gchar *filename;
- filename = g_build_filename (path, PACKAGE, FS2_MAJORMINOR, element_name,
+ filename = g_build_filename (path, PACKAGE, FS_MAJORMINOR, element_name,
"default-codec-preferences", NULL);
codec_prefs = fs_codec_list_from_keyfile (filename, NULL);
g_free (filename);
@@ -121,7 +121,7 @@ fs_utils_get_default_element_properties (GstElement *element)
gchar *filename;
const gchar *factory_name = factory_name_from_element (element);
- filename = g_build_filename (PACKAGE, FS2_MAJORMINOR, factory_name,
+ filename = g_build_filename (PACKAGE, FS_MAJORMINOR, factory_name,
"default-element-properties", NULL);
file_loaded = g_key_file_load_from_data_dirs (keyfile, filename, NULL,
G_KEY_FILE_NONE, NULL);
@@ -219,7 +219,7 @@ load_default_rtp_hdrext_preferences_from_path (const gchar *element_name,
GList *rtp_hdrext_prefs = NULL;
gchar *filename;
- filename = g_build_filename (path, PACKAGE, FS2_MAJORMINOR, element_name,
+ filename = g_build_filename (path, PACKAGE, FS_MAJORMINOR, element_name,
"default-codec-preferences", NULL);
rtp_hdrext_prefs = fs_rtp_header_extension_list_from_keyfile (filename,
media_type, NULL);
diff --git a/gst-libs/gst/farsight/fs-utils.h b/gst-libs/gst/farstream/fs-utils.h
index 3a2ddf4..cf9c6ba 100644
--- a/gst-libs/gst/farsight/fs-utils.h
+++ b/gst-libs/gst/farstream/fs-utils.h
@@ -1,5 +1,5 @@
/*
- * Farsight2 - Miscellaneous useful functions
+ * Farstream - Miscellaneous useful functions
*
* Copyright 2011 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
@@ -27,7 +27,7 @@
#include <gst/gst.h>
-#include <gst/farsight/fs-codec.h>
+#include <gst/farstream/fs-codec.h>
G_BEGIN_DECLS
diff --git a/gst/Makefile.am b/gst/Makefile.am
index a6b6dbe..131ea27 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = $(FS2_PLUGINS_SELECTED)
-DIST_SUBDIRS = $(FS2_PLUGINS_ALL)
+SUBDIRS = $(FS_PLUGINS_SELECTED)
+DIST_SUBDIRS = $(FS_PLUGINS_ALL)
include $(top_srcdir)/common/parallel-subdirs.mak
diff --git a/gst/fsmsnconference/Makefile.am b/gst/fsmsnconference/Makefile.am
index d06813f..1d63281 100644
--- a/gst/fsmsnconference/Makefile.am
+++ b/gst/fsmsnconference/Makefile.am
@@ -23,8 +23,8 @@ noinst_HEADERS = \
AM_CFLAGS = \
- $(FS2_INTERNAL_CFLAGS) \
- $(FS2_CFLAGS) \
+ $(FS_INTERNAL_CFLAGS) \
+ $(FS_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_CFLAGS) \
$(NICE_CFLAGS)
@@ -38,8 +38,8 @@ libfsmsnconference_la_SOURCES = \
libfsmsnconference_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libfsmsnconference_la_LIBADD = \
libfsmsnconference-convenience.la \
- $(top_builddir)/gst-libs/gst/farsight/libgstfarsight-0.10.la \
- $(FS2_LIBS) \
+ $(top_builddir)/gst-libs/gst/farstream/libgstfarstream-0.10.la \
+ $(FS_LIBS) \
$(GST_BASE_LIBS) \
$(GST_LIBS) \
$(NICE_LIBS)
diff --git a/gst/fsmsnconference/fs-msn-cam-recv-conference.c b/gst/fsmsnconference/fs-msn-cam-recv-conference.c
index 970659c..b0cdb98 100644
--- a/gst/fsmsnconference/fs-msn-cam-recv-conference.c
+++ b/gst/fsmsnconference/fs-msn-cam-recv-conference.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight MSN Conference Implementation
+ * Farstream - Farstream MSN Conference Implementation
*
* Copyright 2007 Nokia Corp.
* Copyright 2007-2009 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
*
- * fs-msn-recv-conference.c - MSN implementation for Farsight Conference
+ * fs-msn-recv-conference.c - MSN implementation for Farstream Conference
* Gstreamer Elements
*
* This library is free software; you can redistribute it and/or
@@ -25,7 +25,7 @@
/**
* SECTION:element-fsmsncamrecvconference
- * @short_description: Farsight MSN Receive Conference Gstreamer Element
+ * @short_description: Farstream MSN Receive Conference Gstreamer Element
*
* This element implements the unidirection webcam feature found in various
* version of MSN Messenger (tm) and Windows Live Messenger (tm). This is
@@ -61,9 +61,9 @@ enum
static GstElementDetails fs_msn_cam_recv_conference_details =
{
- "Farsight MSN Reception Conference",
+ "Farstream MSN Reception Conference",
"Generic/Bin/MSN",
- "A Farsight MSN Reception Conference",
+ "A Farstream MSN Reception Conference",
"Richard Spiers <richard.spiers@gmail.com>, "
"Youness Alaoui <youness.alaoui@collabora.co.uk>, "
"Olivier Crete <olivier.crete@collabora.co.uk>"
diff --git a/gst/fsmsnconference/fs-msn-cam-recv-conference.h b/gst/fsmsnconference/fs-msn-cam-recv-conference.h
index c5ade9d..dcd4354 100644
--- a/gst/fsmsnconference/fs-msn-cam-recv-conference.h
+++ b/gst/fsmsnconference/fs-msn-cam-recv-conference.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight MSN Conference Implementation
+ * Farstream - Farstream MSN Conference Implementation
*
* Copyright 2007 Nokia Corp.
* Copyright 2007-2009 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
*
- * fs-msn-recv-conference.h - MSN implementation for Farsight Conference
+ * fs-msn-recv-conference.h - MSN implementation for Farstream Conference
* Gstreamer Elements
*
* This library is free software; you can redistribute it and/or
diff --git a/gst/fsmsnconference/fs-msn-cam-send-conference.c b/gst/fsmsnconference/fs-msn-cam-send-conference.c
index 24fbbf2..86c6dbf 100644
--- a/gst/fsmsnconference/fs-msn-cam-send-conference.c
+++ b/gst/fsmsnconference/fs-msn-cam-send-conference.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight MSN Conference Implementation
+ * Farstream - Farstream MSN Conference Implementation
*
* Copyright 2007 Nokia Corp.
* Copyright 2007-2009 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
*
- * fs-msn-send-conference.c - MSN implementation for Farsight Conference
+ * fs-msn-send-conference.c - MSN implementation for Farstream Conference
* Gstreamer Elements
*
* This library is free software; you can redistribute it and/or
@@ -25,7 +25,7 @@
/**
* SECTION:element-fsmsncamsendconference
- * @short_description: Farsight MSN send Conference Gstreamer Element
+ * @short_description: Farstream MSN send Conference Gstreamer Element
*
* This element implements the unidirection webcam feature found in various
* version of MSN Messenger (tm) and Windows Live Messenger (tm). This is
@@ -61,9 +61,9 @@ enum
static GstElementDetails fs_msn_cam_send_conference_details =
{
- "Farsight MSN Sending Conference",
+ "Farstream MSN Sending Conference",
"Generic/Bin/MSN",
- "A Farsight MSN Sending Conference",
+ "A Farstream MSN Sending Conference",
"Richard Spiers <richard.spiers@gmail.com>, "
"Youness Alaoui <youness.alaoui@collabora.co.uk>, "
"Olivier Crete <olivier.crete@collabora.co.uk>"
diff --git a/gst/fsmsnconference/fs-msn-cam-send-conference.h b/gst/fsmsnconference/fs-msn-cam-send-conference.h
index 3229c77..2c8897e 100644
--- a/gst/fsmsnconference/fs-msn-cam-send-conference.h
+++ b/gst/fsmsnconference/fs-msn-cam-send-conference.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight MSN Conference Implementation
+ * Farstream - Farstream MSN Conference Implementation
*
* Copyright 2007 Nokia Corp.
* Copyright 2007-2009 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
*
- * fs-msn-send-conference.h - MSN implementation for Farsight Conference
+ * fs-msn-send-conference.h - MSN implementation for Farstream Conference
* Gstreamer Elements
*
* This library is free software; you can redistribute it and/or
diff --git a/gst/fsmsnconference/fs-msn-conference.c b/gst/fsmsnconference/fs-msn-conference.c
index f2769fc..20e0dd8 100644
--- a/gst/fsmsnconference/fs-msn-conference.c
+++ b/gst/fsmsnconference/fs-msn-conference.c
@@ -1,12 +1,12 @@
/*
- * Farsight2 - Farsight MSN Conference Implementation
+ * Farstream - Farstream MSN Conference Implementation
*
* Copyright 2008 Richard Spiers <richard.spiers@gmail.com>
* Copyright 2007 Nokia Corp.
* Copyright 2007-2009 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
*
- * fs-msn-conference.c - MSN implementation for Farsight Conference Gstreamer
+ * fs-msn-conference.c - MSN implementation for Farstream Conference Gstreamer
* Elements
*
* This library is free software; you can redistribute it and/or
@@ -26,7 +26,7 @@
/**
* SECTION:fs-msn-conference
- * @short_description: Farsight MSN Conference Gstreamer Elements Base class
+ * @short_description: Farstream MSN Conference Gstreamer Elements Base class
*
* This element implements the unidirection webcam feature found in various
* version of MSN Messenger (tm) and Windows Live Messenger (tm).
@@ -110,7 +110,7 @@ static void
fs_msn_conference_do_init (GType type)
{
GST_DEBUG_CATEGORY_INIT (fsmsnconference_debug, "fsmsnconference", 0,
- "Farsight MSN Conference Element");
+ "Farstream MSN Conference Element");
}
static void
@@ -299,10 +299,10 @@ GST_PLUGIN_DEFINE (
GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"fsmsnconference",
- "Farsight MSN Conference plugin",
+ "Farstream MSN Conference plugin",
plugin_init,
VERSION,
"LGPL",
- "Farsight",
- "http://farsight.freedesktop.org/"
+ "Farstream",
+ "http://farstream.freedesktop.org/"
)
diff --git a/gst/fsmsnconference/fs-msn-conference.h b/gst/fsmsnconference/fs-msn-conference.h
index a9a88c8..51f0dff 100644
--- a/gst/fsmsnconference/fs-msn-conference.h
+++ b/gst/fsmsnconference/fs-msn-conference.h
@@ -1,12 +1,12 @@
/*
- * Farsight2 - Farsight MSN Conference Implementation
+ * Farstream - Farstream MSN Conference Implementation
*
* Copyright 2008 Richard Spiers <richard.spiers@gmail.com>
* Copyright 2007 Nokia Corp.
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
*
- * gstfsmsnconference.h - MSN implementation for Farsight Conference Gstreamer
+ * gstfsmsnconference.h - MSN implementation for Farstream Conference Gstreamer
* Elements
*
* This library is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
#ifndef __FS_MSN_CONFERENCE_H__
#define __FS_MSN_CONFERENCE_H__
-#include <gst/farsight/fs-conference.h>
+#include <gst/farstream/fs-conference.h>
G_BEGIN_DECLS
diff --git a/gst/fsmsnconference/fs-msn-connection.c b/gst/fsmsnconference/fs-msn-connection.c
index 529ed0a..2556fd5 100644
--- a/gst/fsmsnconference/fs-msn-connection.c
+++ b/gst/fsmsnconference/fs-msn-connection.c
@@ -1,5 +1,5 @@
/*
- * Farstream2 - Farstream MSN Connection
+ * Farstream - Farstream MSN Connection
*
* Copyright 2008 Richard Spiers <richard.spiers@gmail.com>
* Copyright 2007 Nokia Corp.
diff --git a/gst/fsmsnconference/fs-msn-connection.h b/gst/fsmsnconference/fs-msn-connection.h
index 566c9ef..766d510 100644
--- a/gst/fsmsnconference/fs-msn-connection.h
+++ b/gst/fsmsnconference/fs-msn-connection.h
@@ -1,5 +1,5 @@
/*
- * Farsight2 - Farsight MSN Stream
+ * Farstream - Farstream MSN Stream
*
* Copyright 2008 Richard Spiers <richard.spiers@gmail.com>
* Copyright 2007 Nokia Corp.
diff --git a/gst/fsmsnconference/fs-msn-participant.c b/gst/fsmsnconference/fs-msn-participant.c
index 9c952fb..16dba48 100644
--- a/gst/fsmsnconference/fs-msn-participant.c
+++ b/gst/fsmsnconference/fs-msn-participant.c
@@ -1,10 +1,10 @@
/*
- * Farsight2 - Farsight MSN Participant
+ * Farstream - Farstream MSN Participant
*
* @author: Richard Spiers <richard.spiers@gmail.com>
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
*
- * fs-msn-participant.c - A MSN Farsight Participant gobject
+ * fs-msn-participant.c - A MSN Farstream Participant gobject
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/gst/fsmsnconference/fs-msn-participant.h b/gst/fsmsnconference/fs-msn-participant.h
index bf1d016..1e5645d 100644
--- a/gst/fsmsnconference/fs-msn-participant.h
+++ b/gst/fsmsnconference/fs-msn-participant.h
@@ -1,10 +1,10 @@
/*
- * Farsight2 - Farsight MSN Participant
+ * Farstream - Farstream MSN Participant
*
* @author: Richard Spiers <richard.spiers@gmail.com>
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
*
- * fs-msn-participant.h - A Farsight MSN Participant gobject
+ * fs-msn-participant.h - A Farstream MSN Participant gobject
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -24,7 +24,7 @@
#ifndef __FS_MSN_PARTICIPANT_H__
#define __FS_MSN_PARTICIPANT_H__
-#include <gst/farsight/fs-participant.h>
+#include <gst/farstream/fs-participant.h>
G_BEGIN_DECLS
diff --git a/gst/fsmsnconference/fs-msn-session.c b/gst/fsmsnconference/fs-msn-session.c
index 3895957..3436b08 100644
--- a/gst/fsmsnconference/fs-msn-session.c
+++ b/gst/fsmsnconference/fs-msn-session.c
@@ -1,5 +1,5 @@
/*
- * Farsight2 - Farsight MSN Session
+ * Farstream - Farstream MSN Session
*
* Copyright 2008 Richard Spiers <richard.spiers@gmail.com>
* Copyright 2007 Nokia Corp.
@@ -7,7 +7,7 @@
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* @author: Youness Alaoui <youness.alaoui@collabora.co.uk>
*
- * fs-msn-session.c - A Farsight Msn Session gobject
+ * fs-msn-session.c - A Farstream Msn Session gobject
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/gst/fsmsnconference/fs-msn-session.h b/gst/fsmsnconference/fs-msn-session.h
index cb0188d..a6b073f 100644
--- a/gst/fsmsnconference/fs-msn-session.h
+++ b/gst/fsmsnconference/fs-msn-session.h
@@ -1,12 +1,12 @@
/*
- * Farsight2 - Farsight MSN Session
+ * Farstream - Farstream MSN Session
*
* Copyright 2008 Richard Spiers <richard.spiers@gmail.com>
* Copyright 2007 Nokia Corp.
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
*
- * fs-msn-session.h - A Farsight Msn Session gobject
+ * fs-msn-session.h - A Farstream Msn Session gobject
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -28,7 +28,7 @@
#include <gst/gst.h>
-#include <gst/farsight/fs-session.h>
+#include <gst/farstream/fs-session.h>
#include "fs-msn-conference.h"
diff --git a/gst/fsmsnconference/fs-msn-stream.c b/gst/fsmsnconference/fs-msn-stream.c
index 99c0f50..10dad02 100644
--- a/gst/fsmsnconference/fs-msn-stream.c
+++ b/gst/fsmsnconference/fs-msn-stream.c
@@ -1,5 +1,5 @@
/*
- * Farsight2 - Farsight MSN Stream
+ * Farstream - Farstream MSN Stream
*
* Copyright 2008 Richard Spiers <richard.spiers@gmail.com>
* Copyright 2007 Nokia Corp.
@@ -7,7 +7,7 @@
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* @author: Youness Alaoui <youness.alaoui@collabora.co.uk>
*
- * fs-msn-stream.c - A Farsight MSN Stream gobject
+ * fs-msn-stream.c - A Farstream MSN Stream gobject
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -467,7 +467,7 @@ _local_candidates_prepared (FsMsnConnection *connection,
gst_element_post_message (GST_ELEMENT (conference),
gst_message_new_element (GST_OBJECT (conference),
- gst_structure_new ("farsight-local-candidates-prepared",
+ gst_structure_new ("farstream-local-candidates-prepared",
"stream", FS_TYPE_STREAM, self,
NULL)));
@@ -488,7 +488,7 @@ _new_local_candidate (
gst_element_post_message (GST_ELEMENT (conference),
gst_message_new_element (GST_OBJECT (conference),
- gst_structure_new ("farsight-new-local-candidate",
+ gst_structure_new ("farstream-new-local-candidate",
"stream", FS_TYPE_STREAM, self,
"candidate", FS_TYPE_CANDIDATE, candidate,
NULL)));
@@ -520,7 +520,7 @@ _connected (
gst_element_post_message (GST_ELEMENT (conference),
gst_message_new_element (GST_OBJECT (conference),
- gst_structure_new ("farsight-component-state-changed",
+ gst_structure_new ("farstream-component-state-changed",
"stream", FS_TYPE_STREAM, self,
"component", G_TYPE_UINT, 1,
"state", FS_TYPE_STREAM_STATE, FS_STREAM_STATE_READY,
@@ -729,7 +729,7 @@ _connection_failed (FsMsnConnection *connection, FsMsnStream *self)
gst_element_post_message (GST_ELEMENT (conference),
gst_message_new_element (GST_OBJECT (conference),
- gst_structure_new ("farsight-component-state-changed",
+ gst_structure_new ("farstream-component-state-changed",
"stream", FS_TYPE_STREAM, self,
"component", G_TYPE_UINT, 1,
"state", FS_TYPE_STREAM_STATE, FS_STREAM_STATE_FAILED,
@@ -770,7 +770,7 @@ fs_msn_stream_add_remote_candidates (FsStream *stream, GList *candidates,
if (ret)
gst_element_post_message (GST_ELEMENT (conference),
gst_message_new_element (GST_OBJECT (conference),
- gst_structure_new ("farsight-component-state-changed",
+ gst_structure_new ("farstream-component-state-changed",
"stream", FS_TYPE_STREAM, self,
"component", G_TYPE_UINT, 1,
"state", FS_TYPE_STREAM_STATE, FS_STREAM_STATE_CONNECTING,
diff --git a/gst/fsmsnconference/fs-msn-stream.h b/gst/fsmsnconference/fs-msn-stream.h
index 4a05ff0..060e293 100644
--- a/gst/fsmsnconference/fs-msn-stream.h
+++ b/gst/fsmsnconference/fs-msn-stream.h
@@ -1,12 +1,12 @@
/*
- * Farsight2 - Farsight MSN Stream
+ * Farstream - Farstream MSN Stream
*
* Copyright 2008 Richard Spiers <richard.spiers@gmail.com>
* Copyright 2007 Nokia Corp.
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
*
- * fs-msn-stream.h - A Farsight MSN Stream
+ * fs-msn-stream.h - A Farstream MSN Stream
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -26,7 +26,7 @@
#ifndef __FS_MSN_STREAM_H__
#define __FS_MSN_STREAM_H__
-#include <gst/farsight/fs-stream.h>
+#include <gst/farstream/fs-stream.h>
#include "fs-msn-participant.h"
#include "fs-msn-session.h"
diff --git a/gst/fsrawconference/Makefile.am b/gst/fsrawconference/Makefile.am
index 1cfb5b3..e16d9e3 100644
--- a/gst/fsrawconference/Makefile.am
+++ b/gst/fsrawconference/Makefile.am
@@ -19,8 +19,8 @@ noinst_HEADERS = \
AM_CFLAGS = \
- $(FS2_INTERNAL_CFLAGS) \
- $(FS2_CFLAGS) \
+ $(FS_INTERNAL_CFLAGS) \
+ $(FS_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_CFLAGS)
@@ -31,8 +31,8 @@ libfsrawconference_la_SOURCES = fs-raw-conference-plugin.c
libfsrawconference_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libfsrawconference_la_LIBADD = \
libfsrawconference-convenience.la \
- $(top_builddir)/gst-libs/gst/farsight/libgstfarsight-0.10.la \
- $(FS2_LIBS) \
+ $(top_builddir)/gst-libs/gst/farstream/libgstfarstream-0.10.la \
+ $(FS_LIBS) \
$(GST_BASE_LIBS) \
$(GST_LIBS)
diff --git a/gst/fsrawconference/fs-raw-conference-plugin.c b/gst/fsrawconference/fs-raw-conference-plugin.c
index e99bb48..e5b5084 100644
--- a/gst/fsrawconference/fs-raw-conference-plugin.c
+++ b/gst/fsrawconference/fs-raw-conference-plugin.c
@@ -1,12 +1,12 @@
/*
- * Farsight2 - Farsight Raw Conference Implementation
+ * Farstream - Farstream Raw Conference Implementation
*
* Copyright 2007,2010 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* @author: Mike Ruprecht <mike.ruprecht@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * gstfsrawconference.c - Raw implementation for Farsight Conference Gstreamer
+ * gstfsrawconference.c - Raw implementation for Farstream Conference Gstreamer
* Elements
*
* This library is free software; you can redistribute it and/or
@@ -42,10 +42,10 @@ GST_PLUGIN_DEFINE (
GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"fsrawconference",
- "Farsight Raw Conference plugin",
+ "Farstream Raw Conference plugin",
plugin_init,
VERSION,
"LGPL",
- "Farsight",
- "http://farsight.freedesktop.org/"
+ "Farstream",
+ "http://farstream.freedesktop.org/"
)
diff --git a/gst/fsrawconference/fs-raw-conference.c b/gst/fsrawconference/fs-raw-conference.c
index 7d91896..cb31b17 100644
--- a/gst/fsrawconference/fs-raw-conference.c
+++ b/gst/fsrawconference/fs-raw-conference.c
@@ -1,5 +1,5 @@
/*
- * Farsight2 - Farsight Raw Conference Implementation
+ * Farstream - Farstream Raw Conference Implementation
*
* Copyright 2008 Richard Spiers <richard.spiers@gmail.com>
* Copyright 2007 Nokia Corp.
@@ -7,7 +7,7 @@
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* @author: Mike Ruprecht <mike.ruprecht@collabora.co.uk>
*
- * fs-raw-conference.c - Raw implementation for Farsight Conference Gstreamer
+ * fs-raw-conference.c - Raw implementation for Farstream Conference Gstreamer
* Elements
*
* This library is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
/**
* SECTION:element-fsrawconference
- * @short_description: Farsight Raw Conference Gstreamer Elements Base class
+ * @short_description: Farstream Raw Conference Gstreamer Elements Base class
*
* This element implements a raw content stream over which any Gstreamer
* content may travel.
@@ -117,7 +117,7 @@ static void
fs_raw_conference_do_init (GType type)
{
GST_DEBUG_CATEGORY_INIT (fsrawconference_debug, "fsrawconference", 0,
- "Farsight Raw Conference Element");
+ "Farstream Raw Conference Element");
}
static void
diff --git a/gst/fsrawconference/fs-raw-conference.h b/gst/fsrawconference/fs-raw-conference.h
index 8dc1963..b41b366 100644
--- a/gst/fsrawconference/fs-raw-conference.h
+++ b/gst/fsrawconference/fs-raw-conference.h
@@ -1,12 +1,12 @@
/*
- * Farsight2 - Farsight Raw Conference Implementation
+ * Farstream - Farstream Raw Conference Implementation
*
* Copyright 2007,2010 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* @author: Mike Ruprecht <mike.ruprecht@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * gstfsrawconference.h - Raw implementation for Farsight Conference Gstreamer
+ * gstfsrawconference.h - Raw implementation for Farstream Conference Gstreamer
* Elements
*
* This library is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
#ifndef __FS_RAW_CONFERENCE_H__
#define __FS_RAW_CONFERENCE_H__
-#include <gst/farsight/fs-conference.h>
+#include <gst/farstream/fs-conference.h>
G_BEGIN_DECLS
diff --git a/gst/fsrawconference/fs-raw-participant.c b/gst/fsrawconference/fs-raw-participant.c
index 5381998..0719121 100644
--- a/gst/fsrawconference/fs-raw-participant.c
+++ b/gst/fsrawconference/fs-raw-participant.c
@@ -1,12 +1,12 @@
/*
- * Farsight2 - Farsight Raw Participant
+ * Farstream - Farstream Raw Participant
*
* Copyright 2007,2010 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* @author: Mike Ruprecht <mike.ruprecht@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-raw-participant.c - A Raw Farsight Participant gobject
+ * fs-raw-participant.c - A Raw Farstream Participant gobject
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/gst/fsrawconference/fs-raw-participant.h b/gst/fsrawconference/fs-raw-participant.h
index 83c0995..5082ad7 100644
--- a/gst/fsrawconference/fs-raw-participant.h
+++ b/gst/fsrawconference/fs-raw-participant.h
@@ -1,12 +1,12 @@
/*
- * Farsight2 - Farsight Raw Participant
+ * Farstream - Farstream Raw Participant
*
* Copyright 2007,2010 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* @author: Mike Ruprecht <mike.ruprecht@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-raw-participant.h - A Farsight Raw Participant gobject
+ * fs-raw-participant.h - A Farstream Raw Participant gobject
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -26,7 +26,7 @@
#ifndef __FS_RAW_PARTICIPANT_H__
#define __FS_RAW_PARTICIPANT_H__
-#include <gst/farsight/fs-participant.h>
+#include <gst/farstream/fs-participant.h>
G_BEGIN_DECLS
diff --git a/gst/fsrawconference/fs-raw-session.c b/gst/fsrawconference/fs-raw-session.c
index f7ede97..c1692b0 100644
--- a/gst/fsrawconference/fs-raw-session.c
+++ b/gst/fsrawconference/fs-raw-session.c
@@ -1,5 +1,5 @@
/*
- * Farsight2 - Farsight Raw Session
+ * Farstream - Farstream Raw Session
*
* Copyright 2008 Richard Spiers <richard.spiers@gmail.com>
* Copyright 2007 Nokia Corp.
@@ -8,7 +8,7 @@
* @author: Youness Alaoui <youness.alaoui@collabora.co.uk>
* @author: Mike Ruprecht <mike.ruprecht@collabora.co.uk>
*
- * fs-raw-session.c - A Farsight Raw Session gobject
+ * fs-raw-session.c - A Farstream Raw Session gobject
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -46,7 +46,7 @@
#include <string.h>
#include <gst/gst.h>
-#include <gst/farsight/fs-transmitter.h>
+#include <gst/farstream/fs-transmitter.h>
#include "fs-raw-stream.h"
#include "fs-raw-participant.h"
@@ -895,7 +895,7 @@ _stream_remote_codecs_changed (FsRawStream *stream, GParamSpec *pspec,
g_object_notify (G_OBJECT (self), "current-send-codec");
gst_element_post_message (GST_ELEMENT (self->priv->conference),
gst_message_new_element (GST_OBJECT (self->priv->conference),
- gst_structure_new ("farsight-send-codec-changed",
+ gst_structure_new ("farstream-send-codec-changed",
"session", FS_TYPE_SESSION, self,
"codec", FS_TYPE_CODEC, codec,
"secondary-codecs", FS_TYPE_CODEC_LIST, NULL,
diff --git a/gst/fsrawconference/fs-raw-session.h b/gst/fsrawconference/fs-raw-session.h
index 135104d..2564872 100644
--- a/gst/fsrawconference/fs-raw-session.h
+++ b/gst/fsrawconference/fs-raw-session.h
@@ -1,5 +1,5 @@
/*
- * Farsight2 - Farsight Raw Session
+ * Farstream - Farstream Raw Session
*
* Copyright 2008 Richard Spiers <richard.spiers@gmail.com>
* Copyright 2007 Nokia Corp.
@@ -7,7 +7,7 @@
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* @author: Mike Ruprecht <mike.ruprecht@collabora.co.uk>
*
- * fs-raw-session.h - A Farsight Raw Session gobject
+ * fs-raw-session.h - A Farstream Raw Session gobject
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -29,7 +29,7 @@
#include <gst/gst.h>
-#include <gst/farsight/fs-session.h>
+#include <gst/farstream/fs-session.h>
#include "fs-raw-conference.h"
diff --git a/gst/fsrawconference/fs-raw-stream.c b/gst/fsrawconference/fs-raw-stream.c
index 5de159c..9b416b0 100644
--- a/gst/fsrawconference/fs-raw-stream.c
+++ b/gst/fsrawconference/fs-raw-stream.c
@@ -1,5 +1,5 @@
/*
- * Farsight2 - Farsight Raw Stream
+ * Farstream - Farstream Raw Stream
*
* Copyright 2008 Richard Spiers <richard.spiers@gmail.com>
* Copyright 2007 Nokia Corp.
@@ -8,7 +8,7 @@
* @author: Youness Alaoui <youness.alaoui@collabora.co.uk>
* @author: Mike Ruprecht <mike.ruprecht@collabora.co.uk>
*
- * fs-raw-stream.c - A Farsight Raw Stream gobject
+ * fs-raw-stream.c - A Farstream Raw Stream gobject
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -476,7 +476,7 @@ _local_candidates_prepared (FsStreamTransmitter *stream_transmitter,
gst_element_post_message (conf,
gst_message_new_element (GST_OBJECT (conf),
- gst_structure_new ("farsight-local-candidates-prepared",
+ gst_structure_new ("farstream-local-candidates-prepared",
"stream", FS_TYPE_STREAM, self,
NULL)));
@@ -499,7 +499,7 @@ _new_active_candidate_pair (
gst_element_post_message (conf,
gst_message_new_element (GST_OBJECT (conf),
- gst_structure_new ("farsight-new-active-candidate-pair",
+ gst_structure_new ("farstream-new-active-candidate-pair",
"stream", FS_TYPE_STREAM, self,
"local-candidate", FS_TYPE_CANDIDATE, local_candidate,
"remote-candidate", FS_TYPE_CANDIDATE, remote_candidate,
@@ -523,7 +523,7 @@ _new_local_candidate (
gst_element_post_message (conf,
gst_message_new_element (GST_OBJECT (conf),
- gst_structure_new ("farsight-new-local-candidate",
+ gst_structure_new ("farstream-new-local-candidate",
"stream", FS_TYPE_STREAM, self,
"candidate", FS_TYPE_CANDIDATE, candidate,
NULL)));
@@ -557,7 +557,7 @@ _state_changed (FsStreamTransmitter *stream_transmitter,
gst_element_post_message (conf,
gst_message_new_element (GST_OBJECT (conf),
- gst_structure_new ("farsight-component-state-changed",
+ gst_structure_new ("farstream-component-state-changed",
"stream", FS_TYPE_STREAM, self,
"component", G_TYPE_UINT, component,
"state", FS_TYPE_STREAM_STATE, state,
diff --git a/gst/fsrawconference/fs-raw-stream.h b/gst/fsrawconference/fs-raw-stream.h
index 4afa54d..730ed98 100644
--- a/gst/fsrawconference/fs-raw-stream.h
+++ b/gst/fsrawconference/fs-raw-stream.h
@@ -1,5 +1,5 @@
/*
- * Farsight2 - Farsight Raw Stream
+ * Farstream - Farstream Raw Stream
*
* Copyright 2008 Richard Spiers <richard.spiers@gmail.com>
* Copyright 2007 Nokia Corp.
@@ -7,7 +7,7 @@
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* @author: Mike Ruprecht <mike.ruprecht@collabora.co.uk>
*
- * fs-raw-stream.h - A Farsight Raw Stream
+ * fs-raw-stream.h - A Farstream Raw Stream
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -27,8 +27,8 @@
#ifndef __FS_RAW_STREAM_H__
#define __FS_RAW_STREAM_H__
-#include <gst/farsight/fs-stream.h>
-#include <gst/farsight/fs-stream-transmitter.h>
+#include <gst/farstream/fs-stream.h>
+#include <gst/farstream/fs-stream-transmitter.h>
#include "fs-raw-participant.h"
#include "fs-raw-session.h"
diff --git a/gst/fsrtpconference/Makefile.am b/gst/fsrtpconference/Makefile.am
index d0ccc05..55b3ac7 100644
--- a/gst/fsrtpconference/Makefile.am
+++ b/gst/fsrtpconference/Makefile.am
@@ -51,8 +51,8 @@ noinst_HEADERS = \
CLEANFILES = $(BUILT_SOURCES) fs-rtp-marshal.list
AM_CFLAGS = \
- $(FS2_INTERNAL_CFLAGS) \
- $(FS2_CFLAGS) \
+ $(FS_INTERNAL_CFLAGS) \
+ $(FS_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_CFLAGS)
@@ -62,15 +62,15 @@ libfsrtpconference_la_SOURCES = fs-rtp-conference-plugin.c
libfsrtpconference_la_LIBADD = \
libfsrtpconference-convenience.la \
- $(top_builddir)/gst-libs/gst/farsight/libgstfarsight-0.10.la \
- $(FS2_LIBS) \
+ $(top_builddir)/gst-libs/gst/farstream/libgstfarstream-0.10.la \
+ $(FS_LIBS) \
$(GST_PLUGINS_BASE_LIBS) \
$(GST_LIBS) \
-lgstrtp-@GST_MAJORMINOR@
libfsrtpconference_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-preferencesdir = $(datadir)/$(PACKAGE_TARNAME)/$(FS2_MAJORMINOR)/fsrtpconference
+preferencesdir = $(datadir)/$(PACKAGE_TARNAME)/$(FS_MAJORMINOR)/fsrtpconference
preferences_DATA = \
default-codec-preferences \
default-element-properties
diff --git a/gst/fsrtpconference/fs-rtp-bitrate-adapter.c b/gst/fsrtpconference/fs-rtp-bitrate-adapter.c
index 887109d..cbc6fe9 100644
--- a/gst/fsrtpconference/fs-rtp-bitrate-adapter.c
+++ b/gst/fsrtpconference/fs-rtp-bitrate-adapter.c
@@ -1,5 +1,5 @@
/*
- * Farsight Voice+Video library
+ * Farstream Voice+Video library
*
* Copyright 2011 Collabora Ltd,
* Copyright 2011 Nokia Corporation
@@ -121,7 +121,7 @@ fs_rtp_bitrate_adapter_base_init (gpointer klass)
"fsrtpbitrateadapter element");
gst_element_class_set_details_simple (gstelement_class,
- "Farsight RTP Video Bitrate adater",
+ "Farstream RTP Video Bitrate adater",
"Generic",
"Filter that can modify the resolution and framerate based"
" on the bitrate",
diff --git a/gst/fsrtpconference/fs-rtp-bitrate-adapter.h b/gst/fsrtpconference/fs-rtp-bitrate-adapter.h
index 046db75..9bf411e 100644
--- a/gst/fsrtpconference/fs-rtp-bitrate-adapter.h
+++ b/gst/fsrtpconference/fs-rtp-bitrate-adapter.h
@@ -1,5 +1,5 @@
/*
- * Farsight Voice+Video library
+ * Farstream Voice+Video library
*
* Copyright 2008 Collabora Ltd,
* Copyright 2008 Nokia Corporation
diff --git a/gst/fsrtpconference/fs-rtp-codec-cache.c b/gst/fsrtpconference/fs-rtp-codec-cache.c
index 73e03d9..00022bc 100644
--- a/gst/fsrtpconference/fs-rtp-codec-cache.c
+++ b/gst/fsrtpconference/fs-rtp-codec-cache.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RTP Discovered Codecs cache
+ * Farstream - Farstream RTP Discovered Codecs cache
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-rtp-codec-cache.c - A Farsight RTP Codec Caching gobject
+ * fs-rtp-codec-cache.c - A Farstream RTP Codec Caching gobject
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -35,7 +35,7 @@
#endif
#include <stdio.h>
-#include <gst/farsight/fs-conference.h>
+#include <gst/farstream/fs-conference.h>
#include "fs-rtp-conference.h"
@@ -100,13 +100,13 @@ get_codecs_cache_path (FsMediaType media_type) {
if (media_type == FS_MEDIA_TYPE_AUDIO) {
cache_path = g_strdup (g_getenv ("FS_AUDIO_CODECS_CACHE"));
if (cache_path == NULL) {
- cache_path = g_build_filename (g_get_user_cache_dir (), "farsight",
+ cache_path = g_build_filename (g_get_user_cache_dir (), "farstream",
"codecs.audio." HOST_CPU ".cache", NULL);
}
} else if (media_type == FS_MEDIA_TYPE_VIDEO) {
cache_path = g_strdup (g_getenv ("FS_VIDEO_CODECS_CACHE"));
if (cache_path == NULL) {
- cache_path = g_build_filename (g_get_user_cache_dir (), "farsight",
+ cache_path = g_build_filename (g_get_user_cache_dir (), "farstream",
"codecs.video." HOST_CPU ".cache", NULL);
}
} else {
diff --git a/gst/fsrtpconference/fs-rtp-codec-cache.h b/gst/fsrtpconference/fs-rtp-codec-cache.h
index 652c8cd..0f9d24a 100644
--- a/gst/fsrtpconference/fs-rtp-codec-cache.h
+++ b/gst/fsrtpconference/fs-rtp-codec-cache.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RTP Discovered Codecs cache
+ * Farstream - Farstream RTP Discovered Codecs cache
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-rtp-codec-cache.c - A Farsight RTP Codec Caching gobject
+ * fs-rtp-codec-cache.c - A Farstream RTP Codec Caching gobject
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/gst/fsrtpconference/fs-rtp-codec-negotiation.c b/gst/fsrtpconference/fs-rtp-codec-negotiation.c
index f1d8a09..4d7e0ce 100644
--- a/gst/fsrtpconference/fs-rtp-codec-negotiation.c
+++ b/gst/fsrtpconference/fs-rtp-codec-negotiation.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RTP Codec Negotiation
+ * Farstream - Farstream RTP Codec Negotiation
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-discover-codecs.h - A Farsight RTP Codec Negotiation
+ * fs-discover-codecs.h - A Farstream RTP Codec Negotiation
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -28,7 +28,7 @@
#include "fs-rtp-codec-negotiation.h"
-#include <gst/farsight/fs-rtp.h>
+#include <gst/farstream/fs-rtp.h>
#include <string.h>
@@ -38,8 +38,8 @@
#define GST_CAT_DEFAULT fsrtpconference_nego
-#define SEND_PROFILE_ARG "farsight-send-profile"
-#define RECV_PROFILE_ARG "farsight-recv-profile"
+#define SEND_PROFILE_ARG "farstream-send-profile"
+#define RECV_PROFILE_ARG "farstream-recv-profile"
static CodecAssociation *
@@ -237,7 +237,7 @@ codec_sdp_compare (FsCodec *local_codec, FsCodec *remote_codec)
* @blueprints: A #GList of #CodecBlueprints to validate the codecs agsint
* @codecs: a #GList of #FsCodec that represent the preferences
*
- * This function validates a GList of passed FarsightCodec structures
+ * This function validates a GList of passed FarstreamCodec structures
* against the valid discovered payloaders
* It removes all "invalid" codecs from the list, it modifies the list
* passed in as an argument.
diff --git a/gst/fsrtpconference/fs-rtp-codec-negotiation.h b/gst/fsrtpconference/fs-rtp-codec-negotiation.h
index bc65383..a34a23e 100644
--- a/gst/fsrtpconference/fs-rtp-codec-negotiation.h
+++ b/gst/fsrtpconference/fs-rtp-codec-negotiation.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RTP Codec Negotiation
+ * Farstream - Farstream RTP Codec Negotiation
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-discover-codecs.h - A Farsight RTP Codec Negotiation
+ * fs-discover-codecs.h - A Farstream RTP Codec Negotiation
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/gst/fsrtpconference/fs-rtp-codec-specific.c b/gst/fsrtpconference/fs-rtp-codec-specific.c
index 8e0997d..f29179d 100644
--- a/gst/fsrtpconference/fs-rtp-codec-specific.c
+++ b/gst/fsrtpconference/fs-rtp-codec-specific.c
@@ -1,7 +1,7 @@
/*
* fs-rtp-codec-specific.c - Per-codec SDP negotiation
*
- * Farsight RTP/AVP/SAVP/AVPF Module
+ * Farstream RTP/AVP/SAVP/AVPF Module
* Copyright (C) 2007-2010 Collabora Ltd.
* Copyright (C) 2007-2010 Nokia Corporation
* @author Olivier Crete <olivier.crete@collabora.co.uk>
diff --git a/gst/fsrtpconference/fs-rtp-codec-specific.h b/gst/fsrtpconference/fs-rtp-codec-specific.h
index f2b3097..1f27031 100644
--- a/gst/fsrtpconference/fs-rtp-codec-specific.h
+++ b/gst/fsrtpconference/fs-rtp-codec-specific.h
@@ -1,7 +1,7 @@
/*
* fs-rtp-codec-specific.h - Per-codec SDP negotiation
*
- * Farsight RTP/AVP/SAVP/AVPF Module
+ * Farstream RTP/AVP/SAVP/AVPF Module
* Copyright (C) 2007-2010 Collabora Ltd.
* Copyright (C) 2007-2010 Nokia Corporation
* @author Olivier Crete <olivier.crete@collabora.co.uk>
@@ -27,7 +27,7 @@
#include <glib.h>
#include <gst/gst.h>
-#include <gst/farsight/fs-codec.h>
+#include <gst/farstream/fs-codec.h>
G_BEGIN_DECLS
diff --git a/gst/fsrtpconference/fs-rtp-conference-plugin.c b/gst/fsrtpconference/fs-rtp-conference-plugin.c
index 3c9b18d..d1606b8 100644
--- a/gst/fsrtpconference/fs-rtp-conference-plugin.c
+++ b/gst/fsrtpconference/fs-rtp-conference-plugin.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RTP Conference Implementation
+ * Farstream - Farstream RTP Conference Implementation
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * gstfsrtpconference.c - RTP implementation for Farsight Conference Gstreamer
+ * gstfsrtpconference.c - RTP implementation for Farstream Conference Gstreamer
* Elements
*
* This library is free software; you can redistribute it and/or
@@ -41,10 +41,10 @@ GST_PLUGIN_DEFINE (
GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"fsrtpconference",
- "Farsight RTP Conference plugin",
+ "Farstream RTP Conference plugin",
plugin_init,
VERSION,
"LGPL",
- "Farsight",
- "http://farsight.freedesktop.org/"
+ "Farstream",
+ "http://farstream.freedesktop.org/"
)
diff --git a/gst/fsrtpconference/fs-rtp-conference.c b/gst/fsrtpconference/fs-rtp-conference.c
index 46f1c73..65e8550 100644
--- a/gst/fsrtpconference/fs-rtp-conference.c
+++ b/gst/fsrtpconference/fs-rtp-conference.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RTP Conference Implementation
+ * Farstream - Farstream RTP Conference Implementation
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-rtp-conference.c - RTP implementation for Farsight Conference Gstreamer
+ * fs-rtp-conference.c - RTP implementation for Farstream Conference Gstreamer
* Elements
*
* This library is free software; you can redistribute it and/or
@@ -25,7 +25,7 @@
/**
* SECTION:element-fsrtpconference
- * @short_description: Farsight RTP Conference Gstreamer Elements
+ * @short_description: Farstream RTP Conference Gstreamer Elements
*
* This is the core gstreamer element for a RTP conference. It must be added
* to your pipeline before anything else is done. Then you create the session,
@@ -71,9 +71,9 @@ enum
static const GstElementDetails fs_rtp_conference_details =
GST_ELEMENT_DETAILS (
- "Farsight RTP Conference",
+ "Farstream RTP Conference",
"Generic/Bin/RTP",
- "A Farsight RTP Conference",
+ "A Farstream RTP Conference",
"Olivier Crete <olivier.crete@collabora.co.uk>");
@@ -171,11 +171,11 @@ static void
fs_rtp_conference_do_init (GType type)
{
GST_DEBUG_CATEGORY_INIT (fsrtpconference_debug, "fsrtpconference", 0,
- "Farsight RTP Conference Element");
+ "Farstream RTP Conference Element");
GST_DEBUG_CATEGORY_INIT (fsrtpconference_disco, "fsrtpconference_disco",
- 0, "Farsight RTP Codec Discovery");
+ 0, "Farstream RTP Codec Discovery");
GST_DEBUG_CATEGORY_INIT (fsrtpconference_nego, "fsrtpconference_nego",
- 0, "Farsight RTP Codec Negotiation");
+ 0, "Farstream RTP Codec Negotiation");
}
static void
diff --git a/gst/fsrtpconference/fs-rtp-conference.h b/gst/fsrtpconference/fs-rtp-conference.h
index 3e3aba2..41db188 100644
--- a/gst/fsrtpconference/fs-rtp-conference.h
+++ b/gst/fsrtpconference/fs-rtp-conference.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RTP Conference Implementation
+ * Farstream - Farstream RTP Conference Implementation
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * gstfsrtpconference.h - RTP implementation for Farsight Conference Gstreamer
+ * gstfsrtpconference.h - RTP implementation for Farstream Conference Gstreamer
* Elements
*
* This library is free software; you can redistribute it and/or
@@ -26,7 +26,7 @@
#ifndef __FS_RTP_CONFERENCE_H__
#define __FS_RTP_CONFERENCE_H__
-#include <gst/farsight/fs-conference.h>
+#include <gst/farstream/fs-conference.h>
G_BEGIN_DECLS
diff --git a/gst/fsrtpconference/fs-rtp-discover-codecs.c b/gst/fsrtpconference/fs-rtp-discover-codecs.c
index dcdc0a0..30f0b82 100644
--- a/gst/fsrtpconference/fs-rtp-discover-codecs.c
+++ b/gst/fsrtpconference/fs-rtp-discover-codecs.c
@@ -1,5 +1,5 @@
/*
- * Farsight2 - Farsight RTP Discover Codecs
+ * Farstream - Farstream RTP Discover Codecs
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
@@ -9,7 +9,7 @@
* Copyright 2005 INdT
* @author Andre Moreira Magalhaes <andre.magalhaes@indt.org.br>
*
- * fs-discover-codecs.c - A Farsight RTP Codec Discovery
+ * fs-discover-codecs.c - A Farstream RTP Codec Discovery
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -36,7 +36,7 @@
#include <string.h>
-#include <gst/farsight/fs-conference.h>
+#include <gst/farstream/fs-conference.h>
#include "fs-rtp-conference.h"
#include "fs-rtp-codec-cache.h"
@@ -1297,7 +1297,7 @@ get_plugins_filtered_from_caps (FilterFunc filter,
}
/*
- * fill FarsightCodec fields based on payloader capabilities
+ * fill FarstreamCodec fields based on payloader capabilities
* TODO: optimise using quarks
*/
static gboolean
@@ -1363,7 +1363,7 @@ extract_field_data (GQuark field_id,
if (type == GST_TYPE_INT_RANGE)
{
/* set to 0, this should be checked by the optional parameters code later
- * in Farsight */
+ * in Farstream */
codec->clock_rate = 0;
return TRUE;
}
diff --git a/gst/fsrtpconference/fs-rtp-discover-codecs.h b/gst/fsrtpconference/fs-rtp-discover-codecs.h
index f48c455..96772c9 100644
--- a/gst/fsrtpconference/fs-rtp-discover-codecs.h
+++ b/gst/fsrtpconference/fs-rtp-discover-codecs.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RTP Discover Codecs
+ * Farstream - Farstream RTP Discover Codecs
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-discover-codecs.h - A Farsight RTP Codec Discovery
+ * fs-discover-codecs.h - A Farstream RTP Codec Discovery
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -27,7 +27,7 @@
#include <gst/gst.h>
-#include <gst/farsight/fs-codec.h>
+#include <gst/farstream/fs-codec.h>
G_BEGIN_DECLS
diff --git a/gst/fsrtpconference/fs-rtp-dtmf-event-source.c b/gst/fsrtpconference/fs-rtp-dtmf-event-source.c
index 2f45cde..a1c53e7 100644
--- a/gst/fsrtpconference/fs-rtp-dtmf-event-source.c
+++ b/gst/fsrtpconference/fs-rtp-dtmf-event-source.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RTP DTMF Event Source
+ * Farstream - Farstream RTP DTMF Event Source
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-rtp-dtmf-event-source.c - A Farsight RTP Event Source gobject
+ * fs-rtp-dtmf-event-source.c - A Farstream RTP Event Source gobject
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -29,7 +29,7 @@
#include "fs-rtp-dtmf-event-source.h"
-#include <gst/farsight/fs-conference.h>
+#include <gst/farstream/fs-conference.h>
#include "fs-rtp-conference.h"
#include "fs-rtp-discover-codecs.h"
diff --git a/gst/fsrtpconference/fs-rtp-dtmf-event-source.h b/gst/fsrtpconference/fs-rtp-dtmf-event-source.h
index f4fe098..fc8098c 100644
--- a/gst/fsrtpconference/fs-rtp-dtmf-event-source.h
+++ b/gst/fsrtpconference/fs-rtp-dtmf-event-source.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RTP DTMF Event Source
+ * Farstream - Farstream RTP DTMF Event Source
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-rtp-dtmf-event-source.h - A Farsight RTP Event Source gobject
+ * fs-rtp-dtmf-event-source.h - A Farstream RTP Event Source gobject
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/gst/fsrtpconference/fs-rtp-dtmf-sound-source.c b/gst/fsrtpconference/fs-rtp-dtmf-sound-source.c
index 564481e..67891d6 100644
--- a/gst/fsrtpconference/fs-rtp-dtmf-sound-source.c
+++ b/gst/fsrtpconference/fs-rtp-dtmf-sound-source.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RTP DTMF Sound Source
+ * Farstream - Farstream RTP DTMF Sound Source
*
* Copyright 2007-2009 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007-2009 Nokia Corp.
*
- * fs-rtp-dtmf-sound-source.c - A Farsight RTP Sound Source gobject
+ * fs-rtp-dtmf-sound-source.c - A Farstream RTP Sound Source gobject
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -29,7 +29,7 @@
#include "fs-rtp-dtmf-sound-source.h"
-#include <gst/farsight/fs-conference.h>
+#include <gst/farstream/fs-conference.h>
#include "fs-rtp-conference.h"
#include "fs-rtp-discover-codecs.h"
diff --git a/gst/fsrtpconference/fs-rtp-dtmf-sound-source.h b/gst/fsrtpconference/fs-rtp-dtmf-sound-source.h
index 211006b..6809c4b 100644
--- a/gst/fsrtpconference/fs-rtp-dtmf-sound-source.h
+++ b/gst/fsrtpconference/fs-rtp-dtmf-sound-source.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RTP DTMF Sound Source
+ * Farstream - Farstream RTP DTMF Sound Source
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-rtp-dtmf-sound-source.h - A Farsight RTP Sound Source gobject
+ * fs-rtp-dtmf-sound-source.h - A Farstream RTP Sound Source gobject
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/gst/fsrtpconference/fs-rtp-keyunit-manager.c b/gst/fsrtpconference/fs-rtp-keyunit-manager.c
index 552f61f..02660d6 100644
--- a/gst/fsrtpconference/fs-rtp-keyunit-manager.c
+++ b/gst/fsrtpconference/fs-rtp-keyunit-manager.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RTP Keyunit request manager
+ * Farstream - Farstream RTP Keyunit request manager
*
* Copyright 2011 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2011 Nokia Corp.
*
- * fs-rtp-keyunit-request.h - A Farsight RTP Key Unit request manager
+ * fs-rtp-keyunit-request.h - A Farstream RTP Key Unit request manager
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/gst/fsrtpconference/fs-rtp-keyunit-manager.h b/gst/fsrtpconference/fs-rtp-keyunit-manager.h
index 12701d1..8ec8f08 100644
--- a/gst/fsrtpconference/fs-rtp-keyunit-manager.h
+++ b/gst/fsrtpconference/fs-rtp-keyunit-manager.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RTP Keyunit request manager
+ * Farstream - Farstream RTP Keyunit request manager
*
* Copyright 2011 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2011 Nokia Corp.
*
- * fs-rtp-keyunit-request.h - A Farsight RTP Key Unit request manager
+ * fs-rtp-keyunit-request.h - A Farstream RTP Key Unit request manager
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -27,7 +27,7 @@
#include <gst/gst.h>
-#include <gst/farsight/fs-codec.h>
+#include <gst/farstream/fs-codec.h>
G_BEGIN_DECLS
diff --git a/gst/fsrtpconference/fs-rtp-packet-modder.c b/gst/fsrtpconference/fs-rtp-packet-modder.c
index cb40dc3..21fcb34 100644
--- a/gst/fsrtpconference/fs-rtp-packet-modder.c
+++ b/gst/fsrtpconference/fs-rtp-packet-modder.c
@@ -1,5 +1,5 @@
/*
- * Farsight2 - Farsight RTP Packet modder
+ * Farstream - Farstream RTP Packet modder
*
* Copyright 2010 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
@@ -69,7 +69,7 @@ fs_rtp_packet_modder_base_init (gpointer g_class)
"fsrtppacketmodder element");
gst_element_class_set_details_simple (gstelement_class,
- "Farsight RTP Packet modder",
+ "Farstream RTP Packet modder",
"Generic",
"Filter that can modify RTP packets",
"Olivier Crete <olivier.crete@collabora.co.uk>");
diff --git a/gst/fsrtpconference/fs-rtp-packet-modder.h b/gst/fsrtpconference/fs-rtp-packet-modder.h
index aa6b178..288ef84 100644
--- a/gst/fsrtpconference/fs-rtp-packet-modder.h
+++ b/gst/fsrtpconference/fs-rtp-packet-modder.h
@@ -1,5 +1,5 @@
/*
- * Farsight2 - Farsight RTP Packet modder
+ * Farstream - Farstream RTP Packet modder
*
* Copyright 2010 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
diff --git a/gst/fsrtpconference/fs-rtp-participant.c b/gst/fsrtpconference/fs-rtp-participant.c
index 887fc15..412c6c3 100644
--- a/gst/fsrtpconference/fs-rtp-participant.c
+++ b/gst/fsrtpconference/fs-rtp-participant.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RTP Participant
+ * Farstream - Farstream RTP Participant
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-rtp-participant.c - A RTP Farsight Participant gobject
+ * fs-rtp-participant.c - A RTP Farstream Participant gobject
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/gst/fsrtpconference/fs-rtp-participant.h b/gst/fsrtpconference/fs-rtp-participant.h
index 9074080..c30e2c3 100644
--- a/gst/fsrtpconference/fs-rtp-participant.h
+++ b/gst/fsrtpconference/fs-rtp-participant.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RTP Participant
+ * Farstream - Farstream RTP Participant
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-rtp-participant.h - A Farsight RTP Participant gobject
+ * fs-rtp-participant.h - A Farstream RTP Participant gobject
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -25,7 +25,7 @@
#ifndef __FS_RTP_PARTICIPANT_H__
#define __FS_RTP_PARTICIPANT_H__
-#include <gst/farsight/fs-participant.h>
+#include <gst/farstream/fs-participant.h>
G_BEGIN_DECLS
diff --git a/gst/fsrtpconference/fs-rtp-session.c b/gst/fsrtpconference/fs-rtp-session.c
index 969ed49..2b13b13 100644
--- a/gst/fsrtpconference/fs-rtp-session.c
+++ b/gst/fsrtpconference/fs-rtp-session.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RTP Session
+ * Farstream - Farstream RTP Session
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-rtp-session.c - A Farsight RTP Session gobject
+ * fs-rtp-session.c - A Farstream RTP Session gobject
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -38,8 +38,8 @@
* entirely new codecs using this method.
*
* To create a profile for a codec, add it to the codec-preferences with
- * special optional parameters called "farsight-send-profile" and
- * "farsight-recv-profile", these should contain gst-launch style descriptions
+ * special optional parameters called "farstream-send-profile" and
+ * "farstream-recv-profile", these should contain gst-launch style descriptions
* of the encoding or decoding bin.
*
* As a special case, encoding profiles can have more than one unconnected
@@ -65,9 +65,9 @@
#include <gst/rtp/gstrtpbuffer.h>
#include <gst/rtp/gstrtcpbuffer.h>
-#include <gst/farsight/fs-transmitter.h>
-#include "gst/farsight/fs-utils.h"
-#include <gst/farsight/fs-rtp.h>
+#include <gst/farstream/fs-transmitter.h>
+#include "gst/farstream/fs-utils.h"
+#include <gst/farstream/fs-rtp.h>
#include "fs-rtp-bitrate-adapter.h"
#include "fs-rtp-stream.h"
@@ -1010,7 +1010,7 @@ _rtp_bitrate_adapter_renegotiate (GstElement *bitrate_adapter,
{
gst_element_post_message (GST_ELEMENT (self->priv->conference),
gst_message_new_element (GST_OBJECT (self->priv->conference),
- gst_structure_new ("farsight-renegotiate",
+ gst_structure_new ("farstream-renegotiate",
"session", FS_TYPE_SESSION, self,
NULL)));
}
@@ -2682,7 +2682,7 @@ fs_rtp_session_update_codecs (FsRtpSession *session,
gst_element_post_message (GST_ELEMENT (session->priv->conference),
gst_message_new_element (GST_OBJECT (session->priv->conference),
- gst_structure_new ("farsight-codecs-changed",
+ gst_structure_new ("farstream-codecs-changed",
"session", FS_TYPE_SESSION, session,
NULL)));
}
@@ -3820,7 +3820,7 @@ _send_src_pad_blocked_callback (GstPad *pad, gboolean blocked,
g_object_notify (G_OBJECT (self), "current-send-codec");
gst_element_post_message (GST_ELEMENT (self->priv->conference),
gst_message_new_element (GST_OBJECT (self->priv->conference),
- gst_structure_new ("farsight-send-codec-changed",
+ gst_structure_new ("farstream-send-codec-changed",
"session", FS_TYPE_SESSION, self,
"codec", FS_TYPE_CODEC, codec_copy,
"secondary-codecs", FS_TYPE_CODEC_LIST, secondary_codecs,
@@ -4217,7 +4217,7 @@ _send_caps_changed (GstPad *pad, GParamSpec *pspec, FsRtpSession *session)
goto out;
/*
- * Emit farsight-codecs-changed if the sending thread finds the config
+ * Emit farstream-codecs-changed if the sending thread finds the config
* for the last codec that needed it
*/
if (gather_caps_parameters (ca, caps))
@@ -4238,7 +4238,7 @@ _send_caps_changed (GstPad *pad, GParamSpec *pspec, FsRtpSession *session)
g_object_notify (G_OBJECT (session), "codecs");
gst_element_post_message (GST_ELEMENT (session->priv->conference),
gst_message_new_element (GST_OBJECT (session->priv->conference),
- gst_structure_new ("farsight-codecs-changed",
+ gst_structure_new ("farstream-codecs-changed",
"session", FS_TYPE_SESSION, session,
NULL)));
@@ -4577,7 +4577,7 @@ _discovery_pad_blocked_callback (GstPad *pad, gboolean blocked,
g_object_notify (G_OBJECT (session), "codecs");
gst_element_post_message (GST_ELEMENT (session->priv->conference),
gst_message_new_element (GST_OBJECT (session->priv->conference),
- gst_structure_new ("farsight-codecs-changed",
+ gst_structure_new ("farstream-codecs-changed",
"session", FS_TYPE_SESSION, session,
NULL)));
diff --git a/gst/fsrtpconference/fs-rtp-session.h b/gst/fsrtpconference/fs-rtp-session.h
index 4c836c5..ec6d76c 100644
--- a/gst/fsrtpconference/fs-rtp-session.h
+++ b/gst/fsrtpconference/fs-rtp-session.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RTP Session
+ * Farstream - Farstream RTP Session
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-rtp-session.h - A Farsight RTP Session gobject
+ * fs-rtp-session.h - A Farstream RTP Session gobject
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -27,7 +27,7 @@
#include <gst/gst.h>
-#include <gst/farsight/fs-session.h>
+#include <gst/farstream/fs-session.h>
#include "fs-rtp-conference.h"
diff --git a/gst/fsrtpconference/fs-rtp-special-source.c b/gst/fsrtpconference/fs-rtp-special-source.c
index 26893a3..dde2529 100644
--- a/gst/fsrtpconference/fs-rtp-special-source.c
+++ b/gst/fsrtpconference/fs-rtp-special-source.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RTP Special Codec
+ * Farstream - Farstream RTP Special Codec
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-rtp-special-source.c - A Farsight RTP Special Source gobject
+ * fs-rtp-special-source.c - A Farstream RTP Special Source gobject
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -29,7 +29,7 @@
#include "fs-rtp-special-source.h"
-#include <gst/farsight/fs-conference.h>
+#include <gst/farstream/fs-conference.h>
#include "fs-rtp-conference.h"
#include "fs-rtp-codec-negotiation.h"
diff --git a/gst/fsrtpconference/fs-rtp-special-source.h b/gst/fsrtpconference/fs-rtp-special-source.h
index 4023fc3..3d55a72 100644
--- a/gst/fsrtpconference/fs-rtp-special-source.h
+++ b/gst/fsrtpconference/fs-rtp-special-source.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RTP Special Source
+ * Farstream - Farstream RTP Special Source
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-rtp-special-source.h - A Farsight RTP Special Source gobject
+ * fs-rtp-special-source.h - A Farstream RTP Special Source gobject
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -28,7 +28,7 @@
#include <gst/gst.h>
-#include <gst/farsight/fs-session.h>
+#include <gst/farstream/fs-session.h>
G_BEGIN_DECLS
diff --git a/gst/fsrtpconference/fs-rtp-stream.c b/gst/fsrtpconference/fs-rtp-stream.c
index c688e52..26ab1fc 100644
--- a/gst/fsrtpconference/fs-rtp-stream.c
+++ b/gst/fsrtpconference/fs-rtp-stream.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RTP Stream
+ * Farstream - Farstream RTP Stream
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-rtp-stream.c - A Farsight RTP Stream gobject
+ * fs-rtp-stream.c - A Farstream RTP Stream gobject
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -39,7 +39,7 @@
#include <gst/gst.h>
-#include <gst/farsight/fs-rtp.h>
+#include <gst/farstream/fs-rtp.h>
#include "fs-rtp-marshal.h"
@@ -723,7 +723,7 @@ _local_candidates_prepared (FsStreamTransmitter *stream_transmitter,
gst_element_post_message (conf,
gst_message_new_element (GST_OBJECT (conf),
- gst_structure_new ("farsight-local-candidates-prepared",
+ gst_structure_new ("farstream-local-candidates-prepared",
"stream", FS_TYPE_STREAM, self,
NULL)));
@@ -750,7 +750,7 @@ _new_active_candidate_pair (
gst_element_post_message (conf,
gst_message_new_element (GST_OBJECT (conf),
- gst_structure_new ("farsight-new-active-candidate-pair",
+ gst_structure_new ("farstream-new-active-candidate-pair",
"stream", FS_TYPE_STREAM, self,
"local-candidate", FS_TYPE_CANDIDATE, local_candidate,
"remote-candidate", FS_TYPE_CANDIDATE, remote_candidate,
@@ -778,7 +778,7 @@ _new_local_candidate (
gst_element_post_message (conf,
gst_message_new_element (GST_OBJECT (conf),
- gst_structure_new ("farsight-new-local-candidate",
+ gst_structure_new ("farstream-new-local-candidate",
"stream", FS_TYPE_STREAM, self,
"candidate", FS_TYPE_CANDIDATE, candidate,
NULL)));
@@ -826,7 +826,7 @@ _state_changed (FsStreamTransmitter *stream_transmitter,
gst_element_post_message (conf,
gst_message_new_element (GST_OBJECT (conf),
- gst_structure_new ("farsight-component-state-changed",
+ gst_structure_new ("farstream-component-state-changed",
"stream", FS_TYPE_STREAM, self,
"component", G_TYPE_UINT, component,
"state", FS_TYPE_STREAM_STATE, state,
@@ -999,7 +999,7 @@ _substream_codec_changed (FsRtpSubStream *substream,
gst_element_post_message (conf,
gst_message_new_element (GST_OBJECT (conf),
- gst_structure_new ("farsight-recv-codecs-changed",
+ gst_structure_new ("farstream-recv-codecs-changed",
"stream", FS_TYPE_STREAM, stream,
"codecs", FS_TYPE_CODEC_LIST, codeclist,
NULL)));
diff --git a/gst/fsrtpconference/fs-rtp-stream.h b/gst/fsrtpconference/fs-rtp-stream.h
index 4e3c119..bd614d1 100644
--- a/gst/fsrtpconference/fs-rtp-stream.h
+++ b/gst/fsrtpconference/fs-rtp-stream.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RTP Stream
+ * Farstream - Farstream RTP Stream
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-rtp-stream.h - A Farsight RTP Stream
+ * fs-rtp-stream.h - A Farstream RTP Stream
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -25,8 +25,8 @@
#ifndef __FS_RTP_STREAM_H__
#define __FS_RTP_STREAM_H__
-#include <gst/farsight/fs-stream.h>
-#include <gst/farsight/fs-stream-transmitter.h>
+#include <gst/farstream/fs-stream.h>
+#include <gst/farstream/fs-stream-transmitter.h>
#include "fs-rtp-participant.h"
#include "fs-rtp-session.h"
diff --git a/gst/fsrtpconference/fs-rtp-substream.c b/gst/fsrtpconference/fs-rtp-substream.c
index 305a698..940f941 100644
--- a/gst/fsrtpconference/fs-rtp-substream.c
+++ b/gst/fsrtpconference/fs-rtp-substream.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RTP Sub Stream
+ * Farstream - Farstream RTP Sub Stream
*
* Copyright 2007-2009 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007-2009 Nokia Corp.
*
- * fs-rtp-substream.c - A Farsight RTP Substream gobject
+ * fs-rtp-substream.c - A Farstream RTP Substream gobject
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -29,8 +29,8 @@
#include "fs-rtp-substream.h"
-#include <gst/farsight/fs-stream.h>
-#include <gst/farsight/fs-session.h>
+#include <gst/farstream/fs-stream.h>
+#include <gst/farstream/fs-session.h>
#include "fs-rtp-stream.h"
#include "fs-rtp-marshal.h"
diff --git a/gst/fsrtpconference/fs-rtp-substream.h b/gst/fsrtpconference/fs-rtp-substream.h
index 004c3be..d76dfe8 100644
--- a/gst/fsrtpconference/fs-rtp-substream.h
+++ b/gst/fsrtpconference/fs-rtp-substream.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RTP Sub Stream
+ * Farstream - Farstream RTP Sub Stream
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-rtp-substream.h - A Farsight RTP Substream gobject
+ * fs-rtp-substream.h - A Farstream RTP Substream gobject
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/gst/fsrtpconference/fs-rtp-tfrc.c b/gst/fsrtpconference/fs-rtp-tfrc.c
index a87bf1e..71c84f0 100644
--- a/gst/fsrtpconference/fs-rtp-tfrc.c
+++ b/gst/fsrtpconference/fs-rtp-tfrc.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RTP TFRC support
+ * Farstream - Farstream RTP TFRC support
*
* Copyright 2010 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2010 Nokia Corp.
*
- * fs-rtp-tfrc.c - Rate control for Farsight RTP sessions
+ * fs-rtp-tfrc.c - Rate control for Farstream RTP sessions
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -31,7 +31,7 @@
#include <string.h>
#include "fs-rtp-packet-modder.h"
-#include "gst/farsight/fs-rtp.h"
+#include "gst/farstream/fs-rtp.h"
#include "fs-rtp-codec-negotiation.h"
#include <gst/rtp/gstrtpbuffer.h>
@@ -146,7 +146,7 @@ fs_rtp_tfrc_init (FsRtpTfrc *self)
{
GST_DEBUG_CATEGORY_INIT (fsrtpconference_tfrc,
"fsrtpconference_tfrc", 0,
- "Farsight RTP Conference Element Rate Control logic");
+ "Farstream RTP Conference Element Rate Control logic");
/* member init */
diff --git a/gst/fsrtpconference/fs-rtp-tfrc.h b/gst/fsrtpconference/fs-rtp-tfrc.h
index a834233..5e723d9 100644
--- a/gst/fsrtpconference/fs-rtp-tfrc.h
+++ b/gst/fsrtpconference/fs-rtp-tfrc.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RTP TFRC Support
+ * Farstream - Farstream RTP TFRC Support
*
* Copyright 2010 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2010 Nokia Corp.
*
- * fs-rtp-tfrc.h - Rate control for Farsight RTP sessions
+ * fs-rtp-tfrc.h - Rate control for Farstream RTP sessions
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/gst/fsrtpconference/tfrc.c b/gst/fsrtpconference/tfrc.c
index e9e4475..d17524f 100644
--- a/gst/fsrtpconference/tfrc.c
+++ b/gst/fsrtpconference/tfrc.c
@@ -1,5 +1,5 @@
/*
- * Farsight2 - Farsight TFRC implementation
+ * Farstream - Farstream TFRC implementation
*
* Copyright 2010 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
diff --git a/gst/fsrtpconference/tfrc.h b/gst/fsrtpconference/tfrc.h
index e4bb713..9099775 100644
--- a/gst/fsrtpconference/tfrc.h
+++ b/gst/fsrtpconference/tfrc.h
@@ -1,5 +1,5 @@
/*
- * Farsight2 - Farsight TFRC implementation
+ * Farstream - Farstream TFRC implementation
*
* Copyright 2010 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
diff --git a/gst/funnel/Makefile.am b/gst/funnel/Makefile.am
index 1284269..d469a43 100644
--- a/gst/funnel/Makefile.am
+++ b/gst/funnel/Makefile.am
@@ -2,12 +2,12 @@ plugin_LTLIBRARIES = libfsfunnel.la
libfsfunnel_la_SOURCES = fs-funnel.c
libfsfunnel_la_CFLAGS = \
- $(FS2_CFLAGS) \
+ $(FS_CFLAGS) \
$(GST_BASE_CFLAGS) \
$(GST_CFLAGS)
libfsfunnel_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libfsfunnel_la_LIBADD = \
- $(FS2_LIBS) \
+ $(FS_LIBS) \
$(GST_BASE_LIBS) \
$(GST_LIBS)
diff --git a/gst/funnel/fs-funnel.c b/gst/funnel/fs-funnel.c
index acbd9f2..9d09c5a 100644
--- a/gst/funnel/fs-funnel.c
+++ b/gst/funnel/fs-funnel.c
@@ -1,5 +1,5 @@
/*
- * Farsight2 - Farsight Funnel element
+ * Farstream - Farstream Funnel element
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
@@ -40,7 +40,7 @@ GST_DEBUG_CATEGORY_STATIC (fs_funnel_debug);
static const GstElementDetails fs_funnel_details =
GST_ELEMENT_DETAILS(
- "Farsight Funnel pipe fitting",
+ "Farstream Funnel pipe fitting",
"Generic",
"N-to-1 pipe fitting",
"Olivier Crete <olivier.crete@collabora.co.uk>");
@@ -434,10 +434,10 @@ GST_PLUGIN_DEFINE (
GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"fsfunnel",
- "Farsight Funnel plugin",
+ "Farstream Funnel plugin",
plugin_init,
VERSION,
"LGPL",
- "Farsight",
- "http://farsight.freedesktop.org/"
+ "Farstream",
+ "http://farstream.freedesktop.org/"
)
diff --git a/gst/funnel/fs-funnel.h b/gst/funnel/fs-funnel.h
index c1d5094..e56df01 100644
--- a/gst/funnel/fs-funnel.h
+++ b/gst/funnel/fs-funnel.h
@@ -1,5 +1,5 @@
/*
- * Farsight2 - Farsight Funnel element
+ * Farstream - Farstream Funnel element
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
diff --git a/gst/rtcpfilter/Makefile.am b/gst/rtcpfilter/Makefile.am
index 92fdfe1..913b460 100644
--- a/gst/rtcpfilter/Makefile.am
+++ b/gst/rtcpfilter/Makefile.am
@@ -5,13 +5,13 @@ libfsrtcpfilter_la_SOURCES = fs-rtcp-filter.c
noinst_HEADERS = fs-rtcp-filter.h
libfsrtcpfilter_la_CFLAGS = \
- $(FS2_CFLAGS) \
+ $(FS_CFLAGS) \
$(GST_BASE_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_CFLAGS)
libfsrtcpfilter_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libfsrtcpfilter_la_LIBADD = \
- $(FS2_LIBS) \
+ $(FS_LIBS) \
-lgstrtp-@GST_MAJORMINOR@ \
$(GST_BASE_LIBS) \
$(GST_PLUGINS_BASE_LIBS) \
diff --git a/gst/rtcpfilter/fs-rtcp-filter.c b/gst/rtcpfilter/fs-rtcp-filter.c
index 5fb6100..8660c38 100644
--- a/gst/rtcpfilter/fs-rtcp-filter.c
+++ b/gst/rtcpfilter/fs-rtcp-filter.c
@@ -1,5 +1,5 @@
/*
- * Farsight Voice+Video library
+ * Farstream Voice+Video library
*
* Copyright 2008 Collabora Ltd,
* Copyright 2008 Nokia Corporation
@@ -261,5 +261,5 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"fsrtcpfilter",
"RtcpFilter",
- fs_rtcp_filter_plugin_init, VERSION, "LGPL", "Farsight",
- "http://farsight.sf.net")
+ fs_rtcp_filter_plugin_init, VERSION, "LGPL", "Farstream",
+ "http://farstream.sf.net")
diff --git a/gst/rtcpfilter/fs-rtcp-filter.h b/gst/rtcpfilter/fs-rtcp-filter.h
index a8f0f8a..5e4bfdd 100644
--- a/gst/rtcpfilter/fs-rtcp-filter.h
+++ b/gst/rtcpfilter/fs-rtcp-filter.h
@@ -1,5 +1,5 @@
/*
- * Farsight Voice+Video library
+ * Farstream Voice+Video library
*
* Copyright 2008 Collabora Ltd,
* Copyright 2008 Nokia Corporation
diff --git a/gst/videoanyrate/Makefile.am b/gst/videoanyrate/Makefile.am
index 0316587..3c7866c 100644
--- a/gst/videoanyrate/Makefile.am
+++ b/gst/videoanyrate/Makefile.am
@@ -2,12 +2,12 @@ plugin_LTLIBRARIES = libfsvideoanyrate.la
libfsvideoanyrate_la_SOURCES = videoanyrate.c
libfsvideoanyrate_la_CFLAGS = \
- $(FS2_CFLAGS) \
+ $(FS_CFLAGS) \
$(GST_BASE_CFLAGS) \
$(GST_CFLAGS)
libfsvideoanyrate_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libfsvideoanyrate_la_LIBADD = \
- $(FS2_LIBS) \
+ $(FS_LIBS) \
$(GST_BASE_LIBS) \
$(GST_LIBS)
diff --git a/gst/videoanyrate/videoanyrate.c b/gst/videoanyrate/videoanyrate.c
index 853ad79..a6b773c 100644
--- a/gst/videoanyrate/videoanyrate.c
+++ b/gst/videoanyrate/videoanyrate.c
@@ -1,5 +1,5 @@
/*
- * Farsight Voice+Video library
+ * Farstream Voice+Video library
*
* Copyright 2007 Collabora Ltd,
* Copyright 2007 Nokia Corporation
@@ -191,5 +191,5 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"fsvideoanyrate",
"Videoanyrate",
- gst_videoanyrate_plugin_init, VERSION, "LGPL", "Farsight",
- "http://farsight.sf.net")
+ gst_videoanyrate_plugin_init, VERSION, "LGPL", "Farstream",
+ "http://farstream.sf.net")
diff --git a/gst/videoanyrate/videoanyrate.h b/gst/videoanyrate/videoanyrate.h
index 0dce98e..f5f40e3 100644
--- a/gst/videoanyrate/videoanyrate.h
+++ b/gst/videoanyrate/videoanyrate.h
@@ -1,5 +1,5 @@
/*
- * Farsight Voice+Video library
+ * Farstream Voice+Video library
*
* Copyright 2008 Collabora Ltd,
* Copyright 2008 Nokia Corporation
diff --git a/python/Makefile.am b/python/Makefile.am
index b3798e0..46b649620 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -5,41 +5,41 @@ AM_CPPFLAGS = \
-I. \
-I$(top_srcdir)/gst-libs/ \
-DDATADIR=\""$(datadir)"\" \
- $(PYFARSIGHT_CFLAGS) \
+ $(PYFARSTREAM_CFLAGS) \
$(PYTHON_INCLUDES) \
- $(FS2_INTERNAL_CFLAGS) \
- $(FS2_CFLAGS) \
+ $(FS_INTERNAL_CFLAGS) \
+ $(FS_CFLAGS) \
$(WARN_CFLAGS)
BUILT_SOURCES = \
- pyfarsight.c
+ pyfarstream.c
-pyfarsightdir = $(pyexecdir)
-pyfarsight_LTLIBRARIES = farsight.la
+pyfarstreamdir = $(pyexecdir)
+pyfarstream_LTLIBRARIES = farstream.la
-farsight_la_SOURCES = \
- pyfarsightmodule.c
+farstream_la_SOURCES = \
+ pyfarstreammodule.c
-nodist_farsight_la_SOURCES = pyfarsight.c
+nodist_farstream_la_SOURCES = pyfarstream.c
-farsight_la_LIBADD = \
- $(PYFARSIGHT_LIBS) \
- $(top_builddir)/gst-libs/gst/farsight/libgstfarsight-@GST_MAJORMINOR@.la
+farstream_la_LIBADD = \
+ $(PYFARSTREAM_LIBS) \
+ $(top_builddir)/gst-libs/gst/farstream/libgstfarstream-@GST_MAJORMINOR@.la
-farsight_la_LDFLAGS = -module -avoid-version
+farstream_la_LDFLAGS = -module -avoid-version
-pyfarsight.c: pyfarsight.override pyfarsight.defs
+pyfarstream.c: pyfarstream.override pyfarstream.defs
$(PYCODEGEN) \
--prefix fs \
--register $(GSTPYDEFS)/gst-types.defs \
- --override $(srcdir)/pyfarsight.override \
- $(srcdir)/pyfarsight.defs > $@
+ --override $(srcdir)/pyfarstream.override \
+ $(srcdir)/pyfarstream.defs > $@
EXTRA_DIST = \
- pyfarsight.override \
- pyfarsight.defs \
+ pyfarstream.override \
+ pyfarstream.defs \
example.py \
- pyfarsight-filter.defs \
+ pyfarstream-filter.defs \
rebuild-defs.sh
CLEANFILES = $(BUILT_SOURCES)
diff --git a/python/example.py b/python/example.py
index bd869cf..a8a94da 100644
--- a/python/example.py
+++ b/python/example.py
@@ -1,6 +1,6 @@
import pygst
pygst.require('0.10')
-import farsight, gst, gobject, sys
+import farstream, gst, gobject, sys
loop = gobject.MainLoop()
pipeline = gst.Pipeline()
@@ -9,24 +9,24 @@ conference = gst.element_factory_make ("fsrtpconference")
conference.set_property ("sdes-cname", sys.argv[1] + "@1.2.3.4")
pipeline.add (conference)
-session = conference.new_session (farsight.MEDIA_TYPE_VIDEO)
+session = conference.new_session (farstream.MEDIA_TYPE_VIDEO)
participant = conference.new_participant ()
-stream = session.new_stream (participant, farsight.DIRECTION_BOTH, "multicast")
+stream = session.new_stream (participant, farstream.DIRECTION_BOTH, "multicast")
-stream.set_remote_codecs([farsight.Codec(96, "H263-1998",
- farsight.MEDIA_TYPE_VIDEO,
+stream.set_remote_codecs([farstream.Codec(96, "H263-1998",
+ farstream.MEDIA_TYPE_VIDEO,
90000)])
-candidate = farsight.Candidate()
+candidate = farstream.Candidate()
candidate.ip = "224.0.0.110"
candidate.port = 3442
-candidate.component_id = farsight.COMPONENT_RTP
-candidate.proto = farsight.NETWORK_PROTOCOL_UDP
-candidate.type = farsight.CANDIDATE_TYPE_MULTICAST
+candidate.component_id = farstream.COMPONENT_RTP
+candidate.proto = farstream.NETWORK_PROTOCOL_UDP
+candidate.type = farstream.CANDIDATE_TYPE_MULTICAST
candidate.ttl = 1
candidate2 = candidate.copy()
candidate2.port = 3443
-candidate2.component_id = farsight.COMPONENT_RTCP
+candidate2.component_id = farstream.COMPONENT_RTCP
stream.set_remote_candidates ([candidate, candidate2])
videosource = gst.parse_bin_from_description (sys.argv[3] + " ! videoscale", True)
diff --git a/python/pyfarsight-filter.defs b/python/pyfarstream-filter.defs
index a469769..a469769 100644
--- a/python/pyfarsight-filter.defs
+++ b/python/pyfarstream-filter.defs
diff --git a/python/pyfarsight.defs b/python/pyfarstream.defs
index ca5adff..8deb597 100644
--- a/python/pyfarsight.defs
+++ b/python/pyfarstream.defs
@@ -481,6 +481,17 @@
)
)
+(define-method codecs_need_resend
+ (of-object "FsSession")
+ (unblock-threads t)
+ (c-name "fs_session_codecs_need_resend")
+ (return-type "GList*")
+ (parameters
+ '("GList*" "old_codecs")
+ '("GList*" "new_codecs")
+ )
+)
+
(define-method destroy
(of-object "FsSession")
(unblock-threads t)
diff --git a/python/pyfarsight.override b/python/pyfarstream.override
index a9bc44d..5f543b0 100644
--- a/python/pyfarsight.override
+++ b/python/pyfarstream.override
@@ -5,9 +5,9 @@ headers
#include <gst/gst.h>
-#include <gst/farsight/fs-conference.h>
+#include <gst/farstream/fs-conference.h>
-#include <gst/farsight/fs-element-added-notifier.h>
+#include <gst/farstream/fs-element-added-notifier.h>
/* This is new in python 2.5 */
#if PYTHON_API_VERSION < 1013
@@ -143,7 +143,7 @@ _fs_codec_list_from_pysequence (PyObject *obj, GList **list)
}
%%
-modulename farsight
+modulename farstream
%%
ignore-glob
*_get_type
diff --git a/python/pyfarsightmodule.c b/python/pyfarstreammodule.c
index f9bf2ee..404c2f0 100644
--- a/python/pyfarsightmodule.c
+++ b/python/pyfarstreammodule.c
@@ -1,20 +1,20 @@
#include <pygobject.h>
-#include <gst/farsight/fs-codec.h>
+#include <gst/farstream/fs-codec.h>
void fs_register_classes (PyObject *d);
void fs_add_constants(PyObject *module, const gchar *strip_prefix);
-DL_EXPORT(void) initfarsight(void);
+DL_EXPORT(void) initfarstream(void);
extern PyMethodDef fs_functions[];
DL_EXPORT(void)
-initfarsight(void)
+initfarstream(void)
{
PyObject *m, *d;
init_pygobject ();
- m = Py_InitModule ("farsight", fs_functions);
+ m = Py_InitModule ("farstream", fs_functions);
d = PyModule_GetDict (m);
PyModule_AddIntConstant (m, "CODEC_ID_ANY", FS_CODEC_ID_ANY);
@@ -25,6 +25,6 @@ initfarsight(void)
if (PyErr_Occurred ()) {
PyErr_Print();
- Py_FatalError ("can't initialise module farsight");
+ Py_FatalError ("can't initialise module farstream");
}
}
diff --git a/python/rebuild-defs.sh b/python/rebuild-defs.sh
index 553e484..8d73e9a 100755
--- a/python/rebuild-defs.sh
+++ b/python/rebuild-defs.sh
@@ -11,10 +11,10 @@ HEADERS=" \
fs-element-added-notifier.h \
fs-enumtypes.h"
-srcdir=../gst-libs/gst/farsight/
+srcdir=../gst-libs/gst/farstream/
-output=pyfarsight.defs
-filter=pyfarsight-filter.defs
+output=pyfarstream.defs
+filter=pyfarstream-filter.defs
cat ${filter} > ${output}
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index adb8e12..dcbca80 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -10,10 +10,10 @@ TESTS_ENVIRONMENT = \
CK_DEFAULT_TIMEOUT=120 \
STATE_IGNORE_ELEMENTS="$(STATE_IGNORE_ELEMENTS)" \
$(REGISTRY_ENVIRONMENT) \
- GST_PLUGIN_LOADING_WHITELIST=gstreamer:gst-plugins-base:gst-plugins-good:libnice:valve:siren:autoconvert:rtpmux:dtmf:mimic:shm:farsight2@$(top_builddir)/gst \
+ GST_PLUGIN_LOADING_WHITELIST=gstreamer:gst-plugins-base:gst-plugins-good:libnice:valve:siren:autoconvert:rtpmux:dtmf:mimic:shm:farstream@$(top_builddir)/gst \
GST_PLUGIN_PATH=$(top_builddir)/gst:${GST_PLUGIN_PATH} \
FS_PLUGIN_PATH=$(top_builddir)/transmitters/rawudp/.libs:$(top_builddir)/transmitters/multicast/.libs:$(top_builddir)/transmitters/nice/.libs:$(top_builddir)/transmitters/shm/.libs \
- LD_LIBRARY_PATH=$(top_builddir)/gst-libs/gst/farsight/.libs:${LD_LIBRARY_PATH} \
+ LD_LIBRARY_PATH=$(top_builddir)/gst-libs/gst/farstream/.libs:${LD_LIBRARY_PATH} \
UPNP_XML_PATH=$(srcdir)/upnp \
SRCDIR=$(srcdir) \
XDG_CACHE_HOME=$(builddir)/cache
@@ -61,13 +61,13 @@ check_PROGRAMS = \
AM_CFLAGS = \
$(CFLAGS) \
- $(FS2_INTERNAL_CFLAGS) \
- $(FS2_CFLAGS) \
+ $(FS_INTERNAL_CFLAGS) \
+ $(FS_CFLAGS) \
$(GST_CHECK_CFLAGS) \
$(GST_CFLAGS)
LDADD = \
- $(top_builddir)/gst-libs/gst/farsight/libgstfarsight-0.10.la \
+ $(top_builddir)/gst-libs/gst/farstream/libgstfarstream-0.10.la \
$(GST_CHECK_LIBS) \
$(GST_LIBS)
@@ -105,7 +105,7 @@ transmitter_multicast_SOURCES = \
transmitter/fake-filter.h \
transmitter/multicast.c
-transmitter_nice_CFLAGS = $(FS2_INTERNAL_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
+transmitter_nice_CFLAGS = $(FS_INTERNAL_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
transmitter_nice_SOURCES = \
check-threadsafe.h \
transmitter/generic.c \
diff --git a/tests/check/base/fscodec.c b/tests/check/base/fscodec.c
index 8a41a84..8e69167 100644
--- a/tests/check/base/fscodec.c
+++ b/tests/check/base/fscodec.c
@@ -1,4 +1,4 @@
-/* Farsigh2 unit tests for FsCodec
+/* Farstream unit tests for FsCodec
*
* Copyright (C) 2007 Collabora, Nokia
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
@@ -23,8 +23,8 @@
#endif
#include <gst/check/gstcheck.h>
-#include "gst/farsight/fs-codec.h"
-#include "gst/farsight/fs-rtp.h"
+#include "gst/farstream/fs-codec.h"
+#include "gst/farstream/fs-rtp.h"
#include "testutils.h"
diff --git a/tests/check/base/fstransmitter.c b/tests/check/base/fstransmitter.c
index aba6fb2..0e85d90 100644
--- a/tests/check/base/fstransmitter.c
+++ b/tests/check/base/fstransmitter.c
@@ -1,4 +1,4 @@
-/* Farsigh2 unit tests for FsTransmitter
+/* Farstream unit tests for FsTransmitter
*
* Copyright (C) 2007 Collabora, Nokia
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
@@ -24,8 +24,8 @@
#endif
#include <gst/check/gstcheck.h>
-#include <gst/farsight/fs-transmitter.h>
-#include <gst/farsight/fs-conference.h>
+#include <gst/farstream/fs-transmitter.h>
+#include <gst/farstream/fs-conference.h>
GST_START_TEST (test_fstransmitter_new_fail)
diff --git a/tests/check/elements/funnel.c b/tests/check/elements/funnel.c
index 7b38c9e..61f78e2 100644
--- a/tests/check/elements/funnel.c
+++ b/tests/check/elements/funnel.c
@@ -1,4 +1,4 @@
-/* Farsight 2 unit tests for the fsfunnel
+/* Farstream unit tests for the fsfunnel
*
* Copyright (C) 2008 Collabora, Nokia
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
diff --git a/tests/check/elements/rtcpfilter.c b/tests/check/elements/rtcpfilter.c
index a19228a..73551ed 100644
--- a/tests/check/elements/rtcpfilter.c
+++ b/tests/check/elements/rtcpfilter.c
@@ -1,4 +1,4 @@
-/* Farsight 2 unit tests for the fsrtcpfilter
+/* Farstream unit tests for the fsrtcpfilter
*
* Copyright (C) 2008 Collabora, Nokia
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
diff --git a/tests/check/msn/conference.c b/tests/check/msn/conference.c
index 0f1ecc1..2097b91 100644
--- a/tests/check/msn/conference.c
+++ b/tests/check/msn/conference.c
@@ -1,4 +1,4 @@
-/* Farsight 2 unit tests for FsMsnConference
+/* Farstream unit tests for FsMsnConference
*
* Copyright (C) 2009 Collabora
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
@@ -23,7 +23,7 @@
#endif
#include <gst/check/gstcheck.h>
-#include <gst/farsight/fs-conference.h>
+#include <gst/farstream/fs-conference.h>
#include "check-threadsafe.h"
@@ -59,7 +59,7 @@ bus_watch (GstBus *bus, GstMessage *message, gpointer user_data)
{
const GstStructure *s = gst_message_get_structure (message);
ts_fail_if (s==NULL, "NULL structure in element message");
- if (gst_structure_has_name (s, "farsight-error"))
+ if (gst_structure_has_name (s, "farstream-error"))
{
const GValue *value;
FsError errorno;
@@ -68,17 +68,17 @@ bus_watch (GstBus *bus, GstMessage *message, gpointer user_data)
ts_fail_unless (
gst_implements_interface_check (GST_MESSAGE_SRC (message),
FS_TYPE_CONFERENCE),
- "Received farsight-error from non-farsight element");
+ "Received farstream-error from non-farstream element");
ts_fail_unless (
gst_structure_has_field_typed (s, "src-object", G_TYPE_OBJECT),
- "farsight-error structure has no src-object field");
+ "farstream-error structure has no src-object field");
ts_fail_unless (
gst_structure_has_field_typed (s, "error-no", FS_TYPE_ERROR),
- "farsight-error structure has no src-object field");
+ "farstream-error structure has no src-object field");
ts_fail_unless (
gst_structure_has_field_typed (s, "error-msg", G_TYPE_STRING),
- "farsight-error structure has no src-object field");
+ "farstream-error structure has no src-object field");
value = gst_structure_get_value (s, "error-no");
errorno = g_value_get_enum (value);
@@ -86,7 +86,7 @@ bus_watch (GstBus *bus, GstMessage *message, gpointer user_data)
ts_fail ("Error on BUS (%d) %s", errorno, error);
}
- else if (gst_structure_has_name (s, "farsight-new-local-candidate"))
+ else if (gst_structure_has_name (s, "farstream-new-local-candidate"))
{
FsStream *stream;
FsCandidate *candidate;
@@ -95,14 +95,14 @@ bus_watch (GstBus *bus, GstMessage *message, gpointer user_data)
ts_fail_unless (
gst_implements_interface_check (GST_MESSAGE_SRC (message),
FS_TYPE_CONFERENCE),
- "Received farsight-error from non-farsight element");
+ "Received farstream-error from non-farstream element");
ts_fail_unless (
gst_structure_has_field_typed (s, "stream", FS_TYPE_STREAM),
- "farsight-new-local-candidate structure has no stream field");
+ "farstream-new-local-candidate structure has no stream field");
ts_fail_unless (
gst_structure_has_field_typed (s, "candidate", FS_TYPE_CANDIDATE),
- "farsight-new-local-candidate structure has no candidate field");
+ "farstream-new-local-candidate structure has no candidate field");
value = gst_structure_get_value (s, "stream");
stream = g_value_get_object (value);
diff --git a/tests/check/raw/conference.c b/tests/check/raw/conference.c
index 81884bd..e97a7c4 100644
--- a/tests/check/raw/conference.c
+++ b/tests/check/raw/conference.c
@@ -1,4 +1,4 @@
-/* Farsight 2 unit tests for fsrawconference
+/* Farstream unit tests for fsrawconference
*
* Copyright (C) 2007,2010 Collabora, Nokia
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
@@ -24,8 +24,8 @@
#endif
#include <gst/check/gstcheck.h>
-#include <gst/farsight/fs-conference.h>
-#include <gst/farsight/fs-stream-transmitter.h>
+#include <gst/farstream/fs-conference.h>
+#include <gst/farstream/fs-stream-transmitter.h>
#include "check-threadsafe.h"
@@ -480,7 +480,7 @@ _bus_callback (GstBus *bus, GstMessage *message, gpointer user_data)
{
const GstStructure *s = gst_message_get_structure (message);
ts_fail_if (s==NULL, "NULL structure in element message");
- if (gst_structure_has_name (s, "farsight-error"))
+ if (gst_structure_has_name (s, "farstream-error"))
{
const GValue *value;
FsError errorno;
@@ -489,20 +489,20 @@ _bus_callback (GstBus *bus, GstMessage *message, gpointer user_data)
ts_fail_unless (
gst_implements_interface_check (GST_MESSAGE_SRC (message),
FS_TYPE_CONFERENCE),
- "Received farsight-error from non-farsight element");
+ "Received farstream-error from non-farstream element");
ts_fail_unless (
gst_structure_has_field_typed (s, "src-object", G_TYPE_OBJECT),
- "farsight-error structure has no src-object field");
+ "farstream-error structure has no src-object field");
ts_fail_unless (
gst_structure_has_field_typed (s, "error-no", FS_TYPE_ERROR),
- "farsight-error structure has no src-object field");
+ "farstream-error structure has no src-object field");
ts_fail_unless (
gst_structure_has_field_typed (s, "error-msg", G_TYPE_STRING),
- "farsight-error structure has no src-object field");
+ "farstream-error structure has no src-object field");
ts_fail_unless (
gst_structure_has_field_typed (s, "debug-msg", G_TYPE_STRING),
- "farsight-error structure has no src-object field");
+ "farstream-error structure has no src-object field");
value = gst_structure_get_value (s, "error-no");
errorno = g_value_get_enum (value);
@@ -511,7 +511,7 @@ _bus_callback (GstBus *bus, GstMessage *message, gpointer user_data)
ts_fail ("Error on BUS (%d) %s .. %s", errorno, error, debug);
}
- else if (gst_structure_has_name (s, "farsight-new-local-candidate"))
+ else if (gst_structure_has_name (s, "farstream-new-local-candidate"))
{
FsStream *stream;
FsCandidate *candidate;
@@ -520,14 +520,14 @@ _bus_callback (GstBus *bus, GstMessage *message, gpointer user_data)
ts_fail_unless (
gst_implements_interface_check (GST_MESSAGE_SRC (message),
FS_TYPE_CONFERENCE),
- "Received farsight-error from non-farsight element");
+ "Received farstream-error from non-farstream element");
ts_fail_unless (
gst_structure_has_field_typed (s, "stream", FS_TYPE_STREAM),
- "farsight-new-local-candidate structure has no stream field");
+ "farstream-new-local-candidate structure has no stream field");
ts_fail_unless (
gst_structure_has_field_typed (s, "candidate", FS_TYPE_CANDIDATE),
- "farsight-new-local-candidate structure has no candidate field");
+ "farstream-new-local-candidate structure has no candidate field");
value = gst_structure_get_value (s, "stream");
stream = g_value_get_object (value);
@@ -541,7 +541,7 @@ _bus_callback (GstBus *bus, GstMessage *message, gpointer user_data)
_new_local_candidate (stream, candidate);
}
else if (gst_structure_has_name (s,
- "farsight-new-active-candidate-pair"))
+ "farstream-new-active-candidate-pair"))
{
FsStream *stream;
FsCandidate *local_candidate, *remote_candidate;
@@ -550,21 +550,21 @@ _bus_callback (GstBus *bus, GstMessage *message, gpointer user_data)
ts_fail_unless (
gst_implements_interface_check (GST_MESSAGE_SRC (message),
FS_TYPE_CONFERENCE),
- "Received farsight-error from non-farsight element");
+ "Received farstream-error from non-farstream element");
ts_fail_unless (
gst_structure_has_field_typed (s, "stream", FS_TYPE_STREAM),
- "farsight-new-active-candidate-pair structure"
+ "farstream-new-active-candidate-pair structure"
" has no stream field");
ts_fail_unless (
gst_structure_has_field_typed (s, "local-candidate",
FS_TYPE_CANDIDATE),
- "farsight-new-active-candidate-pair structure"
+ "farstream-new-active-candidate-pair structure"
" has no local-candidate field");
ts_fail_unless (
gst_structure_has_field_typed (s, "remote-candidate",
FS_TYPE_CANDIDATE),
- "farsight-new-active-candidate-pair structure"
+ "farstream-new-active-candidate-pair structure"
" has no remote-candidate field");
value = gst_structure_get_value (s, "stream");
@@ -580,7 +580,7 @@ _bus_callback (GstBus *bus, GstMessage *message, gpointer user_data)
stream, local_candidate, remote_candidate);
}
else if (gst_structure_has_name (s,
- "farsight-current-send-codec-changed"))
+ "farstream-current-send-codec-changed"))
{
FsSession *session;
FsCodec *codec;
@@ -589,12 +589,12 @@ _bus_callback (GstBus *bus, GstMessage *message, gpointer user_data)
ts_fail_unless (
gst_implements_interface_check (GST_MESSAGE_SRC (message),
FS_TYPE_CONFERENCE),
- "Received farsight-current-send-codec-change from non-farsight"
+ "Received farstream-current-send-codec-change from non-farstream"
" element");
ts_fail_unless (
gst_structure_has_field_typed (s, "session", FS_TYPE_SESSION),
- "farsight-current-send-codec-changed structure"
+ "farstream-current-send-codec-changed structure"
" has no session field");
ts_fail_unless (
gst_structure_has_field_typed (s, "codec",
@@ -613,7 +613,7 @@ _bus_callback (GstBus *bus, GstMessage *message, gpointer user_data)
_current_send_codec_changed (session, codec);
}
else if (gst_structure_has_name (s,
- "farsight-local-candidates-prepared"))
+ "farstream-local-candidates-prepared"))
{
FsStream *stream;
const GValue *value;
@@ -621,12 +621,12 @@ _bus_callback (GstBus *bus, GstMessage *message, gpointer user_data)
ts_fail_unless (
gst_implements_interface_check (GST_MESSAGE_SRC (message),
FS_TYPE_CONFERENCE),
- "Received farsight-local-candidates-prepared from non-farsight"
+ "Received farstream-local-candidates-prepared from non-farstream"
" element");
ts_fail_unless (
gst_structure_has_field_typed (s, "stream", FS_TYPE_STREAM),
- "farsight-local-candidates-prepared structure"
+ "farstream-local-candidates-prepared structure"
" has no stream field");
value = gst_structure_get_value (s, "stream");
@@ -1476,21 +1476,21 @@ static void unref_stream_init (struct SimpleTestConference *dat, guint confid)
GST_START_TEST (test_rawconference_unref_stream_in_nice_thread_prepared)
{
- signal_name = "farsight-local-candidates-prepared";
+ signal_name = "farstream-local-candidates-prepared";
nway_test (2, unref_stream_init, NULL, "nice", 0, NULL);
}
GST_END_TEST;
GST_START_TEST (test_rawconference_unref_stream_in_nice_thread_new_active)
{
- signal_name = "farsight-new-active-candidate-pair";
+ signal_name = "farstream-new-active-candidate-pair";
nway_test (2, unref_stream_init, NULL, "nice", 0, NULL);
}
GST_END_TEST;
GST_START_TEST (test_rawconference_unref_stream_in_nice_thread_state_changed)
{
- signal_name = "farsight-component-state-changed";
+ signal_name = "farstream-component-state-changed";
nway_test (2, unref_stream_init, NULL, "nice", 0, NULL);
}
GST_END_TEST;
diff --git a/tests/check/rtp/codecs.c b/tests/check/rtp/codecs.c
index 11b98f1..7096257 100644
--- a/tests/check/rtp/codecs.c
+++ b/tests/check/rtp/codecs.c
@@ -1,4 +1,4 @@
-/* Farsight 2 unit tests for FsRtpConferenceu
+/* Farstream unit tests for FsRtpConferenceu
*
* Copyright (C) 2007 Collabora, Nokia
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
@@ -23,8 +23,8 @@
#endif
#include <gst/check/gstcheck.h>
-#include <gst/farsight/fs-conference.h>
-#include <gst/farsight/fs-rtp.h>
+#include <gst/farstream/fs-conference.h>
+#include <gst/farstream/fs-rtp.h>
#include "generic.h"
@@ -608,7 +608,7 @@ _bus_message_element (GstBus *bus, GstMessage *message,
FsCodecParameter *param;
guint vorbis_id;
- if (!gst_structure_has_name (s, "farsight-codecs-changed"))
+ if (!gst_structure_has_name (s, "farstream-codecs-changed"))
return;
g_object_get (cd->dat->session, "codecs", &codecs, NULL);
@@ -947,10 +947,10 @@ profile_test (const gchar *send_profile, const gchar *recv_profile,
GList *item;
if (send_profile)
- fs_codec_add_optional_parameter (pref_codec, "farsight-send-profile",
+ fs_codec_add_optional_parameter (pref_codec, "farstream-send-profile",
send_profile);
if (recv_profile)
- fs_codec_add_optional_parameter (pref_codec, "farsight-recv-profile",
+ fs_codec_add_optional_parameter (pref_codec, "farstream-recv-profile",
recv_profile);
conf = gst_element_factory_make ("fsrtpconference", NULL);
@@ -1204,7 +1204,7 @@ GST_START_TEST (test_rtpcodecs_ptime)
{
const GstStructure *s = gst_message_get_structure (message);
- if (gst_structure_has_name (s, "farsight-send-codec-changed"))
+ if (gst_structure_has_name (s, "farstream-send-codec-changed"))
{
const GValue *val;
val = gst_structure_get_value (s, "codec");
@@ -1520,9 +1520,9 @@ GST_START_TEST (test_rtpcodecs_nego_ilbc)
fs_codec_add_optional_parameter (outprefcodec, "mode", "20");
prefcodec = fs_codec_copy (outprefcodec);
- fs_codec_add_optional_parameter (prefcodec, "farsight-recv-profile",
+ fs_codec_add_optional_parameter (prefcodec, "farstream-recv-profile",
"rtpilbcdepay ! identity");
- fs_codec_add_optional_parameter (prefcodec, "farsight-send-profile",
+ fs_codec_add_optional_parameter (prefcodec, "farstream-send-profile",
"identity ! rtpilbcpay");
codec = fs_codec_new (100, "ILBC", FS_MEDIA_TYPE_AUDIO, 8000);
@@ -1618,9 +1618,9 @@ GST_START_TEST (test_rtpcodecs_nego_g729)
8000);
prefcodec = fs_codec_copy (outprefcodec);
- fs_codec_add_optional_parameter (prefcodec, "farsight-recv-profile",
+ fs_codec_add_optional_parameter (prefcodec, "farstream-recv-profile",
"rtpg729depay ! identity");
- fs_codec_add_optional_parameter (prefcodec, "farsight-send-profile",
+ fs_codec_add_optional_parameter (prefcodec, "farstream-send-profile",
"identity ! rtpg729pay");
codec = fs_codec_new (18, "G729", FS_MEDIA_TYPE_AUDIO, 8000);
@@ -1717,9 +1717,9 @@ GST_START_TEST (test_rtpcodecs_nego_h261)
outprefcodec = fs_codec_new (FS_CODEC_ID_ANY, "H261", FS_MEDIA_TYPE_VIDEO,
90000);
prefcodec = fs_codec_copy (outprefcodec);
- fs_codec_add_optional_parameter (prefcodec, "farsight-recv-profile",
+ fs_codec_add_optional_parameter (prefcodec, "farstream-recv-profile",
"identity");
- fs_codec_add_optional_parameter (prefcodec, "farsight-send-profile",
+ fs_codec_add_optional_parameter (prefcodec, "farstream-send-profile",
"identity");
codec = fs_codec_new (31, "H261", FS_MEDIA_TYPE_VIDEO, 90000);
@@ -1795,9 +1795,9 @@ GST_START_TEST (test_rtpcodecs_nego_h263_1998)
outprefcodec = fs_codec_new (FS_CODEC_ID_ANY, "H263-1998",
FS_MEDIA_TYPE_VIDEO, 90000);
prefcodec = fs_codec_copy (outprefcodec);
- fs_codec_add_optional_parameter (prefcodec, "farsight-recv-profile",
+ fs_codec_add_optional_parameter (prefcodec, "farstream-recv-profile",
"identity");
- fs_codec_add_optional_parameter (prefcodec, "farsight-send-profile",
+ fs_codec_add_optional_parameter (prefcodec, "farstream-send-profile",
"identity");
codec = fs_codec_new (96, "H263-1998", FS_MEDIA_TYPE_VIDEO, 90000);
@@ -1957,9 +1957,9 @@ GST_START_TEST (test_rtpcodecs_nego_h263_2000)
outprefcodec = fs_codec_new (FS_CODEC_ID_ANY, "H263-2000",
FS_MEDIA_TYPE_VIDEO, 90000);
prefcodec = fs_codec_copy (outprefcodec);
- fs_codec_add_optional_parameter (prefcodec, "farsight-recv-profile",
+ fs_codec_add_optional_parameter (prefcodec, "farstream-recv-profile",
"identity");
- fs_codec_add_optional_parameter (prefcodec, "farsight-send-profile",
+ fs_codec_add_optional_parameter (prefcodec, "farstream-send-profile",
"identity");
codec = fs_codec_new (96, "H263-2000", FS_MEDIA_TYPE_VIDEO, 90000);
@@ -2043,9 +2043,9 @@ GST_START_TEST (test_rtpcodecs_nego_h264)
outprefcodec = fs_codec_new (FS_CODEC_ID_ANY, "H264",
FS_MEDIA_TYPE_VIDEO, 90000);
prefcodec = fs_codec_copy (outprefcodec);
- fs_codec_add_optional_parameter (prefcodec, "farsight-recv-profile",
+ fs_codec_add_optional_parameter (prefcodec, "farstream-recv-profile",
"identity");
- fs_codec_add_optional_parameter (prefcodec, "farsight-send-profile",
+ fs_codec_add_optional_parameter (prefcodec, "farstream-send-profile",
"identity");
codec = fs_codec_new (96, "H264", FS_MEDIA_TYPE_VIDEO, 90000);
@@ -2175,9 +2175,9 @@ GST_START_TEST (test_rtpcodecs_nego_feedback)
outprefcodec = fs_codec_new (FS_CODEC_ID_ANY, "H264",
FS_MEDIA_TYPE_VIDEO, 90000);
prefcodec = fs_codec_copy (outprefcodec);
- fs_codec_add_optional_parameter (prefcodec, "farsight-recv-profile",
+ fs_codec_add_optional_parameter (prefcodec, "farstream-recv-profile",
"identity");
- fs_codec_add_optional_parameter (prefcodec, "farsight-send-profile",
+ fs_codec_add_optional_parameter (prefcodec, "farstream-send-profile",
"identity");
codec = fs_codec_new (96, "H264", FS_MEDIA_TYPE_VIDEO, 90000);
diff --git a/tests/check/rtp/conference.c b/tests/check/rtp/conference.c
index 6000921..0a52467 100644
--- a/tests/check/rtp/conference.c
+++ b/tests/check/rtp/conference.c
@@ -1,4 +1,4 @@
-/* Farsight 2 unit tests for FsRtpConference
+/* Farstream unit tests for FsRtpConference
*
* Copyright (C) 2007 Collabora, Nokia
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
@@ -23,8 +23,8 @@
#endif
#include <gst/check/gstcheck.h>
-#include <gst/farsight/fs-conference.h>
-#include <gst/farsight/fs-stream-transmitter.h>
+#include <gst/farstream/fs-conference.h>
+#include <gst/farstream/fs-stream-transmitter.h>
#include "check-threadsafe.h"
@@ -241,7 +241,7 @@ _bus_callback (GstBus *bus, GstMessage *message, gpointer user_data)
{
const GstStructure *s = gst_message_get_structure (message);
ts_fail_if (s==NULL, "NULL structure in element message");
- if (gst_structure_has_name (s, "farsight-error"))
+ if (gst_structure_has_name (s, "farstream-error"))
{
const GValue *value;
FsError errorno;
@@ -250,17 +250,17 @@ _bus_callback (GstBus *bus, GstMessage *message, gpointer user_data)
ts_fail_unless (
gst_implements_interface_check (GST_MESSAGE_SRC (message),
FS_TYPE_CONFERENCE),
- "Received farsight-error from non-farsight element");
+ "Received farstream-error from non-farstream element");
ts_fail_unless (
gst_structure_has_field_typed (s, "src-object", G_TYPE_OBJECT),
- "farsight-error structure has no src-object field");
+ "farstream-error structure has no src-object field");
ts_fail_unless (
gst_structure_has_field_typed (s, "error-no", FS_TYPE_ERROR),
- "farsight-error structure has no src-object field");
+ "farstream-error structure has no src-object field");
ts_fail_unless (
gst_structure_has_field_typed (s, "error-msg", G_TYPE_STRING),
- "farsight-error structure has no src-object field");
+ "farstream-error structure has no src-object field");
value = gst_structure_get_value (s, "error-no");
errorno = g_value_get_enum (value);
@@ -268,7 +268,7 @@ _bus_callback (GstBus *bus, GstMessage *message, gpointer user_data)
ts_fail ("Error on BUS (%d) %s", errorno, error);
}
- else if (gst_structure_has_name (s, "farsight-new-local-candidate"))
+ else if (gst_structure_has_name (s, "farstream-new-local-candidate"))
{
FsStream *stream;
FsCandidate *candidate;
@@ -277,14 +277,14 @@ _bus_callback (GstBus *bus, GstMessage *message, gpointer user_data)
ts_fail_unless (
gst_implements_interface_check (GST_MESSAGE_SRC (message),
FS_TYPE_CONFERENCE),
- "Received farsight-error from non-farsight element");
+ "Received farstream-error from non-farstream element");
ts_fail_unless (
gst_structure_has_field_typed (s, "stream", FS_TYPE_STREAM),
- "farsight-new-local-candidate structure has no stream field");
+ "farstream-new-local-candidate structure has no stream field");
ts_fail_unless (
gst_structure_has_field_typed (s, "candidate", FS_TYPE_CANDIDATE),
- "farsight-new-local-candidate structure has no candidate field");
+ "farstream-new-local-candidate structure has no candidate field");
value = gst_structure_get_value (s, "stream");
stream = g_value_get_object (value);
@@ -298,7 +298,7 @@ _bus_callback (GstBus *bus, GstMessage *message, gpointer user_data)
_new_local_candidate (stream, candidate);
}
else if (gst_structure_has_name (s,
- "farsight-new-active-candidate-pair"))
+ "farstream-new-active-candidate-pair"))
{
FsStream *stream;
FsCandidate *local_candidate, *remote_candidate;
@@ -307,21 +307,21 @@ _bus_callback (GstBus *bus, GstMessage *message, gpointer user_data)
ts_fail_unless (
gst_implements_interface_check (GST_MESSAGE_SRC (message),
FS_TYPE_CONFERENCE),
- "Received farsight-error from non-farsight element");
+ "Received farstream-error from non-farstream element");
ts_fail_unless (
gst_structure_has_field_typed (s, "stream", FS_TYPE_STREAM),
- "farsight-new-active-candidate-pair structure"
+ "farstream-new-active-candidate-pair structure"
" has no stream field");
ts_fail_unless (
gst_structure_has_field_typed (s, "local-candidate",
FS_TYPE_CANDIDATE),
- "farsight-new-active-candidate-pair structure"
+ "farstream-new-active-candidate-pair structure"
" has no local-candidate field");
ts_fail_unless (
gst_structure_has_field_typed (s, "remote-candidate",
FS_TYPE_CANDIDATE),
- "farsight-new-active-candidate-pair structure"
+ "farstream-new-active-candidate-pair structure"
" has no remote-candidate field");
value = gst_structure_get_value (s, "stream");
@@ -337,7 +337,7 @@ _bus_callback (GstBus *bus, GstMessage *message, gpointer user_data)
stream, local_candidate, remote_candidate);
}
else if (gst_structure_has_name (s,
- "farsight-current-send-codec-changed"))
+ "farstream-current-send-codec-changed"))
{
FsSession *session;
FsCodec *codec;
@@ -346,12 +346,12 @@ _bus_callback (GstBus *bus, GstMessage *message, gpointer user_data)
ts_fail_unless (
gst_implements_interface_check (GST_MESSAGE_SRC (message),
FS_TYPE_CONFERENCE),
- "Received farsight-current-send-codec-change from non-farsight"
+ "Received farstream-current-send-codec-change from non-farstream"
" element");
ts_fail_unless (
gst_structure_has_field_typed (s, "session", FS_TYPE_SESSION),
- "farsight-current-send-codec-changed structure"
+ "farstream-current-send-codec-changed structure"
" has no session field");
ts_fail_unless (
gst_structure_has_field_typed (s, "codec",
@@ -370,7 +370,7 @@ _bus_callback (GstBus *bus, GstMessage *message, gpointer user_data)
_current_send_codec_changed (session, codec);
}
else if (gst_structure_has_name (s,
- "farsight-local-candidates-prepared"))
+ "farstream-local-candidates-prepared"))
{
FsStream *stream;
const GValue *value;
@@ -378,12 +378,12 @@ _bus_callback (GstBus *bus, GstMessage *message, gpointer user_data)
ts_fail_unless (
gst_implements_interface_check (GST_MESSAGE_SRC (message),
FS_TYPE_CONFERENCE),
- "Received farsight-local-candidates-prepared from non-farsight"
+ "Received farstream-local-candidates-prepared from non-farstream"
" element");
ts_fail_unless (
gst_structure_has_field_typed (s, "stream", FS_TYPE_STREAM),
- "farsight-local-candidates-prepared structure"
+ "farstream-local-candidates-prepared structure"
" has no stream field");
value = gst_structure_get_value (s, "stream");
@@ -1122,7 +1122,7 @@ _simple_profile_init (struct SimpleTestStream *st, guint confid, guint streamid)
gboolean ret;
codec = fs_codec_new (0, "PCMU", FS_MEDIA_TYPE_AUDIO, 8000);
- fs_codec_add_optional_parameter (codec, "farsight-send-profile",
+ fs_codec_add_optional_parameter (codec, "farstream-send-profile",
"audioconvert ! audioresample ! audioconvert ! mulawenc ! rtppcmupay");
prefs = g_list_append (NULL, codec);
@@ -1204,7 +1204,7 @@ _double_profile_init (struct SimpleTestStream *st, guint confid, guint streamid)
st->handoff_handler = G_CALLBACK (_double_codec_handoff_handler);
codec = fs_codec_new (0, "PCMU", FS_MEDIA_TYPE_AUDIO, 8000);
- fs_codec_add_optional_parameter (codec, "farsight-send-profile",
+ fs_codec_add_optional_parameter (codec, "farstream-send-profile",
"tee name=t "
"t. ! audioconvert ! audioresample ! audioconvert ! mulawenc ! rtppcmupay "
"t. ! audioconvert ! audioresample ! audioconvert ! alawenc ! rtppcmapay");
@@ -1484,21 +1484,21 @@ static void unref_stream_init (struct SimpleTestConference *dat, guint confid)
GST_START_TEST (test_rtpconference_unref_stream_in_nice_thread_prepared)
{
- signal_name = "farsight-local-candidates-prepared";
+ signal_name = "farstream-local-candidates-prepared";
nway_test (2, unref_stream_init, NULL, "nice", 0, NULL);
}
GST_END_TEST;
GST_START_TEST (test_rtpconference_unref_stream_in_nice_thread_new_active)
{
- signal_name = "farsight-new-active-candidate-pair";
+ signal_name = "farstream-new-active-candidate-pair";
nway_test (2, unref_stream_init, NULL, "nice", 0, NULL);
}
GST_END_TEST;
GST_START_TEST (test_rtpconference_unref_stream_in_nice_thread_state_changed)
{
- signal_name = "farsight-component-state-changed";
+ signal_name = "farstream-component-state-changed";
nway_test (2, unref_stream_init, NULL, "nice", 0, NULL);
}
GST_END_TEST;
diff --git a/tests/check/rtp/generic.c b/tests/check/rtp/generic.c
index 4c9ac9a..f0d5835 100644
--- a/tests/check/rtp/generic.c
+++ b/tests/check/rtp/generic.c
@@ -1,4 +1,4 @@
-/* Farsigh2 generic unit tests for conferences
+/* Farstream generic unit tests for conferences
*
* Copyright (C) 2007 Collabora, Nokia
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
@@ -26,7 +26,7 @@
#include "generic.h"
#include <gst/check/gstcheck.h>
-#include <gst/farsight/fs-conference.h>
+#include <gst/farstream/fs-conference.h>
static GstBusSyncReply
diff --git a/tests/check/rtp/generic.h b/tests/check/rtp/generic.h
index 0cefec5..2b908b2 100644
--- a/tests/check/rtp/generic.h
+++ b/tests/check/rtp/generic.h
@@ -1,4 +1,4 @@
-/* Farsigh2 generic unit tests for conferences
+/* Farstream generic unit tests for conferences
*
* Copyright (C) 2007 Collabora, Nokia
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
@@ -23,7 +23,7 @@
#define __GENERIC_H__
#include <gst/gst.h>
-#include <gst/farsight/fs-conference.h>
+#include <gst/farstream/fs-conference.h>
struct SimpleTestConference {
gint id;
diff --git a/tests/check/rtp/recvcodecs.c b/tests/check/rtp/recvcodecs.c
index 8639e6b..4492af7 100644
--- a/tests/check/rtp/recvcodecs.c
+++ b/tests/check/rtp/recvcodecs.c
@@ -1,4 +1,4 @@
-/* Farsight 2 unit tests for FsRtpConference
+/* Farstream unit tests for FsRtpConference
*
* Copyright (C) 2007 Collabora, Nokia
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
@@ -25,8 +25,8 @@
#include <gst/check/gstcheck.h>
#include <gst/rtp/gstrtpbuffer.h>
-#include <gst/farsight/fs-conference.h>
-#include <gst/farsight/fs-element-added-notifier.h>
+#include <gst/farstream/fs-conference.h>
+#include <gst/farstream/fs-element-added-notifier.h>
#include "check-threadsafe.h"
@@ -266,16 +266,16 @@ GST_START_TEST (test_rtprecv_inband_config_data)
fail_unless (msg != NULL);
s = gst_message_get_structure (msg);
- fail_if (gst_structure_has_name (s, "farsight-local-candidates-prepared"));
+ fail_if (gst_structure_has_name (s, "farstream-local-candidates-prepared"));
- if (gst_structure_has_name (s, "farsight-new-local-candidate"))
+ if (gst_structure_has_name (s, "farstream-new-local-candidate"))
{
const GValue *value;
FsCandidate *candidate;
ts_fail_unless (
gst_structure_has_field_typed (s, "candidate", FS_TYPE_CANDIDATE),
- "farsight-new-local-candidate structure has no candidate field");
+ "farstream-new-local-candidate structure has no candidate field");
value = gst_structure_get_value (s, "candidate");
candidate = g_value_get_boxed (value);
diff --git a/tests/check/rtp/sendcodecs.c b/tests/check/rtp/sendcodecs.c
index 06f5666..3be52c0 100644
--- a/tests/check/rtp/sendcodecs.c
+++ b/tests/check/rtp/sendcodecs.c
@@ -1,4 +1,4 @@
-/* Farsight 2 unit tests for FsRtpConference
+/* Farstream unit tests for FsRtpConference
*
* Copyright (C) 2007 Collabora, Nokia
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
@@ -25,7 +25,7 @@
#include <gst/check/gstcheck.h>
#include <gst/rtp/gstrtpbuffer.h>
-#include <gst/farsight/fs-conference.h>
+#include <gst/farstream/fs-conference.h>
#include "check-threadsafe.h"
#include "generic.h"
@@ -72,7 +72,7 @@ _bus_callback (GstBus *bus, GstMessage *message, gpointer user_data)
if (gst_implements_interface_check (GST_MESSAGE_SRC (message),
FS_TYPE_CONFERENCE) &&
- gst_structure_has_name (s, "farsight-error"))
+ gst_structure_has_name (s, "farstream-error"))
{
const GValue *value;
FsError errorno;
@@ -83,17 +83,17 @@ _bus_callback (GstBus *bus, GstMessage *message, gpointer user_data)
ts_fail_unless (
gst_implements_interface_check (GST_MESSAGE_SRC (message),
FS_TYPE_CONFERENCE),
- "Received farsight-error from non-farsight element");
+ "Received farstream-error from non-farstream element");
ts_fail_unless (
gst_structure_has_field_typed (s, "src-object", G_TYPE_OBJECT),
- "farsight-error structure has no src-object field");
+ "farstream-error structure has no src-object field");
ts_fail_unless (
gst_structure_has_field_typed (s, "error-no", FS_TYPE_ERROR),
- "farsight-error structure has no src-object field");
+ "farstream-error structure has no src-object field");
ts_fail_unless (
gst_structure_has_field_typed (s, "error-msg", G_TYPE_STRING),
- "farsight-error structure has no src-object field");
+ "farstream-error structure has no src-object field");
value = gst_structure_get_value (s, "error-no");
errorno = g_value_get_enum (value);
@@ -106,7 +106,7 @@ _bus_callback (GstBus *bus, GstMessage *message, gpointer user_data)
error);
g_type_class_unref (enumclass);
}
- else if (gst_structure_has_name (s, "farsight-send-codec-changed"))
+ else if (gst_structure_has_name (s, "farstream-send-codec-changed"))
{
FsCodec *codec = NULL;
GList *secondary_codec_list = NULL;
diff --git a/tests/check/testutils.c b/tests/check/testutils.c
index 93d6143..089b9da 100644
--- a/tests/check/testutils.c
+++ b/tests/check/testutils.c
@@ -1,4 +1,4 @@
-/* Farsight 2 unit tests generic utilities
+/* Farstream unit tests generic utilities
*
* Copyright (C) 2007 Collabora, Nokia
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
diff --git a/tests/check/testutils.h b/tests/check/testutils.h
index ef1df35..41ad62b 100644
--- a/tests/check/testutils.h
+++ b/tests/check/testutils.h
@@ -1,4 +1,4 @@
-/* Farsight 2 unit tests generic utilities
+/* Farstream unit tests generic utilities
*
* Copyright (C) 2007 Collabora, Nokia
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
diff --git a/tests/check/transmitter/fake-filter.c b/tests/check/transmitter/fake-filter.c
index d3a870d..73e5d12 100644
--- a/tests/check/transmitter/fake-filter.c
+++ b/tests/check/transmitter/fake-filter.c
@@ -1,5 +1,5 @@
/*
- * Farsight Voice+Video library
+ * Farstream Voice+Video library
*
* Copyright 2008 Collabora Ltd,
* Copyright 2008 Nokia Corporation
@@ -171,7 +171,7 @@ fs_fake_filter_register (void)
fs_fake_filter_plugin_init,
VERSION,
"LGPL",
- "Farsight",
- "Farsight2",
- "Farsight2 testing suite");
+ "Farstream",
+ "Farstream",
+ "Farstream testing suite");
}
diff --git a/tests/check/transmitter/fake-filter.h b/tests/check/transmitter/fake-filter.h
index f93642e..c56d71f 100644
--- a/tests/check/transmitter/fake-filter.h
+++ b/tests/check/transmitter/fake-filter.h
@@ -1,5 +1,5 @@
/*
- * Farsight Voice+Video library
+ * Farstream Voice+Video library
*
* Copyright 2008 Collabora Ltd,
* Copyright 2008 Nokia Corporation
diff --git a/tests/check/transmitter/generic.c b/tests/check/transmitter/generic.c
index d77f97b..c1c90bb 100644
--- a/tests/check/transmitter/generic.c
+++ b/tests/check/transmitter/generic.c
@@ -1,4 +1,4 @@
-/* Farsigh2 generic unit tests for transmitters
+/* Farstream generic unit tests for transmitters
*
* Copyright (C) 2007 Collabora, Nokia
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
@@ -23,8 +23,8 @@
#endif
#include <gst/check/gstcheck.h>
-#include <gst/farsight/fs-transmitter.h>
-#include <gst/farsight/fs-stream-transmitter.h>
+#include <gst/farstream/fs-transmitter.h>
+#include <gst/farstream/fs-stream-transmitter.h>
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/tests/check/transmitter/generic.h b/tests/check/transmitter/generic.h
index 4aadf80..bbe6120 100644
--- a/tests/check/transmitter/generic.h
+++ b/tests/check/transmitter/generic.h
@@ -1,4 +1,4 @@
-/* Farsigh2 generic unit tests for transmitters
+/* Farstream generic unit tests for transmitters
*
* Copyright (C) 2007 Collabora, Nokia
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
@@ -20,7 +20,7 @@
#include <gst/gst.h>
-#include <gst/farsight/fs-transmitter.h>
+#include <gst/farstream/fs-transmitter.h>
#ifndef __GENERIC_H__
#define __GENERIC_H__
diff --git a/tests/check/transmitter/multicast.c b/tests/check/transmitter/multicast.c
index 1415dc3..097913a 100644
--- a/tests/check/transmitter/multicast.c
+++ b/tests/check/transmitter/multicast.c
@@ -1,4 +1,4 @@
-/* Farsight 2 unit tests for FsMulticastTransmitter
+/* Farstream unit tests for FsMulticastTransmitter
*
* Copyright (C) 2007 Collabora, Nokia
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
@@ -23,8 +23,8 @@
#endif
#include <gst/check/gstcheck.h>
-#include <gst/farsight/fs-transmitter.h>
-#include <gst/farsight/fs-conference.h>
+#include <gst/farstream/fs-transmitter.h>
+#include <gst/farstream/fs-conference.h>
#include "check-threadsafe.h"
#include "generic.h"
diff --git a/tests/check/transmitter/nice.c b/tests/check/transmitter/nice.c
index 0d49ad5..cc3234f 100644
--- a/tests/check/transmitter/nice.c
+++ b/tests/check/transmitter/nice.c
@@ -1,4 +1,4 @@
-/* Farsight 2 unit tests for FsRawUdpTransmitter
+/* Farstream unit tests for FsRawUdpTransmitter
*
* Copyright (C) 2007 Collabora, Nokia
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
@@ -23,8 +23,8 @@
#endif
#include <gst/check/gstcheck.h>
-#include <gst/farsight/fs-transmitter.h>
-#include <gst/farsight/fs-conference.h>
+#include <gst/farstream/fs-transmitter.h>
+#include <gst/farstream/fs-conference.h>
#include <unistd.h>
diff --git a/tests/check/transmitter/rawudp-upnp.c b/tests/check/transmitter/rawudp-upnp.c
index 327fec1..a21c603 100644
--- a/tests/check/transmitter/rawudp-upnp.c
+++ b/tests/check/transmitter/rawudp-upnp.c
@@ -1,4 +1,4 @@
-/* Farsight 2 unit tests for FsRawUdpTransmitter UPnP code
+/* Farstream unit tests for FsRawUdpTransmitter UPnP code
*
* Copyright (C) 2009 Collabora, Nokia
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
diff --git a/tests/check/transmitter/rawudp-upnp.h b/tests/check/transmitter/rawudp-upnp.h
index 2c6d84f..1b05653 100644
--- a/tests/check/transmitter/rawudp-upnp.h
+++ b/tests/check/transmitter/rawudp-upnp.h
@@ -1,4 +1,4 @@
-/* Farsight 2 unit tests for FsRawUdpTransmitter UPnP code
+/* Farstream unit tests for FsRawUdpTransmitter UPnP code
*
* Copyright (C) 2008 Collabora, Nokia
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
diff --git a/tests/check/transmitter/rawudp.c b/tests/check/transmitter/rawudp.c
index 38980aa..a87a24d 100644
--- a/tests/check/transmitter/rawudp.c
+++ b/tests/check/transmitter/rawudp.c
@@ -1,4 +1,4 @@
-/* Farsight 2 unit tests for FsRawUdpTransmitter
+/* Farstream unit tests for FsRawUdpTransmitter
*
* Copyright (C) 2007 Collabora, Nokia
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
@@ -23,8 +23,8 @@
#endif
#include <gst/check/gstcheck.h>
-#include <gst/farsight/fs-transmitter.h>
-#include <gst/farsight/fs-conference.h>
+#include <gst/farstream/fs-transmitter.h>
+#include <gst/farstream/fs-conference.h>
#include <arpa/inet.h>
#include <netdb.h>
diff --git a/tests/check/transmitter/shm.c b/tests/check/transmitter/shm.c
index 9fa7573..4d3c6d7 100644
--- a/tests/check/transmitter/shm.c
+++ b/tests/check/transmitter/shm.c
@@ -1,4 +1,4 @@
-/* Farsight 2 unit tests for FsShmTransmitter
+/* Farstream unit tests for FsShmTransmitter
*
* Copyright (C) 2009 Collabora Ltd
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
@@ -24,8 +24,8 @@
#endif
#include <gst/check/gstcheck.h>
-#include <gst/farsight/fs-transmitter.h>
-#include <gst/farsight/fs-conference.h>
+#include <gst/farstream/fs-transmitter.h>
+#include <gst/farstream/fs-conference.h>
#include <arpa/inet.h>
#include <netdb.h>
diff --git a/tests/check/transmitter/stunalternd.c b/tests/check/transmitter/stunalternd.c
index 1ee1c34..a1f796d 100644
--- a/tests/check/transmitter/stunalternd.c
+++ b/tests/check/transmitter/stunalternd.c
@@ -1,4 +1,4 @@
-/* Farsight 2 unit tests for FsRawUdpTransmitter
+/* Farstream unit tests for FsRawUdpTransmitter
* This file is taken from the Nice GLib ICE library.
*
* (C) 2007-2009 Nokia Corporation
diff --git a/tests/check/transmitter/stunalternd.h b/tests/check/transmitter/stunalternd.h
index d5be290..25e975c 100644
--- a/tests/check/transmitter/stunalternd.h
+++ b/tests/check/transmitter/stunalternd.h
@@ -1,4 +1,4 @@
-/* Farsight 2 unit tests for FsRawUdpTransmitter
+/* Farstream unit tests for FsRawUdpTransmitter
* This file is taken from the Nice GLib ICE library.
*
* (C) 2007-2009 Nokia Corporation
diff --git a/tests/check/utils/binadded.c b/tests/check/utils/binadded.c
index be3df2d..1c4e80e 100644
--- a/tests/check/utils/binadded.c
+++ b/tests/check/utils/binadded.c
@@ -1,4 +1,4 @@
-/* Farsigh2 unit tests for FsCodec
+/* Farstream unit tests for FsCodec
*
* Copyright (C) 2007 Collabora, Nokia
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
@@ -24,7 +24,7 @@
#endif
#include <gst/check/gstcheck.h>
-#include <gst/farsight/fs-element-added-notifier.h>
+#include <gst/farstream/fs-element-added-notifier.h>
#include "testutils.h"
diff --git a/tests/rtp/Makefile.am b/tests/rtp/Makefile.am
index 0a52cb1..91801e7 100644
--- a/tests/rtp/Makefile.am
+++ b/tests/rtp/Makefile.am
@@ -5,14 +5,14 @@ codec_discovery_SOURCES = codec-discovery.c
codec_discovery_CFLAGS = \
-I$(top_srcdir)/gst/fsrtpconference/ \
-I$(top_builddir)/gst/fsrtpconference/ \
- $(FS2_INTERNAL_CFLAGS) \
- $(FS2_CFLAGS) \
+ $(FS_INTERNAL_CFLAGS) \
+ $(FS_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_CFLAGS) \
$(CFLAGS)
LDADD = \
- $(top_builddir)/gst-libs/gst/farsight/libgstfarsight-0.10.la \
+ $(top_builddir)/gst-libs/gst/farstream/libgstfarstream-0.10.la \
$(top_builddir)/gst/fsrtpconference/libfsrtpconference-convenience.la \
$(GST_CHECK_LIBS) \
$(GST_PLUGINS_BASE_LIBS) \
diff --git a/tests/rtp/codec-discovery.c b/tests/rtp/codec-discovery.c
index 291b85b..5e7c99b 100644
--- a/tests/rtp/codec-discovery.c
+++ b/tests/rtp/codec-discovery.c
@@ -1,4 +1,4 @@
-/* Farsight 2 ad-hoc test for the rtp codec discovery
+/* Farstream ad-hoc test for the rtp codec discovery
*
* Copyright (C) 2007 Collabora, Nokia
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
@@ -20,7 +20,7 @@
#include <gst/gst.h>
-#include <gst/farsight/fs-codec.h>
+#include <gst/farstream/fs-codec.h>
#include "fs-rtp-discover-codecs.h"
#include "fs-rtp-conference.h"
@@ -76,11 +76,11 @@ int main (int argc, char **argv)
gst_init (&argc, &argv);
GST_DEBUG_CATEGORY_INIT (fsrtpconference_debug, "fsrtpconference", 0,
- "Farsight RTP Conference Element");
+ "Farstream RTP Conference Element");
GST_DEBUG_CATEGORY_INIT (fsrtpconference_disco, "fsrtpconference_disco",
- 0, "Farsight RTP Codec Discovery");
+ 0, "Farstream RTP Codec Discovery");
GST_DEBUG_CATEGORY_INIT (fsrtpconference_nego, "fsrtpconference_nego",
- 0, "Farsight RTP Codec Negotiation");
+ 0, "Farstream RTP Codec Negotiation");
gst_debug_set_default_threshold (GST_LEVEL_WARNING);
diff --git a/transmitters/Makefile.am b/transmitters/Makefile.am
index 0a91f81..dd9d02d 100644
--- a/transmitters/Makefile.am
+++ b/transmitters/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = $(FS2_TRANSMITTER_PLUGINS_SELECTED)
-DIST_SUBDIRS = $(FS2_TRANSMITTER_PLUGINS_ALL)
+SUBDIRS = $(FS_TRANSMITTER_PLUGINS_SELECTED)
+DIST_SUBDIRS = $(FS_TRANSMITTER_PLUGINS_ALL)
diff --git a/transmitters/multicast/Makefile.am b/transmitters/multicast/Makefile.am
index 36252d3..80b5ffd 100644
--- a/transmitters/multicast/Makefile.am
+++ b/transmitters/multicast/Makefile.am
@@ -1,5 +1,5 @@
-plugindir = $(FS2_PLUGIN_PATH)
+plugindir = $(FS_PLUGIN_PATH)
plugin_LTLIBRARIES = libmulticast-transmitter.la
@@ -10,14 +10,14 @@ libmulticast_transmitter_la_SOURCES = \
# flags used to compile this plugin
libmulticast_transmitter_la_CFLAGS = \
- $(FS2_INTERNAL_CFLAGS) \
- $(FS2_CFLAGS) \
+ $(FS_INTERNAL_CFLAGS) \
+ $(FS_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_CFLAGS)
-libmulticast_transmitter_la_LDFLAGS = $(FS2_PLUGIN_LDFLAGS)
+libmulticast_transmitter_la_LDFLAGS = $(FS_PLUGIN_LDFLAGS)
libmulticast_transmitter_la_LIBADD = \
- $(top_builddir)/gst-libs/gst/farsight/libgstfarsight-0.10.la \
- $(FS2_LIBS) \
+ $(top_builddir)/gst-libs/gst/farstream/libgstfarstream-0.10.la \
+ $(FS_LIBS) \
$(GST_BASE_LIBS) \
$(GST_LIBS)
diff --git a/transmitters/multicast/fs-multicast-stream-transmitter.c b/transmitters/multicast/fs-multicast-stream-transmitter.c
index 264e6d7..76ac474 100644
--- a/transmitters/multicast/fs-multicast-stream-transmitter.c
+++ b/transmitters/multicast/fs-multicast-stream-transmitter.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight Multicast UDP Stream Transmitter
+ * Farstream - Farstream Multicast UDP Stream Transmitter
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-multicast-stream-transmitter.c - A Farsight Multiast UDP stream transmitter
+ * fs-multicast-stream-transmitter.c - A Farstream Multiast UDP stream transmitter
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -60,8 +60,8 @@
#include "fs-multicast-stream-transmitter.h"
#include "fs-multicast-transmitter.h"
-#include <gst/farsight/fs-candidate.h>
-#include <gst/farsight/fs-conference.h>
+#include <gst/farstream/fs-candidate.h>
+#include <gst/farstream/fs-conference.h>
#include <gst/gst.h>
diff --git a/transmitters/multicast/fs-multicast-stream-transmitter.h b/transmitters/multicast/fs-multicast-stream-transmitter.h
index 094999c..87f2dd9 100644
--- a/transmitters/multicast/fs-multicast-stream-transmitter.h
+++ b/transmitters/multicast/fs-multicast-stream-transmitter.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight Multicast UDP Stream Transmitter
+ * Farstream - Farstream Multicast UDP Stream Transmitter
*
* Copyright 2007-2008 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007-2008 Nokia Corp.
*
- * fs-multicast stream-transmitter.h - A Farsight Multicast UDP stream transmitter
+ * fs-multicast stream-transmitter.h - A Farstream Multicast UDP stream transmitter
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -28,8 +28,8 @@
#include <glib.h>
#include <glib-object.h>
-#include <gst/farsight/fs-stream-transmitter.h>
-#include <gst/farsight/fs-plugin.h>
+#include <gst/farstream/fs-stream-transmitter.h>
+#include <gst/farstream/fs-plugin.h>
#include "fs-multicast-transmitter.h"
G_BEGIN_DECLS
diff --git a/transmitters/multicast/fs-multicast-transmitter.c b/transmitters/multicast/fs-multicast-transmitter.c
index 14f6a74..ae3fcb2 100644
--- a/transmitters/multicast/fs-multicast-transmitter.c
+++ b/transmitters/multicast/fs-multicast-transmitter.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight Multicast UDP Transmitter
+ * Farstream - Farstream Multicast UDP Transmitter
*
* Copyright 2007-2008 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007-2008 Nokia Corp.
*
- * fs-multicast-transmitter.c - A Farsight multicast UDP transmitter
+ * fs-multicast-transmitter.c - A Farstream multicast UDP transmitter
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -37,8 +37,8 @@
#include "fs-multicast-transmitter.h"
#include "fs-multicast-stream-transmitter.h"
-#include <gst/farsight/fs-conference.h>
-#include <gst/farsight/fs-plugin.h>
+#include <gst/farstream/fs-conference.h>
+#include <gst/farstream/fs-plugin.h>
#include <string.h>
#include <sys/types.h>
@@ -161,7 +161,7 @@ fs_multicast_transmitter_register_type (FsPlugin *module)
GST_DEBUG_CATEGORY_INIT (fs_multicast_transmitter_debug,
"fsmulticasttransmitter", 0,
- "Farsight multicast UDP transmitter");
+ "Farstream multicast UDP transmitter");
fs_multicast_stream_transmitter_register_type (module);
diff --git a/transmitters/multicast/fs-multicast-transmitter.h b/transmitters/multicast/fs-multicast-transmitter.h
index 37c0b6b..07c359c 100644
--- a/transmitters/multicast/fs-multicast-transmitter.h
+++ b/transmitters/multicast/fs-multicast-transmitter.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight Multicast UDP Transmitter
+ * Farstream - Farstream Multicast UDP Transmitter
*
* Copyright 2007-2008 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007-2008 Nokia Corp.
*
- * fs-multicast-transmitter.h - A Farsight Multicast UDP transmitter
+ * fs-multicast-transmitter.h - A Farstream Multicast UDP transmitter
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -25,7 +25,7 @@
#ifndef __FS_MULTICAST_TRANSMITTER_H__
#define __FS_MULTICAST_TRANSMITTER_H__
-#include <gst/farsight/fs-transmitter.h>
+#include <gst/farstream/fs-transmitter.h>
#include <gst/gst.h>
diff --git a/transmitters/nice/Makefile.am b/transmitters/nice/Makefile.am
index ef9dfec..64ef937 100644
--- a/transmitters/nice/Makefile.am
+++ b/transmitters/nice/Makefile.am
@@ -1,5 +1,5 @@
-plugindir = $(FS2_PLUGIN_PATH)
+plugindir = $(FS_PLUGIN_PATH)
plugin_LTLIBRARIES = libnice-transmitter.la
@@ -11,15 +11,15 @@ libnice_transmitter_la_SOURCES = \
# flags used to compile this plugin
libnice_transmitter_la_CFLAGS = \
- $(FS2_INTERNAL_CFLAGS) \
- $(FS2_CFLAGS) \
+ $(FS_INTERNAL_CFLAGS) \
+ $(FS_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_CFLAGS) \
$(NICE_CFLAGS)
-libnice_transmitter_la_LDFLAGS = $(FS2_PLUGIN_LDFLAGS)
+libnice_transmitter_la_LDFLAGS = $(FS_PLUGIN_LDFLAGS)
libnice_transmitter_la_LIBADD = \
- $(top_builddir)/gst-libs/gst/farsight/libgstfarsight-0.10.la \
- $(FS2_LIBS) \
+ $(top_builddir)/gst-libs/gst/farstream/libgstfarstream-0.10.la \
+ $(FS_LIBS) \
$(GST_BASE_LIBS) \
$(GST_LIBS) \
$(NICE_LIBS)
diff --git a/transmitters/nice/fs-nice-agent.c b/transmitters/nice/fs-nice-agent.c
index 3b350e2..1e1e2c6 100644
--- a/transmitters/nice/fs-nice-agent.c
+++ b/transmitters/nice/fs-nice-agent.c
@@ -32,7 +32,7 @@
#include "config.h"
#endif
-#include <gst/farsight/fs-conference.h>
+#include <gst/farstream/fs-conference.h>
#include "fs-nice-transmitter.h"
#include "fs-nice-agent.h"
diff --git a/transmitters/nice/fs-nice-agent.h b/transmitters/nice/fs-nice-agent.h
index eed41cc..6e63410 100644
--- a/transmitters/nice/fs-nice-agent.h
+++ b/transmitters/nice/fs-nice-agent.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight libnice Transmitter agent object
+ * Farstream - Farstream libnice Transmitter agent object
*
* Copyright 2007-2008 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007-2008 Nokia Corp.
*
- * fs-nice-agent.h - A Farsight libnice transmitter agent object
+ * fs-nice-agent.h - A Farstream libnice transmitter agent object
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -26,7 +26,7 @@
#define __FS_NICE_AGENT_H__
#include <glib-object.h>
-#include <gst/farsight/fs-plugin.h>
+#include <gst/farstream/fs-plugin.h>
G_BEGIN_DECLS
diff --git a/transmitters/nice/fs-nice-stream-transmitter.c b/transmitters/nice/fs-nice-stream-transmitter.c
index fdc5a24..0e7782e 100644
--- a/transmitters/nice/fs-nice-stream-transmitter.c
+++ b/transmitters/nice/fs-nice-stream-transmitter.c
@@ -38,7 +38,7 @@
#include "fs-nice-transmitter.h"
#include "fs-nice-agent.h"
-#include <gst/farsight/fs-conference.h>
+#include <gst/farstream/fs-conference.h>
#include <gst/gst.h>
diff --git a/transmitters/nice/fs-nice-stream-transmitter.h b/transmitters/nice/fs-nice-stream-transmitter.h
index 8a65b54..b40e02e 100644
--- a/transmitters/nice/fs-nice-stream-transmitter.h
+++ b/transmitters/nice/fs-nice-stream-transmitter.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight libnice Stream Transmitter
+ * Farstream - Farstream libnice Stream Transmitter
*
* Copyright 2007-2008 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007-2008 Nokia Corp.
*
- * fs-nice-stream-transmitter.h - A Farsight libnice based stream transmitter
+ * fs-nice-stream-transmitter.h - A Farstream libnice based stream transmitter
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -28,8 +28,8 @@
#include <glib.h>
#include <glib-object.h>
-#include <gst/farsight/fs-stream-transmitter.h>
-#include <gst/farsight/fs-plugin.h>
+#include <gst/farstream/fs-stream-transmitter.h>
+#include <gst/farstream/fs-plugin.h>
#include "fs-nice-transmitter.h"
G_BEGIN_DECLS
diff --git a/transmitters/nice/fs-nice-transmitter.c b/transmitters/nice/fs-nice-transmitter.c
index 33d3c36..48773e1 100644
--- a/transmitters/nice/fs-nice-transmitter.c
+++ b/transmitters/nice/fs-nice-transmitter.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight libnice Transmitter
+ * Farstream - Farstream libnice Transmitter
*
* Copyright 2007-2008 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007-2008 Nokia Corp.
*
- * fs-nice-transmitter.c - A Farsight libnice transmitter
+ * fs-nice-transmitter.c - A Farstream libnice transmitter
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -39,8 +39,8 @@
#include "fs-nice-stream-transmitter.h"
#include "fs-nice-agent.h"
-#include <gst/farsight/fs-conference.h>
-#include <gst/farsight/fs-plugin.h>
+#include <gst/farstream/fs-conference.h>
+#include <gst/farstream/fs-plugin.h>
#include <agent.h>
@@ -142,7 +142,7 @@ fs_nice_transmitter_register_type (FsPlugin *module)
GST_DEBUG_CATEGORY_INIT (fs_nice_transmitter_debug,
"fsnicetransmitter", 0,
- "Farsight libnice transmitter");
+ "Farstream libnice transmitter");
fs_nice_stream_transmitter_register_type (module);
fs_nice_agent_register_type (module);
diff --git a/transmitters/nice/fs-nice-transmitter.h b/transmitters/nice/fs-nice-transmitter.h
index 74aa3c9..a39ae61 100644
--- a/transmitters/nice/fs-nice-transmitter.h
+++ b/transmitters/nice/fs-nice-transmitter.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight libnice Transmitter
+ * Farstream - Farstream libnice Transmitter
*
* Copyright 2007-2008 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007-2008 Nokia Corp.
*
- * fs-nice-transmitter.h - A Farsight libnice transmitter
+ * fs-nice-transmitter.h - A Farstream libnice transmitter
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -25,7 +25,7 @@
#ifndef __FS_NICE_TRANSMITTER_H__
#define __FS_NICE_TRANSMITTER_H__
-#include <gst/farsight/fs-transmitter.h>
+#include <gst/farstream/fs-transmitter.h>
#include <gst/gst.h>
#include <agent.h>
diff --git a/transmitters/rawudp/Makefile.am b/transmitters/rawudp/Makefile.am
index 861ecf4..d637da8 100644
--- a/transmitters/rawudp/Makefile.am
+++ b/transmitters/rawudp/Makefile.am
@@ -1,5 +1,5 @@
-plugindir = $(FS2_PLUGIN_PATH)
+plugindir = $(FS_PLUGIN_PATH)
plugin_LTLIBRARIES = librawudp-transmitter.la
@@ -16,16 +16,16 @@ nodist_librawudp_transmitter_la_SOURCES = \
# flags used to compile this plugin
librawudp_transmitter_la_CFLAGS = \
- $(FS2_INTERNAL_CFLAGS) \
- $(FS2_CFLAGS) \
+ $(FS_INTERNAL_CFLAGS) \
+ $(FS_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_CFLAGS) \
$(NICE_CFLAGS) \
$(GUPNP_CFLAGS)
-librawudp_transmitter_la_LDFLAGS = $(FS2_PLUGIN_LDFLAGS)
+librawudp_transmitter_la_LDFLAGS = $(FS_PLUGIN_LDFLAGS)
librawudp_transmitter_la_LIBADD = \
- $(top_builddir)/gst-libs/gst/farsight/libgstfarsight-0.10.la \
- $(FS2_LIBS) \
+ $(top_builddir)/gst-libs/gst/farstream/libgstfarstream-0.10.la \
+ $(FS_LIBS) \
$(GST_PLUGINS_BASE_LIBS) \
$(GST_LIBS) \
$(NICE_LIBS) \
diff --git a/transmitters/rawudp/fs-rawudp-component.c b/transmitters/rawudp/fs-rawudp-component.c
index 0b04df3..9e28199 100644
--- a/transmitters/rawudp/fs-rawudp-component.c
+++ b/transmitters/rawudp/fs-rawudp-component.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RAW UDP with STUN Component Transmitter
+ * Farstream - Farstream RAW UDP with STUN Component Transmitter
*
* Copyright 2008 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2008 Nokia Corp.
*
- * fs-rawudp-transmitter.c - A Farsight UDP transmitter with STUN
+ * fs-rawudp-transmitter.c - A Farstream UDP transmitter with STUN
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -37,7 +37,7 @@
#include <nice/address.h>
#include <nice/interfaces.h>
-#include <gst/farsight/fs-conference.h>
+#include <gst/farstream/fs-conference.h>
#include <gst/netbuffer/gstnetbuffer.h>
@@ -1229,7 +1229,7 @@ fs_rawudp_component_gather_local_candidates (FsRawUdpComponent *self,
gupnp_simple_igd_add_port (GUPNP_SIMPLE_IGD (self->priv->upnp_igd),
"UDP", port, ip, port, self->priv->upnp_mapping_timeout,
- "Farsight Raw UDP transmitter " PACKAGE_VERSION);
+ "Farstream Raw UDP transmitter " PACKAGE_VERSION);
if (self->priv->upnp_discovery)
diff --git a/transmitters/rawudp/fs-rawudp-component.h b/transmitters/rawudp/fs-rawudp-component.h
index c66f1bb..317eb4b 100644
--- a/transmitters/rawudp/fs-rawudp-component.h
+++ b/transmitters/rawudp/fs-rawudp-component.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RAW UDP with STUN Component Transmitter
+ * Farstream - Farstream RAW UDP with STUN Component Transmitter
*
* Copyright 2008 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2008 Nokia Corp.
*
- * fs-rawudp-component.h - A Farsight UDP component transmitter with STUN
+ * fs-rawudp-component.h - A Farstream UDP component transmitter with STUN
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -28,8 +28,8 @@
#include <glib.h>
#include <glib-object.h>
-#include <gst/farsight/fs-stream-transmitter.h>
-#include <gst/farsight/fs-plugin.h>
+#include <gst/farstream/fs-stream-transmitter.h>
+#include <gst/farstream/fs-plugin.h>
#include "fs-rawudp-transmitter.h"
G_BEGIN_DECLS
diff --git a/transmitters/rawudp/fs-rawudp-stream-transmitter.c b/transmitters/rawudp/fs-rawudp-stream-transmitter.c
index 86f4f33..5d2f0d0 100644
--- a/transmitters/rawudp/fs-rawudp-stream-transmitter.c
+++ b/transmitters/rawudp/fs-rawudp-stream-transmitter.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RAW UDP with STUN Stream Transmitter
+ * Farstream - Farstream RAW UDP with STUN Stream Transmitter
*
* Copyright 2007-2008 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007-2008x Nokia Corp.
*
- * fs-rawudp-transmitter.c - A Farsight UDPs stream transmitter with STUN
+ * fs-rawudp-transmitter.c - A Farstream UDPs stream transmitter with STUN
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -66,8 +66,8 @@
#include "fs-rawudp-component.h"
-#include <gst/farsight/fs-candidate.h>
-#include <gst/farsight/fs-conference.h>
+#include <gst/farstream/fs-candidate.h>
+#include <gst/farstream/fs-conference.h>
#ifdef HAVE_GUPNP
#include <libgupnp-igd/gupnp-simple-igd-thread.h>
diff --git a/transmitters/rawudp/fs-rawudp-stream-transmitter.h b/transmitters/rawudp/fs-rawudp-stream-transmitter.h
index 0fbfe4c..8e0698b 100644
--- a/transmitters/rawudp/fs-rawudp-stream-transmitter.h
+++ b/transmitters/rawudp/fs-rawudp-stream-transmitter.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RAW UDP with STUN Stream Transmitter
+ * Farstream - Farstream RAW UDP with STUN Stream Transmitter
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-stream-transmitter.h - A Farsight UDP stream transmitter with STUN
+ * fs-stream-transmitter.h - A Farstream UDP stream transmitter with STUN
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -28,8 +28,8 @@
#include <glib.h>
#include <glib-object.h>
-#include <gst/farsight/fs-stream-transmitter.h>
-#include <gst/farsight/fs-plugin.h>
+#include <gst/farstream/fs-stream-transmitter.h>
+#include <gst/farstream/fs-plugin.h>
#include "fs-rawudp-transmitter.h"
G_BEGIN_DECLS
diff --git a/transmitters/rawudp/fs-rawudp-transmitter.c b/transmitters/rawudp/fs-rawudp-transmitter.c
index 5e8a717..111e739 100644
--- a/transmitters/rawudp/fs-rawudp-transmitter.c
+++ b/transmitters/rawudp/fs-rawudp-transmitter.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RAW UDP with STUN Transmitter
+ * Farstream - Farstream RAW UDP with STUN Transmitter
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-rawudp-transmitter.h - A Farsight UDP transmitter with STUN
+ * fs-rawudp-transmitter.h - A Farstream UDP transmitter with STUN
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -37,8 +37,8 @@
#include "fs-rawudp-transmitter.h"
#include "fs-rawudp-stream-transmitter.h"
-#include <gst/farsight/fs-conference.h>
-#include <gst/farsight/fs-plugin.h>
+#include <gst/farstream/fs-conference.h>
+#include <gst/farstream/fs-plugin.h>
#include <string.h>
#include <sys/types.h>
@@ -164,7 +164,7 @@ fs_rawudp_transmitter_register_type (FsPlugin *module)
GST_DEBUG_CATEGORY_INIT (fs_rawudp_transmitter_debug,
"fsrawudptransmitter", 0,
- "Farsight raw UDP transmitter");
+ "Farstream raw UDP transmitter");
fs_rawudp_stream_transmitter_register_type (module);
diff --git a/transmitters/rawudp/fs-rawudp-transmitter.h b/transmitters/rawudp/fs-rawudp-transmitter.h
index 151444a..723bd06 100644
--- a/transmitters/rawudp/fs-rawudp-transmitter.h
+++ b/transmitters/rawudp/fs-rawudp-transmitter.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight RAW UDP with STUN Transmitter
+ * Farstream - Farstream RAW UDP with STUN Transmitter
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-rawudp-transmitter.h - A Farsight UDP transmitter with STUN
+ * fs-rawudp-transmitter.h - A Farstream UDP transmitter with STUN
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -25,7 +25,7 @@
#ifndef __FS_RAWUDP_TRANSMITTER_H__
#define __FS_RAWUDP_TRANSMITTER_H__
-#include <gst/farsight/fs-transmitter.h>
+#include <gst/farstream/fs-transmitter.h>
#include <gst/netbuffer/gstnetbuffer.h>
diff --git a/transmitters/shm/Makefile.am b/transmitters/shm/Makefile.am
index be1a672..c656a3d 100644
--- a/transmitters/shm/Makefile.am
+++ b/transmitters/shm/Makefile.am
@@ -1,5 +1,5 @@
-plugindir = $(FS2_PLUGIN_PATH)
+plugindir = $(FS_PLUGIN_PATH)
plugin_LTLIBRARIES = libshm-transmitter.la
@@ -10,14 +10,14 @@ libshm_transmitter_la_SOURCES = \
# flags used to compile this plugin
libshm_transmitter_la_CFLAGS = \
- $(FS2_INTERNAL_CFLAGS) \
- $(FS2_CFLAGS) \
+ $(FS_INTERNAL_CFLAGS) \
+ $(FS_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_CFLAGS)
-libshm_transmitter_la_LDFLAGS = $(FS2_PLUGIN_LDFLAGS)
+libshm_transmitter_la_LDFLAGS = $(FS_PLUGIN_LDFLAGS)
libshm_transmitter_la_LIBADD = \
- $(top_builddir)/gst-libs/gst/farsight/libgstfarsight-0.10.la \
- $(FS2_LIBS) \
+ $(top_builddir)/gst-libs/gst/farstream/libgstfarstream-0.10.la \
+ $(FS_LIBS) \
$(GST_BASE_LIBS) \
$(GST_LIBS)
diff --git a/transmitters/shm/fs-shm-stream-transmitter.c b/transmitters/shm/fs-shm-stream-transmitter.c
index f768c60..8ef3d74 100644
--- a/transmitters/shm/fs-shm-stream-transmitter.c
+++ b/transmitters/shm/fs-shm-stream-transmitter.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight Shared Memory Stream Transmitter
+ * Farstream - Farstream Shared Memory Stream Transmitter
*
* Copyright 2009 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2009 Nokia Corp.
*
- * fs-shm-stream-transmitter.c - A Farsight Shared memory stream transmitter
+ * fs-shm-stream-transmitter.c - A Farstream Shared memory stream transmitter
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -66,8 +66,8 @@
#include "fs-shm-stream-transmitter.h"
#include "fs-shm-transmitter.h"
-#include <gst/farsight/fs-candidate.h>
-#include <gst/farsight/fs-conference.h>
+#include <gst/farstream/fs-candidate.h>
+#include <gst/farstream/fs-conference.h>
#include <gst/gst.h>
@@ -558,7 +558,7 @@ fs_shm_stream_transmitter_gather_local_candidates (
gchar *socket_dir;
socket_dir = g_build_filename (g_get_tmp_dir (),
- "farsight-shm-XXXXXX", NULL);
+ "farstream-shm-XXXXXX", NULL);
if (mkdtemp (socket_dir) == NULL)
return FALSE;
diff --git a/transmitters/shm/fs-shm-stream-transmitter.h b/transmitters/shm/fs-shm-stream-transmitter.h
index ad82489..f44b317 100644
--- a/transmitters/shm/fs-shm-stream-transmitter.h
+++ b/transmitters/shm/fs-shm-stream-transmitter.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight Shared Memory Stream Transmitter
+ * Farstream - Farstream Shared Memory Stream Transmitter
*
* Copyright 2007-2008 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007-2008 Nokia Corp.
*
- * fs-shm-stream-transmitter.h - A Farsight Shared Memory stream transmitter
+ * fs-shm-stream-transmitter.h - A Farstream Shared Memory stream transmitter
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -28,8 +28,8 @@
#include <glib.h>
#include <glib-object.h>
-#include <gst/farsight/fs-stream-transmitter.h>
-#include <gst/farsight/fs-plugin.h>
+#include <gst/farstream/fs-stream-transmitter.h>
+#include <gst/farstream/fs-plugin.h>
#include "fs-shm-transmitter.h"
G_BEGIN_DECLS
diff --git a/transmitters/shm/fs-shm-transmitter.c b/transmitters/shm/fs-shm-transmitter.c
index edaac2b..d1b1574 100644
--- a/transmitters/shm/fs-shm-transmitter.c
+++ b/transmitters/shm/fs-shm-transmitter.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight Shm UDP Transmitter
+ * Farstream - Farstream Shm UDP Transmitter
*
* Copyright 2007-2008 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007-2008 Nokia Corp.
*
- * fs-shm-transmitter.c - A Farsight shm UDP transmitter
+ * fs-shm-transmitter.c - A Farstream shm UDP transmitter
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -37,8 +37,8 @@
#include "fs-shm-transmitter.h"
#include "fs-shm-stream-transmitter.h"
-#include <gst/farsight/fs-conference.h>
-#include <gst/farsight/fs-plugin.h>
+#include <gst/farstream/fs-conference.h>
+#include <gst/farstream/fs-plugin.h>
#include <string.h>
@@ -234,7 +234,7 @@ fs_shm_transmitter_register_type (FsPlugin *module)
GST_DEBUG_CATEGORY_INIT (fs_shm_transmitter_debug,
"fsshmtransmitter", 0,
- "Farsight shm UDP transmitter");
+ "Farstream shm UDP transmitter");
fs_shm_stream_transmitter_register_type (module);
diff --git a/transmitters/shm/fs-shm-transmitter.h b/transmitters/shm/fs-shm-transmitter.h
index 26753ac..e483068 100644
--- a/transmitters/shm/fs-shm-transmitter.h
+++ b/transmitters/shm/fs-shm-transmitter.h
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight Shared Memory Transmitter
+ * Farstream - Farstream Shared Memory Transmitter
*
* Copyright 2007-2008 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007-2008 Nokia Corp.
*
- * fs-shm-transmitter.h - A Farsight Shared Memory transmitter
+ * fs-shm-transmitter.h - A Farstream Shared Memory transmitter
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -25,7 +25,7 @@
#ifndef __FS_SHM_TRANSMITTER_H__
#define __FS_SHM_TRANSMITTER_H__
-#include <gst/farsight/fs-transmitter.h>
+#include <gst/farstream/fs-transmitter.h>
#include <gst/gst.h>
diff --git a/uninstalled-paths.sh b/uninstalled-paths.sh
index 0293a39..593bc11 100755
--- a/uninstalled-paths.sh
+++ b/uninstalled-paths.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# Generate environment for using Farsight 2 from Git checkout.
+# Generate environment for using Farstream from Git checkout.
realpath_ ()
{