diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2011-10-11 16:08:49 -0400 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2011-10-11 16:14:10 -0400 |
| commit | 52a59229d200a8d74d66e02126c290434d3157d8 (patch) | |
| tree | 1adf3344ad47dbed6c35c42511362b232c703683 | |
| parent | 7098f40db04b6a32c311b802a2c12f0f450ee7b7 (diff) | |
| download | farstream-52a59229d200a8d74d66e02126c290434d3157d8.tar.gz | |
Move the lib out of gst-libs
118 files changed, 159 insertions, 170 deletions
@@ -22,10 +22,10 @@ gst/*/*.doc.c transmitters/rawudp/fs-rawudp-marshal.[ch] transmitters/rawudp/fs-rawudp-marshal.list -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] +farstream/fs-marshal.[ch] +farstream/fs-marshal.list +farstream/fs-enum-types.h +farstream/fs-enumtypes.[ch] docs/libs/farstream-libs-decl-list.txt docs/libs/farstream-libs-decl-list.txt.bak diff --git a/Makefile.am b/Makefile.am index 9b5977f9..3acf9983 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ PYTHON_SUBDIR = python endif SUBDIRS = \ - gst-libs \ + farstream \ gst $(SUBDIRS_EXT) \ transmitters \ $(PYTHON_SUBDIR) \ @@ -20,7 +20,7 @@ SUBDIRS = \ # pkgconfig DIST_SUBDIRS = \ - gst-libs \ + farstream \ gst $(SUBDIRS_EXT) \ transmitters \ python \ @@ -3,7 +3,7 @@ DIE=0 package=farstream -srcfile=gst-libs/gst/farstream/fs-candidate.c +srcfile=farstream/fs-candidate.c # Make sure we have common if test ! -f common/gst-autogen.sh; diff --git a/configure.ac b/configure.ac index f13d8abc..09e409dc 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ dnl check if this is a release version AS_NANO(FS_CVS="no", FS_CVS="yes") dnl can autoconf find the source ? -AC_CONFIG_SRCDIR([gst-libs/gst/farstream/fs-candidate.c]) +AC_CONFIG_SRCDIR([farstream/fs-conference.c]) dnl define the output header for config AM_CONFIG_HEADER([config.h]) @@ -307,7 +307,7 @@ AC_SUBST(FS_LT_LDFLAGS) dnl FS_INTERNAL_CFLAGS dnl prefer internal headers to already installed ones dnl also add builddir include for enumtypes and marshal -FS_INTERNAL_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs" +FS_INTERNAL_CFLAGS="-I\$(top_srcdir) -I\$(top_builddir)" AC_SUBST(FS_INTERNAL_CFLAGS) dnl FIXME: do we want to rename to GST_ALL_* ? @@ -402,9 +402,7 @@ gst/fsmsnconference/Makefile gst/funnel/Makefile gst/rtcpfilter/Makefile gst/videoanyrate/Makefile -gst-libs/Makefile -gst-libs/gst/Makefile -gst-libs/gst/farstream/Makefile +farstream/Makefile transmitters/Makefile transmitters/rawudp/Makefile transmitters/multicast/Makefile diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am index 5c961a68..05e4b2e3 100644 --- a/docs/libs/Makefile.am +++ b/docs/libs/Makefile.am @@ -46,7 +46,7 @@ CFILE_GLOB=$(DOC_SOURCE_DIR)/*/*.c # this is useful ;) SCANOBJ_DEPS = \ - $(top_builddir)/gst-libs/gst/farstream/libfarstream-@GST_MAJORMINOR@.la + $(top_builddir)/farstream/libfarstream-@GST_MAJORMINOR@.la # Header files to ignore when scanning. IGNORE_HFILES = fs-marshal.h fs-enumtypes.h fs-private.h @@ -64,7 +64,7 @@ extra_files = # contains GtkObjects/GObjects and you want to document signals and properties. GTKDOC_CFLAGS = $(FS_INTERNAL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) GTKDOC_LIBS = -static \ - $(top_builddir)/gst-libs/gst/farstream/libfarstream-0.10.la \ + $(top_builddir)/farstream/libfarstream-0.10.la \ $(GST_BASE_LIBS) \ $(GCOV_LIBS) diff --git a/docs/libs/farsight2-libs-sections.txt b/docs/libs/farsight2-libs-sections.txt index 4a220fb1..fba7ad20 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/farstream/fs-conference.h</INCLUDE> +<INCLUDE>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/farstream/fs-conference.h</INCLUDE> +<INCLUDE>farstream/fs-conference.h</INCLUDE> FsStream FsStreamClass FsStreamDirection @@ -52,7 +52,7 @@ FsStreamPrivate FsDTMFEvent FsDTMFMethod <TITLE>FsSession</TITLE> -<INCLUDE>gst/farstream/fs-conference.h</INCLUDE> +<INCLUDE>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/farstream/fs-conference.h</INCLUDE> +<INCLUDE>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/farstream/fs-conference.h</INCLUDE> +<INCLUDE>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/farstream/fs-conference.h</INCLUDE> +<INCLUDE>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/farstream/fs-transmitter.h</INCLUDE> +<INCLUDE>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/farstream/fs-transmitter.h</INCLUDE> +<INCLUDE>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/farstream/fs-plugin.h</INCLUDE> +<INCLUDE>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/farstream/fs-element-added-notifier.h</INCLUDE> +<INCLUDE>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/farstream/fs-rtp.h</INCLUDE> +<INCLUDE>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/farstream/fs-utils.h</INCLUDE> +<INCLUDE>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 3c50eeea..907d3607 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/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" +#include "../../farstream/fs-participant.h" +#include "../../farstream/fs-session.h" +#include "../../farstream/fs-stream.h" +#include "../../farstream/fs-conference.h" +#include "../../farstream/fs-transmitter.h" +#include "../../farstream/fs-stream-transmitter.h" +#include "../../farstream/fs-element-added-notifier.h" fs_participant_get_type fs_session_get_type diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index b0eb33a7..c63e1781 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -126,7 +126,7 @@ CLEANFILES = farstream-transmitters.types # 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/farstream/libfarstream-0.10.la \ + $(top_builddir)/farstream/libfarstream-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-transmitters.types.in b/docs/plugins/farsight2-transmitters.types.in index 5d8e5bdb..6b890d53 100644 --- a/docs/plugins/farsight2-transmitters.types.in +++ b/docs/plugins/farsight2-transmitters.types.in @@ -1 +1 @@ -#include <gst/farstream/fs-transmitter.h> +#include <farstream/fs-transmitter.h> diff --git a/examples/commandline/Makefile.am b/examples/commandline/Makefile.am index 5644a450..5faf0d65 100644 --- a/examples/commandline/Makefile.am +++ b/examples/commandline/Makefile.am @@ -10,7 +10,7 @@ AM_CFLAGS = \ $(CFLAGS) LDADD = \ - $(top_builddir)/gst-libs/gst/farstream/libfarstream-0.10.la \ + $(top_builddir)/farstream/libfarstream-0.10.la \ $(GST_LIBS) diff --git a/examples/commandline/simple-call-shm.c b/examples/commandline/simple-call-shm.c index f9fcb517..5d4ac2d3 100644 --- a/examples/commandline/simple-call-shm.c +++ b/examples/commandline/simple-call-shm.c @@ -34,7 +34,7 @@ #include <gio/gunixinputstream.h> #include <gst/gst.h> -#include <gst/farstream/fs-conference.h> +#include <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" diff --git a/examples/commandline/simple-call.c b/examples/commandline/simple-call.c index 50a408d3..82a306a0 100644 --- a/examples/commandline/simple-call.c +++ b/examples/commandline/simple-call.c @@ -30,7 +30,7 @@ #include <glib.h> #include <gst/gst.h> -#include <gst/farstream/fs-conference.h> +#include <farstream/fs-conference.h> #define DEFAULT_AUDIOSRC "alsasrc" #define DEFAULT_AUDIOSINK "audioconvert ! audioresample ! audioconvert ! alsasink" diff --git a/gst-libs/gst/farstream/Makefile.am b/farstream/Makefile.am index 896de329..f9250879 100644 --- a/gst-libs/gst/farstream/Makefile.am +++ b/farstream/Makefile.am @@ -1,4 +1,4 @@ -libfarstreamincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/farstream +libfarstreamincludedir = $(includedir)/farstream-@FS_MAJORMINOR@/farstream libfarstreaminclude_HEADERS = \ fs-candidate.h \ diff --git a/gst-libs/gst/farstream/fs-candidate.c b/farstream/fs-candidate.c index 8cb8db72..8cb8db72 100644 --- a/gst-libs/gst/farstream/fs-candidate.c +++ b/farstream/fs-candidate.c diff --git a/gst-libs/gst/farstream/fs-candidate.h b/farstream/fs-candidate.h index e5fa45f7..e5fa45f7 100644 --- a/gst-libs/gst/farstream/fs-candidate.h +++ b/farstream/fs-candidate.h diff --git a/gst-libs/gst/farstream/fs-codec.c b/farstream/fs-codec.c index 3306ca92..3306ca92 100644 --- a/gst-libs/gst/farstream/fs-codec.c +++ b/farstream/fs-codec.c diff --git a/gst-libs/gst/farstream/fs-codec.h b/farstream/fs-codec.h index 978fa00e..978fa00e 100644 --- a/gst-libs/gst/farstream/fs-codec.h +++ b/farstream/fs-codec.h diff --git a/gst-libs/gst/farstream/fs-conference.c b/farstream/fs-conference.c index fd20a1c4..fd20a1c4 100644 --- a/gst-libs/gst/farstream/fs-conference.c +++ b/farstream/fs-conference.c diff --git a/gst-libs/gst/farstream/fs-conference.h b/farstream/fs-conference.h index 57652ff7..f35feb23 100644 --- a/gst-libs/gst/farstream/fs-conference.h +++ b/farstream/fs-conference.h @@ -27,9 +27,9 @@ #include <gst/gst.h> -#include <gst/farstream/fs-session.h> -#include <gst/farstream/fs-codec.h> -#include <gst/farstream/fs-enumtypes.h> +#include <farstream/fs-session.h> +#include <farstream/fs-codec.h> +#include <farstream/fs-enumtypes.h> G_BEGIN_DECLS diff --git a/gst-libs/gst/farstream/fs-element-added-notifier.c b/farstream/fs-element-added-notifier.c index beac34e9..beac34e9 100644 --- a/gst-libs/gst/farstream/fs-element-added-notifier.c +++ b/farstream/fs-element-added-notifier.c diff --git a/gst-libs/gst/farstream/fs-element-added-notifier.h b/farstream/fs-element-added-notifier.h index f45e010c..f45e010c 100644 --- a/gst-libs/gst/farstream/fs-element-added-notifier.h +++ b/farstream/fs-element-added-notifier.h diff --git a/gst-libs/gst/farstream/fs-participant.c b/farstream/fs-participant.c index d8aaf334..d8aaf334 100644 --- a/gst-libs/gst/farstream/fs-participant.c +++ b/farstream/fs-participant.c diff --git a/gst-libs/gst/farstream/fs-participant.h b/farstream/fs-participant.h index 9ca48f8f..9ca48f8f 100644 --- a/gst-libs/gst/farstream/fs-participant.h +++ b/farstream/fs-participant.h diff --git a/gst-libs/gst/farstream/fs-plugin.c b/farstream/fs-plugin.c index 423cf719..423cf719 100644 --- a/gst-libs/gst/farstream/fs-plugin.c +++ b/farstream/fs-plugin.c diff --git a/gst-libs/gst/farstream/fs-plugin.h b/farstream/fs-plugin.h index c6d0a216..c6d0a216 100644 --- a/gst-libs/gst/farstream/fs-plugin.h +++ b/farstream/fs-plugin.h diff --git a/gst-libs/gst/farstream/fs-private.h b/farstream/fs-private.h index 6f96e160..6f96e160 100644 --- a/gst-libs/gst/farstream/fs-private.h +++ b/farstream/fs-private.h diff --git a/gst-libs/gst/farstream/fs-rtp.c b/farstream/fs-rtp.c index c978670c..c978670c 100644 --- a/gst-libs/gst/farstream/fs-rtp.c +++ b/farstream/fs-rtp.c diff --git a/gst-libs/gst/farstream/fs-rtp.h b/farstream/fs-rtp.h index 07fb2306..4c935889 100644 --- a/gst-libs/gst/farstream/fs-rtp.h +++ b/farstream/fs-rtp.h @@ -26,7 +26,7 @@ #define __FS_RTP_H__ #include <gst/gst.h> -#include <gst/farstream/fs-stream.h> +#include <farstream/fs-stream.h> G_BEGIN_DECLS diff --git a/gst-libs/gst/farstream/fs-session.c b/farstream/fs-session.c index 59e50d6f..59e50d6f 100644 --- a/gst-libs/gst/farstream/fs-session.c +++ b/farstream/fs-session.c diff --git a/gst-libs/gst/farstream/fs-session.h b/farstream/fs-session.h index f6a618a2..d729b7c3 100644 --- a/gst-libs/gst/farstream/fs-session.h +++ b/farstream/fs-session.h @@ -28,9 +28,9 @@ #include <glib.h> #include <glib-object.h> -#include <gst/farstream/fs-stream.h> -#include <gst/farstream/fs-participant.h> -#include <gst/farstream/fs-codec.h> +#include <farstream/fs-stream.h> +#include <farstream/fs-participant.h> +#include <farstream/fs-codec.h> G_BEGIN_DECLS diff --git a/gst-libs/gst/farstream/fs-stream-transmitter.c b/farstream/fs-stream-transmitter.c index 979a2eb2..979a2eb2 100644 --- a/gst-libs/gst/farstream/fs-stream-transmitter.c +++ b/farstream/fs-stream-transmitter.c diff --git a/gst-libs/gst/farstream/fs-stream-transmitter.h b/farstream/fs-stream-transmitter.h index 064255e2..2aa1a5a7 100644 --- a/gst-libs/gst/farstream/fs-stream-transmitter.h +++ b/farstream/fs-stream-transmitter.h @@ -27,7 +27,7 @@ #include <gst/gst.h> -#include <gst/farstream/fs-candidate.h> +#include <farstream/fs-candidate.h> G_BEGIN_DECLS diff --git a/gst-libs/gst/farstream/fs-stream.c b/farstream/fs-stream.c index 122b7a3e..122b7a3e 100644 --- a/gst-libs/gst/farstream/fs-stream.c +++ b/farstream/fs-stream.c diff --git a/gst-libs/gst/farstream/fs-stream.h b/farstream/fs-stream.h index 762fc931..98206037 100644 --- a/gst-libs/gst/farstream/fs-stream.h +++ b/farstream/fs-stream.h @@ -28,8 +28,8 @@ #include <glib.h> #include <glib-object.h> -#include <gst/farstream/fs-candidate.h> -#include <gst/farstream/fs-codec.h> +#include <farstream/fs-candidate.h> +#include <farstream/fs-codec.h> G_BEGIN_DECLS diff --git a/gst-libs/gst/farstream/fs-transmitter.c b/farstream/fs-transmitter.c index 11c955c3..11c955c3 100644 --- a/gst-libs/gst/farstream/fs-transmitter.c +++ b/farstream/fs-transmitter.c diff --git a/gst-libs/gst/farstream/fs-transmitter.h b/farstream/fs-transmitter.h index ecac6d42..13372912 100644 --- a/gst-libs/gst/farstream/fs-transmitter.h +++ b/farstream/fs-transmitter.h @@ -27,9 +27,9 @@ #include <gst/gst.h> -#include <gst/farstream/fs-participant.h> -#include <gst/farstream/fs-session.h> -#include <gst/farstream/fs-stream-transmitter.h> +#include <farstream/fs-participant.h> +#include <farstream/fs-session.h> +#include <farstream/fs-stream-transmitter.h> G_BEGIN_DECLS diff --git a/gst-libs/gst/farstream/fs-utils.c b/farstream/fs-utils.c index 2bb1f762..2bb1f762 100644 --- a/gst-libs/gst/farstream/fs-utils.c +++ b/farstream/fs-utils.c diff --git a/gst-libs/gst/farstream/fs-utils.h b/farstream/fs-utils.h index cf9c6ba1..ea0c2a0f 100644 --- a/gst-libs/gst/farstream/fs-utils.h +++ b/farstream/fs-utils.h @@ -27,7 +27,7 @@ #include <gst/gst.h> -#include <gst/farstream/fs-codec.h> +#include <farstream/fs-codec.h> G_BEGIN_DECLS diff --git a/gst-libs/Makefile.am b/gst-libs/Makefile.am deleted file mode 100644 index 062cb55a..00000000 --- a/gst-libs/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = gst diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am deleted file mode 100644 index 5078388e..00000000 --- a/gst-libs/gst/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -# The interfaces directory has to be built before the others, -# otherwise some generated header files will be missing for the -# plugins in the other directories. -# Also, the tag directory has to be built before the cdda directory. -SUBDIRS = \ - farstream - -noinst_HEADERS = diff --git a/gst/fsmsnconference/Makefile.am b/gst/fsmsnconference/Makefile.am index 60d5583f..7dc2cb52 100644 --- a/gst/fsmsnconference/Makefile.am +++ b/gst/fsmsnconference/Makefile.am @@ -38,7 +38,7 @@ libfsmsnconference_la_SOURCES = \ libfsmsnconference_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libfsmsnconference_la_LIBADD = \ libfsmsnconference-convenience.la \ - $(top_builddir)/gst-libs/gst/farstream/libfarstream-0.10.la \ + $(top_builddir)/farstream/libfarstream-0.10.la \ $(FS_LIBS) \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ diff --git a/gst/fsmsnconference/fs-msn-conference.h b/gst/fsmsnconference/fs-msn-conference.h index 51f0dffb..9e1afc51 100644 --- a/gst/fsmsnconference/fs-msn-conference.h +++ b/gst/fsmsnconference/fs-msn-conference.h @@ -27,7 +27,7 @@ #ifndef __FS_MSN_CONFERENCE_H__ #define __FS_MSN_CONFERENCE_H__ -#include <gst/farstream/fs-conference.h> +#include <farstream/fs-conference.h> G_BEGIN_DECLS diff --git a/gst/fsmsnconference/fs-msn-participant.h b/gst/fsmsnconference/fs-msn-participant.h index 1e5645da..0e28cab3 100644 --- a/gst/fsmsnconference/fs-msn-participant.h +++ b/gst/fsmsnconference/fs-msn-participant.h @@ -24,7 +24,7 @@ #ifndef __FS_MSN_PARTICIPANT_H__ #define __FS_MSN_PARTICIPANT_H__ -#include <gst/farstream/fs-participant.h> +#include <farstream/fs-participant.h> G_BEGIN_DECLS diff --git a/gst/fsmsnconference/fs-msn-session.h b/gst/fsmsnconference/fs-msn-session.h index a6b073f1..79189e17 100644 --- a/gst/fsmsnconference/fs-msn-session.h +++ b/gst/fsmsnconference/fs-msn-session.h @@ -28,7 +28,7 @@ #include <gst/gst.h> -#include <gst/farstream/fs-session.h> +#include <farstream/fs-session.h> #include "fs-msn-conference.h" diff --git a/gst/fsmsnconference/fs-msn-stream.h b/gst/fsmsnconference/fs-msn-stream.h index 060e293b..725c8968 100644 --- a/gst/fsmsnconference/fs-msn-stream.h +++ b/gst/fsmsnconference/fs-msn-stream.h @@ -26,7 +26,7 @@ #ifndef __FS_MSN_STREAM_H__ #define __FS_MSN_STREAM_H__ -#include <gst/farstream/fs-stream.h> +#include <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 69f3d760..4353fc63 100644 --- a/gst/fsrawconference/Makefile.am +++ b/gst/fsrawconference/Makefile.am @@ -31,7 +31,7 @@ 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/farstream/libfarstream-0.10.la \ + $(top_builddir)/farstream/libfarstream-0.10.la \ $(FS_LIBS) \ $(GST_BASE_LIBS) \ $(GST_LIBS) diff --git a/gst/fsrawconference/fs-raw-conference.h b/gst/fsrawconference/fs-raw-conference.h index b41b3664..67a03bea 100644 --- a/gst/fsrawconference/fs-raw-conference.h +++ b/gst/fsrawconference/fs-raw-conference.h @@ -27,7 +27,7 @@ #ifndef __FS_RAW_CONFERENCE_H__ #define __FS_RAW_CONFERENCE_H__ -#include <gst/farstream/fs-conference.h> +#include <farstream/fs-conference.h> G_BEGIN_DECLS diff --git a/gst/fsrawconference/fs-raw-participant.h b/gst/fsrawconference/fs-raw-participant.h index 5082ad7b..e6545ebc 100644 --- a/gst/fsrawconference/fs-raw-participant.h +++ b/gst/fsrawconference/fs-raw-participant.h @@ -26,7 +26,7 @@ #ifndef __FS_RAW_PARTICIPANT_H__ #define __FS_RAW_PARTICIPANT_H__ -#include <gst/farstream/fs-participant.h> +#include <farstream/fs-participant.h> G_BEGIN_DECLS diff --git a/gst/fsrawconference/fs-raw-session.c b/gst/fsrawconference/fs-raw-session.c index c1692b03..0f90324b 100644 --- a/gst/fsrawconference/fs-raw-session.c +++ b/gst/fsrawconference/fs-raw-session.c @@ -46,7 +46,7 @@ #include <string.h> #include <gst/gst.h> -#include <gst/farstream/fs-transmitter.h> +#include <farstream/fs-transmitter.h> #include "fs-raw-stream.h" #include "fs-raw-participant.h" diff --git a/gst/fsrawconference/fs-raw-session.h b/gst/fsrawconference/fs-raw-session.h index 2564872b..037f816b 100644 --- a/gst/fsrawconference/fs-raw-session.h +++ b/gst/fsrawconference/fs-raw-session.h @@ -29,7 +29,7 @@ #include <gst/gst.h> -#include <gst/farstream/fs-session.h> +#include <farstream/fs-session.h> #include "fs-raw-conference.h" diff --git a/gst/fsrawconference/fs-raw-stream.h b/gst/fsrawconference/fs-raw-stream.h index 730ed98d..02fac5d5 100644 --- a/gst/fsrawconference/fs-raw-stream.h +++ b/gst/fsrawconference/fs-raw-stream.h @@ -27,8 +27,8 @@ #ifndef __FS_RAW_STREAM_H__ #define __FS_RAW_STREAM_H__ -#include <gst/farstream/fs-stream.h> -#include <gst/farstream/fs-stream-transmitter.h> +#include <farstream/fs-stream.h> +#include <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 3688ce3b..aaec9947 100644 --- a/gst/fsrtpconference/Makefile.am +++ b/gst/fsrtpconference/Makefile.am @@ -62,7 +62,7 @@ libfsrtpconference_la_SOURCES = fs-rtp-conference-plugin.c libfsrtpconference_la_LIBADD = \ libfsrtpconference-convenience.la \ - $(top_builddir)/gst-libs/gst/farstream/libfarstream-0.10.la \ + $(top_builddir)/farstream/libfarstream-0.10.la \ $(FS_LIBS) \ $(GST_PLUGINS_BASE_LIBS) \ $(GST_LIBS) \ diff --git a/gst/fsrtpconference/fs-rtp-codec-cache.c b/gst/fsrtpconference/fs-rtp-codec-cache.c index 00022bc6..603402f8 100644 --- a/gst/fsrtpconference/fs-rtp-codec-cache.c +++ b/gst/fsrtpconference/fs-rtp-codec-cache.c @@ -35,7 +35,7 @@ #endif #include <stdio.h> -#include <gst/farstream/fs-conference.h> +#include <farstream/fs-conference.h> #include "fs-rtp-conference.h" diff --git a/gst/fsrtpconference/fs-rtp-codec-negotiation.c b/gst/fsrtpconference/fs-rtp-codec-negotiation.c index 4d7e0ced..12f498f7 100644 --- a/gst/fsrtpconference/fs-rtp-codec-negotiation.c +++ b/gst/fsrtpconference/fs-rtp-codec-negotiation.c @@ -28,7 +28,7 @@ #include "fs-rtp-codec-negotiation.h" -#include <gst/farstream/fs-rtp.h> +#include <farstream/fs-rtp.h> #include <string.h> diff --git a/gst/fsrtpconference/fs-rtp-codec-specific.h b/gst/fsrtpconference/fs-rtp-codec-specific.h index 1f270312..e269c083 100644 --- a/gst/fsrtpconference/fs-rtp-codec-specific.h +++ b/gst/fsrtpconference/fs-rtp-codec-specific.h @@ -27,7 +27,7 @@ #include <glib.h> #include <gst/gst.h> -#include <gst/farstream/fs-codec.h> +#include <farstream/fs-codec.h> G_BEGIN_DECLS diff --git a/gst/fsrtpconference/fs-rtp-conference.h b/gst/fsrtpconference/fs-rtp-conference.h index 41db1883..fe2209b0 100644 --- a/gst/fsrtpconference/fs-rtp-conference.h +++ b/gst/fsrtpconference/fs-rtp-conference.h @@ -26,7 +26,7 @@ #ifndef __FS_RTP_CONFERENCE_H__ #define __FS_RTP_CONFERENCE_H__ -#include <gst/farstream/fs-conference.h> +#include <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 30f0b825..6f65860a 100644 --- a/gst/fsrtpconference/fs-rtp-discover-codecs.c +++ b/gst/fsrtpconference/fs-rtp-discover-codecs.c @@ -36,7 +36,7 @@ #include <string.h> -#include <gst/farstream/fs-conference.h> +#include <farstream/fs-conference.h> #include "fs-rtp-conference.h" #include "fs-rtp-codec-cache.h" diff --git a/gst/fsrtpconference/fs-rtp-discover-codecs.h b/gst/fsrtpconference/fs-rtp-discover-codecs.h index 96772c90..d9378a55 100644 --- a/gst/fsrtpconference/fs-rtp-discover-codecs.h +++ b/gst/fsrtpconference/fs-rtp-discover-codecs.h @@ -27,7 +27,7 @@ #include <gst/gst.h> -#include <gst/farstream/fs-codec.h> +#include <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 a1c53e7b..0ff2e255 100644 --- a/gst/fsrtpconference/fs-rtp-dtmf-event-source.c +++ b/gst/fsrtpconference/fs-rtp-dtmf-event-source.c @@ -29,7 +29,7 @@ #include "fs-rtp-dtmf-event-source.h" -#include <gst/farstream/fs-conference.h> +#include <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.c b/gst/fsrtpconference/fs-rtp-dtmf-sound-source.c index 67891d67..e8a85cb2 100644 --- a/gst/fsrtpconference/fs-rtp-dtmf-sound-source.c +++ b/gst/fsrtpconference/fs-rtp-dtmf-sound-source.c @@ -29,7 +29,7 @@ #include "fs-rtp-dtmf-sound-source.h" -#include <gst/farstream/fs-conference.h> +#include <farstream/fs-conference.h> #include "fs-rtp-conference.h" #include "fs-rtp-discover-codecs.h" diff --git a/gst/fsrtpconference/fs-rtp-keyunit-manager.h b/gst/fsrtpconference/fs-rtp-keyunit-manager.h index 8ec8f08b..c0deb69e 100644 --- a/gst/fsrtpconference/fs-rtp-keyunit-manager.h +++ b/gst/fsrtpconference/fs-rtp-keyunit-manager.h @@ -27,7 +27,7 @@ #include <gst/gst.h> -#include <gst/farstream/fs-codec.h> +#include <farstream/fs-codec.h> G_BEGIN_DECLS diff --git a/gst/fsrtpconference/fs-rtp-participant.h b/gst/fsrtpconference/fs-rtp-participant.h index c30e2c31..d19fd8e3 100644 --- a/gst/fsrtpconference/fs-rtp-participant.h +++ b/gst/fsrtpconference/fs-rtp-participant.h @@ -25,7 +25,7 @@ #ifndef __FS_RTP_PARTICIPANT_H__ #define __FS_RTP_PARTICIPANT_H__ -#include <gst/farstream/fs-participant.h> +#include <farstream/fs-participant.h> G_BEGIN_DECLS diff --git a/gst/fsrtpconference/fs-rtp-session.c b/gst/fsrtpconference/fs-rtp-session.c index 2b13b13c..e6cbb71b 100644 --- a/gst/fsrtpconference/fs-rtp-session.c +++ b/gst/fsrtpconference/fs-rtp-session.c @@ -65,9 +65,9 @@ #include <gst/rtp/gstrtpbuffer.h> #include <gst/rtp/gstrtcpbuffer.h> -#include <gst/farstream/fs-transmitter.h> -#include "gst/farstream/fs-utils.h" -#include <gst/farstream/fs-rtp.h> +#include <farstream/fs-transmitter.h> +#include "farstream/fs-utils.h" +#include <farstream/fs-rtp.h> #include "fs-rtp-bitrate-adapter.h" #include "fs-rtp-stream.h" diff --git a/gst/fsrtpconference/fs-rtp-session.h b/gst/fsrtpconference/fs-rtp-session.h index ec6d76c4..4df81170 100644 --- a/gst/fsrtpconference/fs-rtp-session.h +++ b/gst/fsrtpconference/fs-rtp-session.h @@ -27,7 +27,7 @@ #include <gst/gst.h> -#include <gst/farstream/fs-session.h> +#include <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 dde2529b..eed6cbf8 100644 --- a/gst/fsrtpconference/fs-rtp-special-source.c +++ b/gst/fsrtpconference/fs-rtp-special-source.c @@ -29,7 +29,7 @@ #include "fs-rtp-special-source.h" -#include <gst/farstream/fs-conference.h> +#include <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 3d55a72f..4d82979e 100644 --- a/gst/fsrtpconference/fs-rtp-special-source.h +++ b/gst/fsrtpconference/fs-rtp-special-source.h @@ -28,7 +28,7 @@ #include <gst/gst.h> -#include <gst/farstream/fs-session.h> +#include <farstream/fs-session.h> G_BEGIN_DECLS diff --git a/gst/fsrtpconference/fs-rtp-stream.c b/gst/fsrtpconference/fs-rtp-stream.c index 26ab1fcc..e17439fa 100644 --- a/gst/fsrtpconference/fs-rtp-stream.c +++ b/gst/fsrtpconference/fs-rtp-stream.c @@ -39,7 +39,7 @@ #include <gst/gst.h> -#include <gst/farstream/fs-rtp.h> +#include <farstream/fs-rtp.h> #include "fs-rtp-marshal.h" diff --git a/gst/fsrtpconference/fs-rtp-stream.h b/gst/fsrtpconference/fs-rtp-stream.h index bd614d1d..9f1878b6 100644 --- a/gst/fsrtpconference/fs-rtp-stream.h +++ b/gst/fsrtpconference/fs-rtp-stream.h @@ -25,8 +25,8 @@ #ifndef __FS_RTP_STREAM_H__ #define __FS_RTP_STREAM_H__ -#include <gst/farstream/fs-stream.h> -#include <gst/farstream/fs-stream-transmitter.h> +#include <farstream/fs-stream.h> +#include <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 940f9417..0feaa791 100644 --- a/gst/fsrtpconference/fs-rtp-substream.c +++ b/gst/fsrtpconference/fs-rtp-substream.c @@ -29,8 +29,8 @@ #include "fs-rtp-substream.h" -#include <gst/farstream/fs-stream.h> -#include <gst/farstream/fs-session.h> +#include <farstream/fs-stream.h> +#include <farstream/fs-session.h> #include "fs-rtp-stream.h" #include "fs-rtp-marshal.h" diff --git a/gst/fsrtpconference/fs-rtp-tfrc.c b/gst/fsrtpconference/fs-rtp-tfrc.c index 71c84f00..1800c564 100644 --- a/gst/fsrtpconference/fs-rtp-tfrc.c +++ b/gst/fsrtpconference/fs-rtp-tfrc.c @@ -31,7 +31,7 @@ #include <string.h> #include "fs-rtp-packet-modder.h" -#include "gst/farstream/fs-rtp.h" +#include "farstream/fs-rtp.h" #include "fs-rtp-codec-negotiation.h" #include <gst/rtp/gstrtpbuffer.h> diff --git a/python/Makefile.am b/python/Makefile.am index c72f6e22..20639cc7 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -24,7 +24,7 @@ nodist_farstream_la_SOURCES = pyfarstream.c farstream_la_LIBADD = \ $(PYFARSTREAM_LIBS) \ - $(top_builddir)/gst-libs/gst/farstream/libfarstream-@GST_MAJORMINOR@.la + $(top_builddir)/farstream/libfarstream-@GST_MAJORMINOR@.la farstream_la_LDFLAGS = -module -avoid-version diff --git a/python/pyfarstream.override b/python/pyfarstream.override index 5f543b05..8385b1e4 100644 --- a/python/pyfarstream.override +++ b/python/pyfarstream.override @@ -5,9 +5,9 @@ headers #include <gst/gst.h> -#include <gst/farstream/fs-conference.h> +#include <farstream/fs-conference.h> -#include <gst/farstream/fs-element-added-notifier.h> +#include <farstream/fs-element-added-notifier.h> /* This is new in python 2.5 */ #if PYTHON_API_VERSION < 1013 diff --git a/python/pyfarstreammodule.c b/python/pyfarstreammodule.c index 404c2f03..d43f4577 100644 --- a/python/pyfarstreammodule.c +++ b/python/pyfarstreammodule.c @@ -1,5 +1,5 @@ #include <pygobject.h> -#include <gst/farstream/fs-codec.h> +#include <farstream/fs-codec.h> void fs_register_classes (PyObject *d); void fs_add_constants(PyObject *module, const gchar *strip_prefix); diff --git a/python/rebuild-defs.sh b/python/rebuild-defs.sh index 8d73e9a9..71339a42 100755 --- a/python/rebuild-defs.sh +++ b/python/rebuild-defs.sh @@ -11,7 +11,7 @@ HEADERS=" \ fs-element-added-notifier.h \ fs-enumtypes.h" -srcdir=../gst-libs/gst/farstream/ +srcdir=../farstream/ output=pyfarstream.defs filter=pyfarstream-filter.defs diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 62afd343..7e24b787 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -13,7 +13,7 @@ TESTS_ENVIRONMENT = \ 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/farstream/.libs:${LD_LIBRARY_PATH} \ + LD_LIBRARY_PATH=$(top_builddir)/farstream/.libs:${LD_LIBRARY_PATH} \ UPNP_XML_PATH=$(srcdir)/upnp \ SRCDIR=$(srcdir) \ XDG_CACHE_HOME=$(builddir)/cache @@ -67,7 +67,7 @@ AM_CFLAGS = \ $(GST_CFLAGS) LDADD = \ - $(top_builddir)/gst-libs/gst/farstream/libfarstream-0.10.la \ + $(top_builddir)/farstream/libfarstream-0.10.la \ $(GST_CHECK_LIBS) \ $(GST_LIBS) diff --git a/tests/check/base/fscodec.c b/tests/check/base/fscodec.c index 8e69167e..4d9dcdfd 100644 --- a/tests/check/base/fscodec.c +++ b/tests/check/base/fscodec.c @@ -23,8 +23,8 @@ #endif #include <gst/check/gstcheck.h> -#include "gst/farstream/fs-codec.h" -#include "gst/farstream/fs-rtp.h" +#include "farstream/fs-codec.h" +#include "farstream/fs-rtp.h" #include "testutils.h" diff --git a/tests/check/base/fstransmitter.c b/tests/check/base/fstransmitter.c index 0e85d901..46b81426 100644 --- a/tests/check/base/fstransmitter.c +++ b/tests/check/base/fstransmitter.c @@ -24,8 +24,8 @@ #endif #include <gst/check/gstcheck.h> -#include <gst/farstream/fs-transmitter.h> -#include <gst/farstream/fs-conference.h> +#include <farstream/fs-transmitter.h> +#include <farstream/fs-conference.h> GST_START_TEST (test_fstransmitter_new_fail) diff --git a/tests/check/msn/conference.c b/tests/check/msn/conference.c index 2097b911..8d80d665 100644 --- a/tests/check/msn/conference.c +++ b/tests/check/msn/conference.c @@ -23,7 +23,7 @@ #endif #include <gst/check/gstcheck.h> -#include <gst/farstream/fs-conference.h> +#include <farstream/fs-conference.h> #include "check-threadsafe.h" diff --git a/tests/check/raw/conference.c b/tests/check/raw/conference.c index e97a7c43..81529ebe 100644 --- a/tests/check/raw/conference.c +++ b/tests/check/raw/conference.c @@ -24,8 +24,8 @@ #endif #include <gst/check/gstcheck.h> -#include <gst/farstream/fs-conference.h> -#include <gst/farstream/fs-stream-transmitter.h> +#include <farstream/fs-conference.h> +#include <farstream/fs-stream-transmitter.h> #include "check-threadsafe.h" diff --git a/tests/check/rtp/codecs.c b/tests/check/rtp/codecs.c index 7096257f..cea91e74 100644 --- a/tests/check/rtp/codecs.c +++ b/tests/check/rtp/codecs.c @@ -23,8 +23,8 @@ #endif #include <gst/check/gstcheck.h> -#include <gst/farstream/fs-conference.h> -#include <gst/farstream/fs-rtp.h> +#include <farstream/fs-conference.h> +#include <farstream/fs-rtp.h> #include "generic.h" diff --git a/tests/check/rtp/conference.c b/tests/check/rtp/conference.c index 0a524672..290dc8b0 100644 --- a/tests/check/rtp/conference.c +++ b/tests/check/rtp/conference.c @@ -23,8 +23,8 @@ #endif #include <gst/check/gstcheck.h> -#include <gst/farstream/fs-conference.h> -#include <gst/farstream/fs-stream-transmitter.h> +#include <farstream/fs-conference.h> +#include <farstream/fs-stream-transmitter.h> #include "check-threadsafe.h" diff --git a/tests/check/rtp/generic.c b/tests/check/rtp/generic.c index f0d58354..ca2b246e 100644 --- a/tests/check/rtp/generic.c +++ b/tests/check/rtp/generic.c @@ -26,7 +26,7 @@ #include "generic.h" #include <gst/check/gstcheck.h> -#include <gst/farstream/fs-conference.h> +#include <farstream/fs-conference.h> static GstBusSyncReply diff --git a/tests/check/rtp/generic.h b/tests/check/rtp/generic.h index 2b908b24..21fba4c2 100644 --- a/tests/check/rtp/generic.h +++ b/tests/check/rtp/generic.h @@ -23,7 +23,7 @@ #define __GENERIC_H__ #include <gst/gst.h> -#include <gst/farstream/fs-conference.h> +#include <farstream/fs-conference.h> struct SimpleTestConference { gint id; diff --git a/tests/check/rtp/recvcodecs.c b/tests/check/rtp/recvcodecs.c index 4492af79..4450937e 100644 --- a/tests/check/rtp/recvcodecs.c +++ b/tests/check/rtp/recvcodecs.c @@ -25,8 +25,8 @@ #include <gst/check/gstcheck.h> #include <gst/rtp/gstrtpbuffer.h> -#include <gst/farstream/fs-conference.h> -#include <gst/farstream/fs-element-added-notifier.h> +#include <farstream/fs-conference.h> +#include <farstream/fs-element-added-notifier.h> #include "check-threadsafe.h" diff --git a/tests/check/rtp/sendcodecs.c b/tests/check/rtp/sendcodecs.c index 3be52c0a..71d65d67 100644 --- a/tests/check/rtp/sendcodecs.c +++ b/tests/check/rtp/sendcodecs.c @@ -25,7 +25,7 @@ #include <gst/check/gstcheck.h> #include <gst/rtp/gstrtpbuffer.h> -#include <gst/farstream/fs-conference.h> +#include <farstream/fs-conference.h> #include "check-threadsafe.h" #include "generic.h" diff --git a/tests/check/transmitter/generic.c b/tests/check/transmitter/generic.c index c1c90bb3..810faa10 100644 --- a/tests/check/transmitter/generic.c +++ b/tests/check/transmitter/generic.c @@ -23,8 +23,8 @@ #endif #include <gst/check/gstcheck.h> -#include <gst/farstream/fs-transmitter.h> -#include <gst/farstream/fs-stream-transmitter.h> +#include <farstream/fs-transmitter.h> +#include <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 bbe61208..db310e07 100644 --- a/tests/check/transmitter/generic.h +++ b/tests/check/transmitter/generic.h @@ -20,7 +20,7 @@ #include <gst/gst.h> -#include <gst/farstream/fs-transmitter.h> +#include <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 097913a7..2ded687b 100644 --- a/tests/check/transmitter/multicast.c +++ b/tests/check/transmitter/multicast.c @@ -23,8 +23,8 @@ #endif #include <gst/check/gstcheck.h> -#include <gst/farstream/fs-transmitter.h> -#include <gst/farstream/fs-conference.h> +#include <farstream/fs-transmitter.h> +#include <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 cc3234f0..62ed4b1f 100644 --- a/tests/check/transmitter/nice.c +++ b/tests/check/transmitter/nice.c @@ -23,8 +23,8 @@ #endif #include <gst/check/gstcheck.h> -#include <gst/farstream/fs-transmitter.h> -#include <gst/farstream/fs-conference.h> +#include <farstream/fs-transmitter.h> +#include <farstream/fs-conference.h> #include <unistd.h> diff --git a/tests/check/transmitter/rawudp.c b/tests/check/transmitter/rawudp.c index a87a24df..faae7573 100644 --- a/tests/check/transmitter/rawudp.c +++ b/tests/check/transmitter/rawudp.c @@ -23,8 +23,8 @@ #endif #include <gst/check/gstcheck.h> -#include <gst/farstream/fs-transmitter.h> -#include <gst/farstream/fs-conference.h> +#include <farstream/fs-transmitter.h> +#include <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 4d3c6d74..d23ff3d3 100644 --- a/tests/check/transmitter/shm.c +++ b/tests/check/transmitter/shm.c @@ -24,8 +24,8 @@ #endif #include <gst/check/gstcheck.h> -#include <gst/farstream/fs-transmitter.h> -#include <gst/farstream/fs-conference.h> +#include <farstream/fs-transmitter.h> +#include <farstream/fs-conference.h> #include <arpa/inet.h> #include <netdb.h> diff --git a/tests/check/utils/binadded.c b/tests/check/utils/binadded.c index 1c4e80e3..7950485b 100644 --- a/tests/check/utils/binadded.c +++ b/tests/check/utils/binadded.c @@ -24,7 +24,7 @@ #endif #include <gst/check/gstcheck.h> -#include <gst/farstream/fs-element-added-notifier.h> +#include <farstream/fs-element-added-notifier.h> #include "testutils.h" diff --git a/tests/rtp/Makefile.am b/tests/rtp/Makefile.am index f93d8495..8033fbf1 100644 --- a/tests/rtp/Makefile.am +++ b/tests/rtp/Makefile.am @@ -12,7 +12,7 @@ codec_discovery_CFLAGS = \ $(CFLAGS) LDADD = \ - $(top_builddir)/gst-libs/gst/farstream/libfarstream-0.10.la \ + $(top_builddir)/farstream/libfarstream-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 5e7c99b6..ef6ed96a 100644 --- a/tests/rtp/codec-discovery.c +++ b/tests/rtp/codec-discovery.c @@ -20,7 +20,7 @@ #include <gst/gst.h> -#include <gst/farstream/fs-codec.h> +#include <farstream/fs-codec.h> #include "fs-rtp-discover-codecs.h" #include "fs-rtp-conference.h" diff --git a/transmitters/multicast/Makefile.am b/transmitters/multicast/Makefile.am index 6aaea167..6a0776c2 100644 --- a/transmitters/multicast/Makefile.am +++ b/transmitters/multicast/Makefile.am @@ -16,7 +16,7 @@ libmulticast_transmitter_la_CFLAGS = \ $(GST_CFLAGS) libmulticast_transmitter_la_LDFLAGS = $(FS_PLUGIN_LDFLAGS) libmulticast_transmitter_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/farstream/libfarstream-0.10.la \ + $(top_builddir)/farstream/libfarstream-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 76ac4742..a5b1844d 100644 --- a/transmitters/multicast/fs-multicast-stream-transmitter.c +++ b/transmitters/multicast/fs-multicast-stream-transmitter.c @@ -60,8 +60,8 @@ #include "fs-multicast-stream-transmitter.h" #include "fs-multicast-transmitter.h" -#include <gst/farstream/fs-candidate.h> -#include <gst/farstream/fs-conference.h> +#include <farstream/fs-candidate.h> +#include <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 87f2dd92..e63db885 100644 --- a/transmitters/multicast/fs-multicast-stream-transmitter.h +++ b/transmitters/multicast/fs-multicast-stream-transmitter.h @@ -28,8 +28,8 @@ #include <glib.h> #include <glib-object.h> -#include <gst/farstream/fs-stream-transmitter.h> -#include <gst/farstream/fs-plugin.h> +#include <farstream/fs-stream-transmitter.h> +#include <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 ae3fcb2c..a0b82225 100644 --- a/transmitters/multicast/fs-multicast-transmitter.c +++ b/transmitters/multicast/fs-multicast-transmitter.c @@ -37,8 +37,8 @@ #include "fs-multicast-transmitter.h" #include "fs-multicast-stream-transmitter.h" -#include <gst/farstream/fs-conference.h> -#include <gst/farstream/fs-plugin.h> +#include <farstream/fs-conference.h> +#include <farstream/fs-plugin.h> #include <string.h> #include <sys/types.h> diff --git a/transmitters/multicast/fs-multicast-transmitter.h b/transmitters/multicast/fs-multicast-transmitter.h index 07c359cc..400b5251 100644 --- a/transmitters/multicast/fs-multicast-transmitter.h +++ b/transmitters/multicast/fs-multicast-transmitter.h @@ -25,7 +25,7 @@ #ifndef __FS_MULTICAST_TRANSMITTER_H__ #define __FS_MULTICAST_TRANSMITTER_H__ -#include <gst/farstream/fs-transmitter.h> +#include <farstream/fs-transmitter.h> #include <gst/gst.h> diff --git a/transmitters/nice/Makefile.am b/transmitters/nice/Makefile.am index 4660fc3d..91a58c56 100644 --- a/transmitters/nice/Makefile.am +++ b/transmitters/nice/Makefile.am @@ -18,7 +18,7 @@ libnice_transmitter_la_CFLAGS = \ $(NICE_CFLAGS) libnice_transmitter_la_LDFLAGS = $(FS_PLUGIN_LDFLAGS) libnice_transmitter_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/farstream/libfarstream-0.10.la \ + $(top_builddir)/farstream/libfarstream-0.10.la \ $(FS_LIBS) \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ diff --git a/transmitters/nice/fs-nice-agent.c b/transmitters/nice/fs-nice-agent.c index 1e1e2c69..adcf5037 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/farstream/fs-conference.h> +#include <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 6e634103..37db75d4 100644 --- a/transmitters/nice/fs-nice-agent.h +++ b/transmitters/nice/fs-nice-agent.h @@ -26,7 +26,7 @@ #define __FS_NICE_AGENT_H__ #include <glib-object.h> -#include <gst/farstream/fs-plugin.h> +#include <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 0e7782e0..1f0dbefc 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/farstream/fs-conference.h> +#include <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 b40e02ee..2bc14e36 100644 --- a/transmitters/nice/fs-nice-stream-transmitter.h +++ b/transmitters/nice/fs-nice-stream-transmitter.h @@ -28,8 +28,8 @@ #include <glib.h> #include <glib-object.h> -#include <gst/farstream/fs-stream-transmitter.h> -#include <gst/farstream/fs-plugin.h> +#include <farstream/fs-stream-transmitter.h> +#include <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 48773e19..64d8f183 100644 --- a/transmitters/nice/fs-nice-transmitter.c +++ b/transmitters/nice/fs-nice-transmitter.c @@ -39,8 +39,8 @@ #include "fs-nice-stream-transmitter.h" #include "fs-nice-agent.h" -#include <gst/farstream/fs-conference.h> -#include <gst/farstream/fs-plugin.h> +#include <farstream/fs-conference.h> +#include <farstream/fs-plugin.h> #include <agent.h> diff --git a/transmitters/nice/fs-nice-transmitter.h b/transmitters/nice/fs-nice-transmitter.h index a39ae610..e4cbe898 100644 --- a/transmitters/nice/fs-nice-transmitter.h +++ b/transmitters/nice/fs-nice-transmitter.h @@ -25,7 +25,7 @@ #ifndef __FS_NICE_TRANSMITTER_H__ #define __FS_NICE_TRANSMITTER_H__ -#include <gst/farstream/fs-transmitter.h> +#include <farstream/fs-transmitter.h> #include <gst/gst.h> #include <agent.h> diff --git a/transmitters/rawudp/Makefile.am b/transmitters/rawudp/Makefile.am index 0038d6d3..fd5bd66e 100644 --- a/transmitters/rawudp/Makefile.am +++ b/transmitters/rawudp/Makefile.am @@ -24,7 +24,7 @@ librawudp_transmitter_la_CFLAGS = \ $(GUPNP_CFLAGS) librawudp_transmitter_la_LDFLAGS = $(FS_PLUGIN_LDFLAGS) librawudp_transmitter_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/farstream/libfarstream-0.10.la \ + $(top_builddir)/farstream/libfarstream-0.10.la \ $(FS_LIBS) \ $(GST_PLUGINS_BASE_LIBS) \ $(GST_LIBS) \ diff --git a/transmitters/rawudp/fs-rawudp-component.c b/transmitters/rawudp/fs-rawudp-component.c index 9e28199a..27f6c8a3 100644 --- a/transmitters/rawudp/fs-rawudp-component.c +++ b/transmitters/rawudp/fs-rawudp-component.c @@ -37,7 +37,7 @@ #include <nice/address.h> #include <nice/interfaces.h> -#include <gst/farstream/fs-conference.h> +#include <farstream/fs-conference.h> #include <gst/netbuffer/gstnetbuffer.h> diff --git a/transmitters/rawudp/fs-rawudp-component.h b/transmitters/rawudp/fs-rawudp-component.h index 317eb4b8..5f124a7c 100644 --- a/transmitters/rawudp/fs-rawudp-component.h +++ b/transmitters/rawudp/fs-rawudp-component.h @@ -28,8 +28,8 @@ #include <glib.h> #include <glib-object.h> -#include <gst/farstream/fs-stream-transmitter.h> -#include <gst/farstream/fs-plugin.h> +#include <farstream/fs-stream-transmitter.h> +#include <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 5d2f0d0f..99554dcd 100644 --- a/transmitters/rawudp/fs-rawudp-stream-transmitter.c +++ b/transmitters/rawudp/fs-rawudp-stream-transmitter.c @@ -66,8 +66,8 @@ #include "fs-rawudp-component.h" -#include <gst/farstream/fs-candidate.h> -#include <gst/farstream/fs-conference.h> +#include <farstream/fs-candidate.h> +#include <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 8e0698b0..a4d9b85c 100644 --- a/transmitters/rawudp/fs-rawudp-stream-transmitter.h +++ b/transmitters/rawudp/fs-rawudp-stream-transmitter.h @@ -28,8 +28,8 @@ #include <glib.h> #include <glib-object.h> -#include <gst/farstream/fs-stream-transmitter.h> -#include <gst/farstream/fs-plugin.h> +#include <farstream/fs-stream-transmitter.h> +#include <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 111e7392..36961e38 100644 --- a/transmitters/rawudp/fs-rawudp-transmitter.c +++ b/transmitters/rawudp/fs-rawudp-transmitter.c @@ -37,8 +37,8 @@ #include "fs-rawudp-transmitter.h" #include "fs-rawudp-stream-transmitter.h" -#include <gst/farstream/fs-conference.h> -#include <gst/farstream/fs-plugin.h> +#include <farstream/fs-conference.h> +#include <farstream/fs-plugin.h> #include <string.h> #include <sys/types.h> diff --git a/transmitters/rawudp/fs-rawudp-transmitter.h b/transmitters/rawudp/fs-rawudp-transmitter.h index 723bd06a..c5c18de1 100644 --- a/transmitters/rawudp/fs-rawudp-transmitter.h +++ b/transmitters/rawudp/fs-rawudp-transmitter.h @@ -25,7 +25,7 @@ #ifndef __FS_RAWUDP_TRANSMITTER_H__ #define __FS_RAWUDP_TRANSMITTER_H__ -#include <gst/farstream/fs-transmitter.h> +#include <farstream/fs-transmitter.h> #include <gst/netbuffer/gstnetbuffer.h> diff --git a/transmitters/shm/Makefile.am b/transmitters/shm/Makefile.am index f0a9bf92..07e1656b 100644 --- a/transmitters/shm/Makefile.am +++ b/transmitters/shm/Makefile.am @@ -16,7 +16,7 @@ libshm_transmitter_la_CFLAGS = \ $(GST_CFLAGS) libshm_transmitter_la_LDFLAGS = $(FS_PLUGIN_LDFLAGS) libshm_transmitter_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/farstream/libfarstream-0.10.la \ + $(top_builddir)/farstream/libfarstream-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 8ef3d742..23c45f26 100644 --- a/transmitters/shm/fs-shm-stream-transmitter.c +++ b/transmitters/shm/fs-shm-stream-transmitter.c @@ -66,8 +66,8 @@ #include "fs-shm-stream-transmitter.h" #include "fs-shm-transmitter.h" -#include <gst/farstream/fs-candidate.h> -#include <gst/farstream/fs-conference.h> +#include <farstream/fs-candidate.h> +#include <farstream/fs-conference.h> #include <gst/gst.h> diff --git a/transmitters/shm/fs-shm-stream-transmitter.h b/transmitters/shm/fs-shm-stream-transmitter.h index f44b3170..38b6b8ad 100644 --- a/transmitters/shm/fs-shm-stream-transmitter.h +++ b/transmitters/shm/fs-shm-stream-transmitter.h @@ -28,8 +28,8 @@ #include <glib.h> #include <glib-object.h> -#include <gst/farstream/fs-stream-transmitter.h> -#include <gst/farstream/fs-plugin.h> +#include <farstream/fs-stream-transmitter.h> +#include <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 d1b15740..5bd049f6 100644 --- a/transmitters/shm/fs-shm-transmitter.c +++ b/transmitters/shm/fs-shm-transmitter.c @@ -37,8 +37,8 @@ #include "fs-shm-transmitter.h" #include "fs-shm-stream-transmitter.h" -#include <gst/farstream/fs-conference.h> -#include <gst/farstream/fs-plugin.h> +#include <farstream/fs-conference.h> +#include <farstream/fs-plugin.h> #include <string.h> diff --git a/transmitters/shm/fs-shm-transmitter.h b/transmitters/shm/fs-shm-transmitter.h index e483068c..978c3049 100644 --- a/transmitters/shm/fs-shm-transmitter.h +++ b/transmitters/shm/fs-shm-transmitter.h @@ -25,7 +25,7 @@ #ifndef __FS_SHM_TRANSMITTER_H__ #define __FS_SHM_TRANSMITTER_H__ -#include <gst/farstream/fs-transmitter.h> +#include <farstream/fs-transmitter.h> #include <gst/gst.h> |