summaryrefslogtreecommitdiff
path: root/transmitters
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.co.uk>2011-02-10 16:40:05 +0000
committerOlivier CrĂȘte <olivier.crete@collabora.com>2011-10-11 15:46:06 -0400
commit0d96bce3ebbb625bf570394729556b8d2324ab75 (patch)
tree677de05d0f40537978a7b7eda0dbe3115e91c506 /transmitters
parentee625ac37479928550ce9f4d47a003388ed47b0f (diff)
downloadfarstream-0d96bce3ebbb625bf570394729556b8d2324ab75.tar.gz
interfaces: Remove fs-interfaces
Use nice-interfaces instead
Diffstat (limited to 'transmitters')
-rw-r--r--transmitters/nice/fs-nice-agent.c5
-rw-r--r--transmitters/nice/fs-nice-stream-transmitter.c7
2 files changed, 5 insertions, 7 deletions
diff --git a/transmitters/nice/fs-nice-agent.c b/transmitters/nice/fs-nice-agent.c
index 8b2e877d..31269bfd 100644
--- a/transmitters/nice/fs-nice-agent.c
+++ b/transmitters/nice/fs-nice-agent.c
@@ -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.c - A Farsight libnice transmitter agent object
+ * fs-nice-agent.c - 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
@@ -33,7 +33,6 @@
#endif
#include <gst/farsight/fs-conference-iface.h>
-#include <gst/farsight/fs-interfaces.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 02f3db14..f87776b7 100644
--- a/transmitters/nice/fs-nice-stream-transmitter.c
+++ b/transmitters/nice/fs-nice-stream-transmitter.c
@@ -1,11 +1,11 @@
/*
- * Farsight2 - Farsight libnice Stream Transmitter
+ * Farstream - Farstream libnice Stream Transmitter
*
* Copyright 2007 Collabora Ltd.
* @author: Olivier Crete <olivier.crete@collabora.co.uk>
* Copyright 2007 Nokia Corp.
*
- * fs-nice-stream-transmitter.c - A Farsight libnice stream transmitter
+ * fs-nice-stream-transmitter.c - A Farstream libnice stream transmitter
*
* 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,6 @@
#include "fs-nice-agent.h"
#include <gst/farsight/fs-conference-iface.h>
-#include <gst/farsight/fs-interfaces.h>
#include <gst/gst.h>
@@ -1661,7 +1660,7 @@ agent_new_candidate (NiceAgent *agent,
{
/* Nice doesn't do connchecks while gathering, so don't tell the upper
* layers about the candidates untill gathering is finished.
- * Also older versions of farsight would fail the connection right away
+ * Also older versions of farstream would fail the connection right away
* when the first candidate given failed immediately (e.g. ipv6 on a
* non-ipv6 capable host, so we order ipv6 candidates after ipv4 ones */