summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.co.uk>2011-05-12 16:10:02 -0400
committerOlivier CrĂȘte <olivier.crete@collabora.com>2011-10-11 15:46:10 -0400
commitd7057e4088d6b03628fb1c574bd4e8c2a4fdaad1 (patch)
treec0276931d06c6cb88f8d5352b7c02638934a0582
parent43050cc249532c66d957980259b2b57816db3269 (diff)
downloadfarstream-d7057e4088d6b03628fb1c574bd4e8c2a4fdaad1.tar.gz
fs-conference: Rename file from fs-conference-iface.[ch] to fs-conference.[ch]
-rw-r--r--docs/libs/farsight2-libs-docs.sgml2
-rw-r--r--docs/libs/farsight2-libs-sections.txt14
-rw-r--r--examples/commandline/simple-call-shm.c2
-rw-r--r--examples/commandline/simple-call.c2
-rw-r--r--gst-libs/gst/farsight/Makefile.am6
-rw-r--r--gst-libs/gst/farsight/fs-base-conference.h2
-rw-r--r--gst-libs/gst/farsight/fs-conference.c (renamed from gst-libs/gst/farsight/fs-conference-iface.c)6
-rw-r--r--gst-libs/gst/farsight/fs-conference.h (renamed from gst-libs/gst/farsight/fs-conference-iface.h)2
-rw-r--r--gst-libs/gst/farsight/fs-plugin.c2
-rw-r--r--gst-libs/gst/farsight/fs-private.h2
-rw-r--r--gst-libs/gst/farsight/fs-session.c2
-rw-r--r--gst-libs/gst/farsight/fs-stream-transmitter.c2
-rw-r--r--gst-libs/gst/farsight/fs-stream.c2
-rw-r--r--gst-libs/gst/farsight/fs-transmitter.c2
-rw-r--r--gst/fsrtpconference/fs-rtp-codec-cache.c2
-rw-r--r--gst/fsrtpconference/fs-rtp-discover-codecs.c2
-rw-r--r--python/pyfarsight.defs2
-rw-r--r--python/pyfarsight.override2
-rwxr-xr-xpython/rebuild-defs.sh2
-rw-r--r--tests/check/base/fstransmitter.c2
-rw-r--r--tests/check/msn/conference.c2
-rw-r--r--tests/check/raw/conference.c2
-rw-r--r--tests/check/rtp/codecs.c2
-rw-r--r--tests/check/rtp/conference.c2
-rw-r--r--tests/check/rtp/generic.c2
-rw-r--r--tests/check/rtp/generic.h2
-rw-r--r--tests/check/rtp/recvcodecs.c2
-rw-r--r--tests/check/rtp/sendcodecs.c2
-rw-r--r--tests/check/transmitter/multicast.c2
-rw-r--r--tests/check/transmitter/nice.c2
-rw-r--r--tests/check/transmitter/rawudp.c2
-rw-r--r--tests/check/transmitter/shm.c2
-rw-r--r--transmitters/multicast/fs-multicast-stream-transmitter.c2
-rw-r--r--transmitters/multicast/fs-multicast-transmitter.c2
-rw-r--r--transmitters/nice/fs-nice-agent.c2
-rw-r--r--transmitters/nice/fs-nice-stream-transmitter.c2
-rw-r--r--transmitters/nice/fs-nice-transmitter.c2
-rw-r--r--transmitters/rawudp/fs-rawudp-component.c2
-rw-r--r--transmitters/rawudp/fs-rawudp-stream-transmitter.c2
-rw-r--r--transmitters/rawudp/fs-rawudp-transmitter.c2
-rw-r--r--transmitters/shm/fs-shm-stream-transmitter.c2
-rw-r--r--transmitters/shm/fs-shm-transmitter.c2
42 files changed, 52 insertions, 52 deletions
diff --git a/docs/libs/farsight2-libs-docs.sgml b/docs/libs/farsight2-libs-docs.sgml
index 04511696..233275b8 100644
--- a/docs/libs/farsight2-libs-docs.sgml
+++ b/docs/libs/farsight2-libs-docs.sgml
@@ -20,7 +20,7 @@
<title>User-oriented classes, interfaces and functions</title>
<chapter>
<title>Farsight GStreamer Interfaces</title>
- <xi:include href="xml/fs-conference-iface.xml"/>
+ <xi:include href="xml/fs-conference.xml"/>
</chapter>
<chapter>
<title>Farsight Core Library</title>
diff --git a/docs/libs/farsight2-libs-sections.txt b/docs/libs/farsight2-libs-sections.txt
index d15c4e0a..22758dfd 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-iface.h</INCLUDE>
+<INCLUDE>gst/farsight/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-iface.h</INCLUDE>
+<INCLUDE>gst/farsight/fs-conference.h</INCLUDE>
FsStream
FsStreamClass
FsStreamDirection
@@ -51,7 +51,7 @@ FsStreamPrivate
FsDTMFEvent
FsDTMFMethod
<TITLE>FsSession</TITLE>
-<INCLUDE>gst/farsight/fs-conference-iface.h</INCLUDE>
+<INCLUDE>gst/farsight/fs-conference.h</INCLUDE>
FsSession
FsSessionClass
fs_session_new_stream
@@ -76,9 +76,9 @@ FsSessionPrivate
</SECTION>
<SECTION>
-<FILE>fs-conference-iface</FILE>
+<FILE>fs-conference</FILE>
<TITLE>FsConference</TITLE>
-<INCLUDE>gst/farsight/fs-conference-iface.h</INCLUDE>
+<INCLUDE>gst/farsight/fs-conference.h</INCLUDE>
FsConference
fs_conference_new_session
fs_conference_new_participant
@@ -98,7 +98,7 @@ fs_error_quark
<SECTION>
<FILE>fs-candidate</FILE>
<TITLE>FsCandidate</TITLE>
-<INCLUDE>gst/farsight/fs-conference-iface.h</INCLUDE>
+<INCLUDE>gst/farsight/fs-conference.h</INCLUDE>
FsCandidate
FsCandidateType
FsNetworkProtocol
@@ -118,7 +118,7 @@ fs_candidate_list_get_type
<SECTION>
<FILE>fs-codec</FILE>
<TITLE>FsCodec</TITLE>
-<INCLUDE>gst/farsight/fs-conference-iface.h</INCLUDE>
+<INCLUDE>gst/farsight/fs-conference.h</INCLUDE>
FsCodec
FsMediaType
FsCodecParameter
diff --git a/examples/commandline/simple-call-shm.c b/examples/commandline/simple-call-shm.c
index 7d4d61a0..325c912d 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/farsight/fs-conference-iface.h>
+#include <gst/farsight/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 e2206418..2d6a154a 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/farsight/fs-conference-iface.h>
+#include <gst/farsight/fs-conference.h>
#define DEFAULT_AUDIOSRC "alsasrc"
#define DEFAULT_AUDIOSINK "audioconvert ! audioresample ! audioconvert ! alsasink"
diff --git a/gst-libs/gst/farsight/Makefile.am b/gst-libs/gst/farsight/Makefile.am
index 9f7a6b0f..67665213 100644
--- a/gst-libs/gst/farsight/Makefile.am
+++ b/gst-libs/gst/farsight/Makefile.am
@@ -7,7 +7,7 @@ libgstfarsightinclude_HEADERS = \
fs-participant.h \
fs-session.h \
fs-stream.h \
- fs-conference-iface.h \
+ fs-conference.h \
fs-transmitter.h \
fs-stream-transmitter.h \
fs-plugin.h \
@@ -34,7 +34,7 @@ libgstfarsight_@GST_MAJORMINOR@_la_SOURCES = \
fs-participant.c \
fs-session.c \
fs-stream.c \
- fs-conference-iface.c \
+ fs-conference.c \
fs-transmitter.c \
fs-stream-transmitter.c \
fs-plugin.c \
@@ -80,7 +80,7 @@ public_headers = fs-candidate.h \
fs-participant.h \
fs-session.h \
fs-stream.h \
- fs-conference-iface.h \
+ fs-conference.h \
fs-utils.h
glib_enum_headers=$(public_headers)
diff --git a/gst-libs/gst/farsight/fs-base-conference.h b/gst-libs/gst/farsight/fs-base-conference.h
index 549a3ae9..feedbdd7 100644
--- a/gst-libs/gst/farsight/fs-base-conference.h
+++ b/gst-libs/gst/farsight/fs-base-conference.h
@@ -28,7 +28,7 @@
#include <gst/gst.h>
-#include <gst/farsight/fs-conference-iface.h>
+#include <gst/farsight/fs-conference.h>
#include <gst/farsight/fs-session.h>
#include <gst/farsight/fs-codec.h>
diff --git a/gst-libs/gst/farsight/fs-conference-iface.c b/gst-libs/gst/farsight/fs-conference.c
index e5f8e751..cc3c3901 100644
--- a/gst-libs/gst/farsight/fs-conference-iface.c
+++ b/gst-libs/gst/farsight/fs-conference.c
@@ -5,7 +5,7 @@
* @author: Philippe Kalaf <philippe.kalaf@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-conference-iface.c - GStreamer interface to be implemented by farsight
+ * fs-conference.c - GStreamer interface to be implemented by farsight
* conference elements
*
* This library is free software; you can redistribute it and/or
@@ -27,10 +27,10 @@
#include "config.h"
#endif
-#include "fs-conference-iface.h"
+#include "fs-conference.h"
/**
- * SECTION:fs-conference-iface
+ * SECTION:fs-conference
* @short_description: Interface for farsight conference elements
*
* This interface is implemented by the FsBaseConference base class element. A
diff --git a/gst-libs/gst/farsight/fs-conference-iface.h b/gst-libs/gst/farsight/fs-conference.h
index df117fd7..8db99a67 100644
--- a/gst-libs/gst/farsight/fs-conference-iface.h
+++ b/gst-libs/gst/farsight/fs-conference.h
@@ -5,7 +5,7 @@
* @author: Philippe Kalaf <philippe.kalaf@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-conference-iface.h - Header file for gstreamer interface to be
+ * fs-conference.h - Header file for gstreamer interface to be
* implemented by farsight conference elements
*
* This library is free software; you can redistribute it and/or
diff --git a/gst-libs/gst/farsight/fs-plugin.c b/gst-libs/gst/farsight/fs-plugin.c
index ebcd83c5..e996e804 100644
--- a/gst-libs/gst/farsight/fs-plugin.c
+++ b/gst-libs/gst/farsight/fs-plugin.c
@@ -33,7 +33,7 @@
#include <string.h>
-#include "fs-conference-iface.h"
+#include "fs-conference.h"
#include "fs-private.h"
#define GST_CAT_DEFAULT fs_base_conference_debug
diff --git a/gst-libs/gst/farsight/fs-private.h b/gst-libs/gst/farsight/fs-private.h
index 027b50ef..24ee48e2 100644
--- a/gst-libs/gst/farsight/fs-private.h
+++ b/gst-libs/gst/farsight/fs-private.h
@@ -5,7 +5,7 @@
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2008 Nokia Corp.
*
- * fs-conference-iface.h - Header file for gstreamer interface to be
+ * fs-conference.h - Header file for gstreamer interface to be
* implemented by farsight conference elements
*
* This library is free software; you can redistribute it and/or
diff --git a/gst-libs/gst/farsight/fs-session.c b/gst-libs/gst/farsight/fs-session.c
index 55be2b98..c4b0eb91 100644
--- a/gst-libs/gst/farsight/fs-session.c
+++ b/gst-libs/gst/farsight/fs-session.c
@@ -77,7 +77,7 @@
#include <gst/gst.h>
-#include "fs-conference-iface.h"
+#include "fs-conference.h"
#include "fs-codec.h"
#include "fs-marshal.h"
#include "fs-enumtypes.h"
diff --git a/gst-libs/gst/farsight/fs-stream-transmitter.c b/gst-libs/gst/farsight/fs-stream-transmitter.c
index 09c0f2ba..a9e64ec1 100644
--- a/gst-libs/gst/farsight/fs-stream-transmitter.c
+++ b/gst-libs/gst/farsight/fs-stream-transmitter.c
@@ -43,7 +43,7 @@
#include <gst/gst.h>
#include "fs-marshal.h"
-#include "fs-conference-iface.h"
+#include "fs-conference.h"
#include "fs-private.h"
#define GST_CAT_DEFAULT fs_base_conference_debug
diff --git a/gst-libs/gst/farsight/fs-stream.c b/gst-libs/gst/farsight/fs-stream.c
index df4c3046..45860b92 100644
--- a/gst-libs/gst/farsight/fs-stream.c
+++ b/gst-libs/gst/farsight/fs-stream.c
@@ -109,7 +109,7 @@
#include "fs-codec.h"
#include "fs-candidate.h"
#include "fs-stream-transmitter.h"
-#include "fs-conference-iface.h"
+#include "fs-conference.h"
#include "fs-enumtypes.h"
#include "fs-private.h"
diff --git a/gst-libs/gst/farsight/fs-transmitter.c b/gst-libs/gst/farsight/fs-transmitter.c
index 52859da9..49d6f6f8 100644
--- a/gst-libs/gst/farsight/fs-transmitter.c
+++ b/gst-libs/gst/farsight/fs-transmitter.c
@@ -44,7 +44,7 @@
#include "fs-marshal.h"
#include "fs-plugin.h"
-#include "fs-conference-iface.h"
+#include "fs-conference.h"
#include "fs-private.h"
/* Signals */
diff --git a/gst/fsrtpconference/fs-rtp-codec-cache.c b/gst/fsrtpconference/fs-rtp-codec-cache.c
index 80f24955..73e03d9e 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/farsight/fs-conference-iface.h>
+#include <gst/farsight/fs-conference.h>
#include "fs-rtp-conference.h"
diff --git a/gst/fsrtpconference/fs-rtp-discover-codecs.c b/gst/fsrtpconference/fs-rtp-discover-codecs.c
index 23b065a2..dcdc0a03 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/farsight/fs-conference-iface.h>
+#include <gst/farsight/fs-conference.h>
#include "fs-rtp-conference.h"
#include "fs-rtp-codec-cache.h"
diff --git a/python/pyfarsight.defs b/python/pyfarsight.defs
index 3d6648e2..04f634fb 100644
--- a/python/pyfarsight.defs
+++ b/python/pyfarsight.defs
@@ -332,7 +332,7 @@
)
-;; From fs-conference-iface.h
+;; From fs-conference.h
(define-function fs_conference_get_type
(c-name "fs_conference_get_type")
diff --git a/python/pyfarsight.override b/python/pyfarsight.override
index aa9fdcf9..9631bebf 100644
--- a/python/pyfarsight.override
+++ b/python/pyfarsight.override
@@ -5,7 +5,7 @@ headers
#include <gst/gst.h>
-#include <gst/farsight/fs-conference-iface.h>
+#include <gst/farsight/fs-conference.h>
#include <gst/farsight/fs-element-added-notifier.h>
diff --git a/python/rebuild-defs.sh b/python/rebuild-defs.sh
index 549ec54a..553e4845 100755
--- a/python/rebuild-defs.sh
+++ b/python/rebuild-defs.sh
@@ -3,7 +3,7 @@
HEADERS=" \
fs-codec.h \
fs-candidate.h \
- fs-conference-iface.h \
+ fs-conference.h \
fs-session.h \
fs-participant.h \
fs-stream.h \
diff --git a/tests/check/base/fstransmitter.c b/tests/check/base/fstransmitter.c
index 10d2d25b..aba6fb2f 100644
--- a/tests/check/base/fstransmitter.c
+++ b/tests/check/base/fstransmitter.c
@@ -25,7 +25,7 @@
#include <gst/check/gstcheck.h>
#include <gst/farsight/fs-transmitter.h>
-#include <gst/farsight/fs-conference-iface.h>
+#include <gst/farsight/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 211ca9a2..15f01f7f 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/farsight/fs-conference-iface.h>
+#include <gst/farsight/fs-conference.h>
#include "check-threadsafe.h"
diff --git a/tests/check/raw/conference.c b/tests/check/raw/conference.c
index db563a97..ac9befe9 100644
--- a/tests/check/raw/conference.c
+++ b/tests/check/raw/conference.c
@@ -24,7 +24,7 @@
#endif
#include <gst/check/gstcheck.h>
-#include <gst/farsight/fs-conference-iface.h>
+#include <gst/farsight/fs-conference.h>
#include <gst/farsight/fs-stream-transmitter.h>
#include "check-threadsafe.h"
diff --git a/tests/check/rtp/codecs.c b/tests/check/rtp/codecs.c
index 45120c64..c66e829a 100644
--- a/tests/check/rtp/codecs.c
+++ b/tests/check/rtp/codecs.c
@@ -23,7 +23,7 @@
#endif
#include <gst/check/gstcheck.h>
-#include <gst/farsight/fs-conference-iface.h>
+#include <gst/farsight/fs-conference.h>
#include <gst/farsight/fs-rtp.h>
#include "generic.h"
diff --git a/tests/check/rtp/conference.c b/tests/check/rtp/conference.c
index ebafde79..f0937b8e 100644
--- a/tests/check/rtp/conference.c
+++ b/tests/check/rtp/conference.c
@@ -23,7 +23,7 @@
#endif
#include <gst/check/gstcheck.h>
-#include <gst/farsight/fs-conference-iface.h>
+#include <gst/farsight/fs-conference.h>
#include <gst/farsight/fs-stream-transmitter.h>
#include "check-threadsafe.h"
diff --git a/tests/check/rtp/generic.c b/tests/check/rtp/generic.c
index 71a16ce2..fc0bb3af 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/farsight/fs-conference-iface.h>
+#include <gst/farsight/fs-conference.h>
static GstBusSyncReply
diff --git a/tests/check/rtp/generic.h b/tests/check/rtp/generic.h
index bd5365dc..0cefec5d 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/farsight/fs-conference-iface.h>
+#include <gst/farsight/fs-conference.h>
struct SimpleTestConference {
gint id;
diff --git a/tests/check/rtp/recvcodecs.c b/tests/check/rtp/recvcodecs.c
index b66d5fe3..641d8f44 100644
--- a/tests/check/rtp/recvcodecs.c
+++ b/tests/check/rtp/recvcodecs.c
@@ -25,7 +25,7 @@
#include <gst/check/gstcheck.h>
#include <gst/rtp/gstrtpbuffer.h>
-#include <gst/farsight/fs-conference-iface.h>
+#include <gst/farsight/fs-conference.h>
#include <gst/farsight/fs-element-added-notifier.h>
#include "check-threadsafe.h"
diff --git a/tests/check/rtp/sendcodecs.c b/tests/check/rtp/sendcodecs.c
index 7ebe0a5e..06f5666e 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/farsight/fs-conference-iface.h>
+#include <gst/farsight/fs-conference.h>
#include "check-threadsafe.h"
#include "generic.h"
diff --git a/tests/check/transmitter/multicast.c b/tests/check/transmitter/multicast.c
index bf9e69f6..1415dc32 100644
--- a/tests/check/transmitter/multicast.c
+++ b/tests/check/transmitter/multicast.c
@@ -24,7 +24,7 @@
#include <gst/check/gstcheck.h>
#include <gst/farsight/fs-transmitter.h>
-#include <gst/farsight/fs-conference-iface.h>
+#include <gst/farsight/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 63228524..0d49ad59 100644
--- a/tests/check/transmitter/nice.c
+++ b/tests/check/transmitter/nice.c
@@ -24,7 +24,7 @@
#include <gst/check/gstcheck.h>
#include <gst/farsight/fs-transmitter.h>
-#include <gst/farsight/fs-conference-iface.h>
+#include <gst/farsight/fs-conference.h>
#include <unistd.h>
diff --git a/tests/check/transmitter/rawudp.c b/tests/check/transmitter/rawudp.c
index 637a62bc..38980aac 100644
--- a/tests/check/transmitter/rawudp.c
+++ b/tests/check/transmitter/rawudp.c
@@ -24,7 +24,7 @@
#include <gst/check/gstcheck.h>
#include <gst/farsight/fs-transmitter.h>
-#include <gst/farsight/fs-conference-iface.h>
+#include <gst/farsight/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 4f29eb68..9fa75735 100644
--- a/tests/check/transmitter/shm.c
+++ b/tests/check/transmitter/shm.c
@@ -25,7 +25,7 @@
#include <gst/check/gstcheck.h>
#include <gst/farsight/fs-transmitter.h>
-#include <gst/farsight/fs-conference-iface.h>
+#include <gst/farsight/fs-conference.h>
#include <arpa/inet.h>
#include <netdb.h>
diff --git a/transmitters/multicast/fs-multicast-stream-transmitter.c b/transmitters/multicast/fs-multicast-stream-transmitter.c
index b1e01b25..264e6d7e 100644
--- a/transmitters/multicast/fs-multicast-stream-transmitter.c
+++ b/transmitters/multicast/fs-multicast-stream-transmitter.c
@@ -61,7 +61,7 @@
#include "fs-multicast-transmitter.h"
#include <gst/farsight/fs-candidate.h>
-#include <gst/farsight/fs-conference-iface.h>
+#include <gst/farsight/fs-conference.h>
#include <gst/gst.h>
diff --git a/transmitters/multicast/fs-multicast-transmitter.c b/transmitters/multicast/fs-multicast-transmitter.c
index f99fdd20..14f6a741 100644
--- a/transmitters/multicast/fs-multicast-transmitter.c
+++ b/transmitters/multicast/fs-multicast-transmitter.c
@@ -37,7 +37,7 @@
#include "fs-multicast-transmitter.h"
#include "fs-multicast-stream-transmitter.h"
-#include <gst/farsight/fs-conference-iface.h>
+#include <gst/farsight/fs-conference.h>
#include <gst/farsight/fs-plugin.h>
#include <string.h>
diff --git a/transmitters/nice/fs-nice-agent.c b/transmitters/nice/fs-nice-agent.c
index 31269bfd..3b350e25 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-iface.h>
+#include <gst/farsight/fs-conference.h>
#include "fs-nice-transmitter.h"
#include "fs-nice-agent.h"
diff --git a/transmitters/nice/fs-nice-stream-transmitter.c b/transmitters/nice/fs-nice-stream-transmitter.c
index f87776b7..fdc5a240 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-iface.h>
+#include <gst/farsight/fs-conference.h>
#include <gst/gst.h>
diff --git a/transmitters/nice/fs-nice-transmitter.c b/transmitters/nice/fs-nice-transmitter.c
index d97421f5..33d3c366 100644
--- a/transmitters/nice/fs-nice-transmitter.c
+++ b/transmitters/nice/fs-nice-transmitter.c
@@ -39,7 +39,7 @@
#include "fs-nice-stream-transmitter.h"
#include "fs-nice-agent.h"
-#include <gst/farsight/fs-conference-iface.h>
+#include <gst/farsight/fs-conference.h>
#include <gst/farsight/fs-plugin.h>
#include <agent.h>
diff --git a/transmitters/rawudp/fs-rawudp-component.c b/transmitters/rawudp/fs-rawudp-component.c
index c421c057..0b04df30 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/farsight/fs-conference-iface.h>
+#include <gst/farsight/fs-conference.h>
#include <gst/netbuffer/gstnetbuffer.h>
diff --git a/transmitters/rawudp/fs-rawudp-stream-transmitter.c b/transmitters/rawudp/fs-rawudp-stream-transmitter.c
index 6be31d4d..86f4f33a 100644
--- a/transmitters/rawudp/fs-rawudp-stream-transmitter.c
+++ b/transmitters/rawudp/fs-rawudp-stream-transmitter.c
@@ -67,7 +67,7 @@
#include "fs-rawudp-component.h"
#include <gst/farsight/fs-candidate.h>
-#include <gst/farsight/fs-conference-iface.h>
+#include <gst/farsight/fs-conference.h>
#ifdef HAVE_GUPNP
#include <libgupnp-igd/gupnp-simple-igd-thread.h>
diff --git a/transmitters/rawudp/fs-rawudp-transmitter.c b/transmitters/rawudp/fs-rawudp-transmitter.c
index 7f3fba8a..5e8a7174 100644
--- a/transmitters/rawudp/fs-rawudp-transmitter.c
+++ b/transmitters/rawudp/fs-rawudp-transmitter.c
@@ -37,7 +37,7 @@
#include "fs-rawudp-transmitter.h"
#include "fs-rawudp-stream-transmitter.h"
-#include <gst/farsight/fs-conference-iface.h>
+#include <gst/farsight/fs-conference.h>
#include <gst/farsight/fs-plugin.h>
#include <string.h>
diff --git a/transmitters/shm/fs-shm-stream-transmitter.c b/transmitters/shm/fs-shm-stream-transmitter.c
index 8a52cf96..f768c60d 100644
--- a/transmitters/shm/fs-shm-stream-transmitter.c
+++ b/transmitters/shm/fs-shm-stream-transmitter.c
@@ -67,7 +67,7 @@
#include "fs-shm-transmitter.h"
#include <gst/farsight/fs-candidate.h>
-#include <gst/farsight/fs-conference-iface.h>
+#include <gst/farsight/fs-conference.h>
#include <gst/gst.h>
diff --git a/transmitters/shm/fs-shm-transmitter.c b/transmitters/shm/fs-shm-transmitter.c
index 3298dc05..edaac2bf 100644
--- a/transmitters/shm/fs-shm-transmitter.c
+++ b/transmitters/shm/fs-shm-transmitter.c
@@ -37,7 +37,7 @@
#include "fs-shm-transmitter.h"
#include "fs-shm-stream-transmitter.h"
-#include <gst/farsight/fs-conference-iface.h>
+#include <gst/farsight/fs-conference.h>
#include <gst/farsight/fs-plugin.h>
#include <string.h>