diff options
| -rw-r--r-- | .gitignore | 32 | ||||
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | README | 14 | ||||
| -rw-r--r-- | configure.ac | 48 | ||||
| -rw-r--r-- | doc/lib/Makefile.am | 24 | ||||
| -rw-r--r-- | doc/lib/telepathy-farstream-docs.sgml (renamed from doc/lib/telepathy-farsight-docs.sgml) | 6 | ||||
| -rw-r--r-- | doc/lib/telepathy-farstream-sections.txt (renamed from doc/lib/telepathy-farsight-sections.txt) | 0 | ||||
| -rw-r--r-- | doc/lib/telepathy-farstream.types (renamed from doc/lib/telepathy-farsight.types) | 0 | ||||
| -rw-r--r-- | python/Makefile.am | 34 | ||||
| -rw-r--r-- | python/examples/callchannel.py | 4 | ||||
| -rw-r--r-- | python/pytpfarstream-filter.defs (renamed from python/pytpfarsight-filter.defs) | 0 | ||||
| -rw-r--r-- | python/pytpfarstream.defs (renamed from python/pytpfarsight.defs) | 0 | ||||
| -rw-r--r-- | python/pytpfarstream.override (renamed from python/pytpfarsight.override) | 6 | ||||
| -rw-r--r-- | python/pytpfarstreammodule.c (renamed from python/pytpfarsightmodule.c) | 8 | ||||
| -rwxr-xr-x | python/rebuild-defs.sh | 6 | ||||
| -rw-r--r-- | telepathy-farstream/Makefile.am (renamed from telepathy-farsight/Makefile.am) | 18 | ||||
| -rw-r--r-- | telepathy-farstream/call-channel.c (renamed from telepathy-farsight/call-channel.c) | 0 | ||||
| -rw-r--r-- | telepathy-farstream/call-channel.h (renamed from telepathy-farsight/call-channel.h) | 0 | ||||
| -rw-r--r-- | telepathy-farstream/call-content.c (renamed from telepathy-farsight/call-content.c) | 0 | ||||
| -rw-r--r-- | telepathy-farstream/call-content.h (renamed from telepathy-farsight/call-content.h) | 0 | ||||
| -rw-r--r-- | telepathy-farstream/call-stream.c (renamed from telepathy-farsight/call-stream.c) | 0 | ||||
| -rw-r--r-- | telepathy-farstream/call-stream.h (renamed from telepathy-farsight/call-stream.h) | 0 | ||||
| -rw-r--r-- | telepathy-farstream/channel-priv.h (renamed from telepathy-farsight/channel-priv.h) | 0 | ||||
| -rw-r--r-- | telepathy-farstream/channel.c (renamed from telepathy-farsight/channel.c) | 0 | ||||
| -rw-r--r-- | telepathy-farstream/channel.h (renamed from telepathy-farsight/channel.h) | 0 | ||||
| -rw-r--r-- | telepathy-farstream/content-priv.h (renamed from telepathy-farsight/content-priv.h) | 0 | ||||
| -rw-r--r-- | telepathy-farstream/content.c (renamed from telepathy-farsight/content.c) | 0 | ||||
| -rw-r--r-- | telepathy-farstream/content.h (renamed from telepathy-farsight/content.h) | 0 | ||||
| -rw-r--r-- | telepathy-farstream/media-signalling-channel.c (renamed from telepathy-farsight/media-signalling-channel.c) | 3 | ||||
| -rw-r--r-- | telepathy-farstream/media-signalling-channel.h (renamed from telepathy-farsight/media-signalling-channel.h) | 0 | ||||
| -rw-r--r-- | telepathy-farstream/session-priv.h (renamed from telepathy-farsight/session-priv.h) | 0 | ||||
| -rw-r--r-- | telepathy-farstream/session.c (renamed from telepathy-farsight/session.c) | 0 | ||||
| -rw-r--r-- | telepathy-farstream/stream-priv.h (renamed from telepathy-farsight/stream-priv.h) | 0 | ||||
| -rw-r--r-- | telepathy-farstream/stream.c (renamed from telepathy-farsight/stream.c) | 0 | ||||
| -rw-r--r-- | telepathy-farstream/stream.h (renamed from telepathy-farsight/stream.h) | 0 | ||||
| -rw-r--r-- | telepathy-farstream/telepathy-farstream-uninstalled.pc.in (renamed from telepathy-farsight/telepathy-farsight-uninstalled.pc.in) | 6 | ||||
| -rw-r--r-- | telepathy-farstream/telepathy-farstream.pc.in (renamed from telepathy-farsight/telepathy-farsight.pc.in) | 6 | ||||
| -rw-r--r-- | telepathy-farstream/utils.h (renamed from telepathy-farsight/utils.h) | 0 |
39 files changed, 116 insertions, 110 deletions
@@ -12,24 +12,24 @@ Makefile.in .#* *.stamp -telepathy-farsight/tf-signals-marshal.[ch] -telepathy-farsight/tf-signals-marshal.list -telepathy-farsight/telepathy-farsight.pc -telepathy-farsight/telepathy-farsight-uninstalled.pc +telepathy-farstream/tf-signals-marshal.[ch] +telepathy-farstream/tf-signals-marshal.list +telepathy-farstream/telepathy-farstream.pc +telepathy-farstream/telepathy-farstream-uninstalled.pc doc/lib/*.bak doc/lib/html/ -doc/lib/telepathy-farsight.args -doc/lib/telepathy-farsight-decl-list.txt -doc/lib/telepathy-farsight-decl.txt -doc/lib/telepathy-farsight.hierarchy -doc/lib/telepathy-farsight.interfaces -doc/lib/telepathy-farsight-overrides.txt -doc/lib/telepathy-farsight.prerequisites -doc/lib/telepathy-farsight.signals -doc/lib/telepathy-farsight-undeclared.txt -doc/lib/telepathy-farsight-undocumented.txt -doc/lib/telepathy-farsight-unused.txt +doc/lib/telepathy-farstream.args +doc/lib/telepathy-farstream-decl-list.txt +doc/lib/telepathy-farstream-decl.txt +doc/lib/telepathy-farstream.hierarchy +doc/lib/telepathy-farstream.interfaces +doc/lib/telepathy-farstream-overrides.txt +doc/lib/telepathy-farstream.prerequisites +doc/lib/telepathy-farstream.signals +doc/lib/telepathy-farstream-undeclared.txt +doc/lib/telepathy-farstream-undocumented.txt +doc/lib/telepathy-farstream-unused.txt doc/lib/tmpl/ doc/lib/xml/ @@ -55,4 +55,4 @@ stamp-h.in stamp-h1 gtk-doc.make m4/gtk-doc.m4 -python/pytpfarsight.c +python/pytpfarstream.c diff --git a/Makefile.am b/Makefile.am index 883b8aa..8f2ed5e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ if WANT_PYTHON PYTHON_SUBDIR = python endif -SUBDIRS = m4 tools extensions telepathy-farsight doc $(PYTHON_SUBDIR) +SUBDIRS = m4 tools extensions telepathy-farstream doc $(PYTHON_SUBDIR) DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc @@ -16,10 +16,10 @@ EXTRA_DIST = \ maintainer-upload-release: _maintainer-upload-release-local _maintainer-upload-release-local: _maintainer-upload-release-check rsync -rtvzPp --chmod=Dg+s,ug+rwX,o=rX doc/lib/html/ \ - telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/doc/telepathy-farsight/ + telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/doc/telepathy-farstream/ BRANCH = misc -UPLOAD_BRANCH_TO = people.freedesktop.org:public_html/telepathy-farsight +UPLOAD_BRANCH_TO = people.freedesktop.org:public_html/telepathy-farstream upload-branch-docs: all rsync -rtzvPp --chmod=a+rX doc/lib/html/ \ @@ -1,3 +1,8 @@ +telepathy-farstream 0.0.0 (UNRELEASED) +====================================== +- Rename from telepathy-farsight to telepathy-farstream +- Implement Call API + telepathy-farsight 0.0.16 (22 Dec 2010) ======================================= - Emit the NewActiveTransportPair signal @@ -1,9 +1,9 @@ ======================= -telepathy-farsight +telepathy-farstream ======================= -Telepathy Farsight is a Telepathy client library that uses Farsight2 -to handle media streaming channels. +Telepathy Farstream is a Telepathy client library that uses Farsight2 +to handle Call channels. Telepathy is a D-Bus framework for unifying real time communication, including instant messaging, voice calls and video calls. It abstracts @@ -13,7 +13,7 @@ applications. Requirements ============ -telepathy-farsight requires: +telepathy-farstream requires: telepathy-glib <http://telepathy.freedesktop.org/releases/telepathy-glib/> Farsight2 <http://farsight.freedesktop.org/releases/farsight/> GStreamer base plugins <http://gstreamer.freedesktop.org/> @@ -36,7 +36,7 @@ Bugs, feature requests and to-do list ===================================== Report all bugs, feature requests and "to-do" items here: - <https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=stream-engine> + <https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=tp-farstream> Versioning policy ================= @@ -64,7 +64,7 @@ Telepathy development is supported by Collabora Ltd. Hacking ======= -The current version of telepathy-farsight is always available from: - <http://git.collabora.co.uk/?p=telepathy-farsight.git;a=summary> +The current version of telepathy-farstream is always available from: + <http://git.collabora.co.uk/?p=telepathy-farstream.git;a=summary> Please follow <http://telepathy.freedesktop.org/wiki/Style>. diff --git a/configure.ac b/configure.ac index c8f7fda..b859483 100644 --- a/configure.ac +++ b/configure.ac @@ -5,31 +5,31 @@ AC_PREREQ([2.59]) # odd minor -> development series # even minor -> stable series # increment micro for each release within a series -# set tp_farsight_release to 1 +# set tp_farstream_release to 1 -m4_define([tp_farsight_major_version], [0]) -m4_define([tp_farsight_minor_version], [0]) -m4_define([tp_farsight_micro_version], [16]) -m4_define([tp_farsight_nano_version], [1]) +m4_define([tp_farstream_major_version], [0]) +m4_define([tp_farstream_minor_version], [0]) +m4_define([tp_farstream_micro_version], [0]) +m4_define([tp_farstream_nano_version], [1]) dnl CURRENT, REVISION, AGE 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 -m4_define([tp_farsight_lt_current], [1]) -m4_define([tp_farsight_lt_revision], [3]) -m4_define([tp_farsight_lt_age], [1]) +m4_define([tp_farstream_lt_current], [0]) +m4_define([tp_farstream_lt_revision], [0]) +m4_define([tp_farstream_lt_age], [0]) # Some magic -m4_define([tp_farsight_base_version], - [tp_farsight_major_version.tp_farsight_minor_version.tp_farsight_micro_version]) -m4_define([tp_farsight_version], - [m4_if(tp_farsight_nano_version, 0, [tp_farsight_base_version], - [tp_farsight_base_version].[tp_farsight_nano_version])]) +m4_define([tp_farstream_base_version], + [tp_farstream_major_version.tp_farstream_minor_version.tp_farstream_micro_version]) +m4_define([tp_farstream_version], + [m4_if(tp_farstream_nano_version, 0, [tp_farstream_base_version], + [tp_farstream_base_version].[tp_farstream_nano_version])]) -AC_INIT([Telepathy-Farsight], [tp_farsight_version], +AC_INIT([Telepathy-Farsight], [tp_farstream_version], [https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=stream-engine]) AC_CONFIG_MACRO_DIR([m4]) @@ -64,7 +64,7 @@ AS_COMPILER_FLAG(-Wno-unused-parameter, wno_unused_parameter=yes, wno_unused_parameter=no) -ifelse(tp_farsight_nano_version, 0, [], +ifelse(tp_farstream_nano_version, 0, [], [ if test x$werror = xyes; then ERROR_CFLAGS="$ERROR_CFLAGS -Werror" @@ -103,7 +103,7 @@ PKG_CHECK_MODULES([TELEPATHY], [telepathy-glib >= 0.13.4]) AC_SUBST(TELEPATHY_CFLAGS) AC_SUBST(TELEPATHY_LIBS) -dnl Check for farsight +dnl Check for farstream PKG_CHECK_MODULES(FARSIGHT2, [farsight2-0.10 >= 0.0.17]) AC_SUBST(FARSIGHT2_CFLAGS) @@ -123,16 +123,16 @@ AC_ARG_ENABLE([python], if test "x$WANT_PYTHON" = "xyes"; then AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) - PKG_CHECK_MODULES(PYTPFARSIGHT, [ pygobject-2.0 >= 2.12.0 + PKG_CHECK_MODULES(PYTPFARSTREAM, [ pygobject-2.0 >= 2.12.0 gst-python-0.10 >= 0.10.10 ]) fi AM_CONDITIONAL(WANT_PYTHON, test "x$WANT_PYTHON" = "xyes") GTK_DOC_CHECK([1.10]) -LT_CURRENT=tp_farsight_lt_current -LT_REVISION=tp_farsight_lt_revision -LT_AGE=tp_farsight_lt_age +LT_CURRENT=tp_farstream_lt_current +LT_REVISION=tp_farstream_lt_revision +LT_AGE=tp_farstream_lt_age AC_SUBST([LT_CURRENT]) AC_SUBST([LT_REVISION]) AC_SUBST([LT_AGE]) @@ -142,10 +142,10 @@ AC_OUTPUT( Makefile \ doc/Makefile \ doc/lib/Makefile \ m4/Makefile \ - extensions/Makefile \ - telepathy-farsight/Makefile \ - telepathy-farsight/telepathy-farsight.pc \ - telepathy-farsight/telepathy-farsight-uninstalled.pc + extensions/Makefile \ + telepathy-farstream/Makefile \ + telepathy-farstream/telepathy-farstream.pc \ + telepathy-farstream/telepathy-farstream-uninstalled.pc tools/Makefile \ python/Makefile \ python/codegen/Makefile \ diff --git a/doc/lib/Makefile.am b/doc/lib/Makefile.am index 8222454..9bb6225 100644 --- a/doc/lib/Makefile.am +++ b/doc/lib/Makefile.am @@ -6,7 +6,7 @@ abs_top_builddir = @abs_top_builddir@ AUTOMAKE_OPTIONS = 1.6 # The name of the module, e.g. 'glib'. -DOC_MODULE=telepathy-farsight +DOC_MODULE=telepathy-farstream # The top-level SGML file. You can change this if you want to. DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml @@ -15,7 +15,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml # gtk-doc will search all .c & .h files beneath here for inline comments # documenting the functions and macros. # e.g. DOC_SOURCE_DIR=../../../gtk -DOC_SOURCE_DIR=../../telepathy-farsight +DOC_SOURCE_DIR=../../telepathy-farstream # Extra options to pass to gtkdoc-scangobj. Not normally needed. SCANGOBJ_OPTIONS= @@ -39,8 +39,8 @@ FIXXREF_OPTIONS= # Used for dependencies. The docs will be rebuilt if any of these change. # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c -HFILE_GLOB=$(top_srcdir)/telepathy-farsight/channel.h $(top_srcdir)/telepathy-farsight/content.h -CFILE_GLOB=$(top_srcdir)/telepathy-farsight/channel.c $(top_srcdir)/telepathy-farsight/content.c +HFILE_GLOB=$(top_srcdir)/telepathy-farstream/channel.h $(top_srcdir)/telepathy-farstream/content.h +CFILE_GLOB=$(top_srcdir)/telepathy-farstream/channel.c $(top_srcdir)/telepathy-farstream/content.c # Header files to ignore when scanning. # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h @@ -81,7 +81,7 @@ GTKDOC_LIBS= \ $(GST_INTERFACES_LIBS) \ $(TELEPATHY_LIBS) \ $(FARSIGHT2_LIBS) \ - $(top_builddir)/telepathy-farsight/libtelepathy-farsight.la + $(top_builddir)/telepathy-farstream/libtelepathy-farstream.la # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make @@ -89,16 +89,16 @@ include $(top_srcdir)/gtk-doc.make if ENABLE_GTK_DOC check-local: @if grep '^0 symbols incomplete' \ - $(srcdir)/telepathy-farsight-undocumented.txt; then\ + $(srcdir)/telepathy-farstream-undocumented.txt; then\ :; else \ - cat $(srcdir)/telepathy-farsight-undocumented.txt; exit 1; fi + cat $(srcdir)/telepathy-farstream-undocumented.txt; exit 1; fi @if grep '^0 not documented' \ - $(srcdir)/telepathy-farsight-undocumented.txt; then\ + $(srcdir)/telepathy-farstream-undocumented.txt; then\ :; else \ - cat $(srcdir)/telepathy-farsight-undocumented.txt; exit 1; fi - @if grep . $(srcdir)/telepathy-farsight-unused.txt; then\ + cat $(srcdir)/telepathy-farstream-undocumented.txt; exit 1; fi + @if grep . $(srcdir)/telepathy-farstream-unused.txt; then\ echo "^^^ Unused symbols" >&2; exit 1; fi - @if test -e $(srcdir)/telepathy-farsight-undeclared.txt &&\ - grep . $(srcdir)/telepathy-farsight-undeclared.txt; then\ + @if test -e $(srcdir)/telepathy-farstream-undeclared.txt &&\ + grep . $(srcdir)/telepathy-farstream-undeclared.txt; then\ echo "^^^ Undeclared symbols" >&2; exit 1; fi endif diff --git a/doc/lib/telepathy-farsight-docs.sgml b/doc/lib/telepathy-farstream-docs.sgml index 2c3825f..11bd795 100644 --- a/doc/lib/telepathy-farsight-docs.sgml +++ b/doc/lib/telepathy-farstream-docs.sgml @@ -3,15 +3,15 @@ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude"> <bookinfo> - <title>telepathy-farsight Reference Manual</title> + <title>telepathy-farstream Reference Manual</title> <releaseinfo> The latest version of this documentation can be found on-line at - <ulink role="online-location" url="http://telepathy.freedesktop.org/doc/telepathy-farsight/">http://telepathy.freedesktop.org/telepathy-farsight/</ulink>. + <ulink role="online-location" url="http://telepathy.freedesktop.org/doc/telepathy-farstream/">http://telepathy.freedesktop.org/telepathy-farstream/</ulink>. </releaseinfo> </bookinfo> <chapter> - <title>Telepathy Farsight Helper Classes</title> + <title>Telepathy Farstream Helper Classes</title> <xi:include href="xml/channel.xml"/> <xi:include href="xml/content.xml"/> </chapter> diff --git a/doc/lib/telepathy-farsight-sections.txt b/doc/lib/telepathy-farstream-sections.txt index 19c38b8..19c38b8 100644 --- a/doc/lib/telepathy-farsight-sections.txt +++ b/doc/lib/telepathy-farstream-sections.txt diff --git a/doc/lib/telepathy-farsight.types b/doc/lib/telepathy-farstream.types index a2e28ba..a2e28ba 100644 --- a/doc/lib/telepathy-farsight.types +++ b/doc/lib/telepathy-farstream.types diff --git a/python/Makefile.am b/python/Makefile.am index 816f2e6..2f0d08d 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -11,39 +11,39 @@ AM_CPPFLAGS = \ -DDATADIR=\""$(datadir)"\" \ $(TELEPATHY_CFLAGS) \ $(PYTHON_INCLUDES) \ - $(PYTPFARSIGHT_CFLAGS) \ + $(PYTPFARSTREAM_CFLAGS) \ $(FARSIGHT2_CFLAGS) BUILT_SOURCES = \ - pytpfarsight.c + pytpfarstream.c -pytpfarsightdir = $(pyexecdir) -pytpfarsight_LTLIBRARIES = tpfarsight.la +pytpfarstreamdir = $(pyexecdir) +pytpfarstream_LTLIBRARIES = tpfarstream.la -tpfarsight_la_SOURCES = \ - pytpfarsightmodule.c pygstminiobject.c +tpfarstream_la_SOURCES = \ + pytpfarstreammodule.c pygstminiobject.c -nodist_tpfarsight_la_SOURCES = pytpfarsight.c +nodist_tpfarstream_la_SOURCES = pytpfarstream.c -tpfarsight_la_LIBADD = \ - $(PYTPFARSIGHT_LIBS) \ - $(top_builddir)/telepathy-farsight/libtelepathy-farsight.la +tpfarstream_la_LIBADD = \ + $(PYTPFARSTREAM_LIBS) \ + $(top_builddir)/telepathy-farstream/libtelepathy-farstream.la -tpfarsight_la_LDFLAGS = \ +tpfarstream_la_LDFLAGS = \ `python-config --libs` \ -module -avoid-version -pytpfarsight.c: pytpfarsight.override pytpfarsight.defs +pytpfarstream.c: pytpfarstream.override pytpfarstream.defs $(PYTHON) $(top_srcdir)/python/codegen/codegen.py \ --prefix tf \ --register $(GSTPYDEFS)/gst-types.defs \ - --override $(srcdir)/pytpfarsight.override \ - $(srcdir)/pytpfarsight.defs > $@ + --override $(srcdir)/pytpfarstream.override \ + $(srcdir)/pytpfarstream.defs > $@ EXTRA_DIST = \ - pytpfarsight.override \ - pytpfarsight.defs \ - pytpfarsight-filter.defs \ + pytpfarstream.override \ + pytpfarstream.defs \ + pytpfarstream-filter.defs \ rebuild-defs.sh CLEANFILES = $(BUILT_SOURCES) diff --git a/python/examples/callchannel.py b/python/examples/callchannel.py index 4cdb9b3..ce1da88 100644 --- a/python/examples/callchannel.py +++ b/python/examples/callchannel.py @@ -26,7 +26,7 @@ import pygst pygst.require("0.10") import gst -import tpfarsight +import tpfarstream import farsight from util import * @@ -59,7 +59,7 @@ class CallChannel: notifier.set_properties_from_file("element-properties") notifier.add(self.pipeline) - tpfarsight.tf_channel_new_async (connection.service_name, + tpfarstream.tf_channel_new_async (connection.service_name, connection.object_path, object_path, self.tpfs_created) def accept (self): diff --git a/python/pytpfarsight-filter.defs b/python/pytpfarstream-filter.defs index 45bb682..45bb682 100644 --- a/python/pytpfarsight-filter.defs +++ b/python/pytpfarstream-filter.defs diff --git a/python/pytpfarsight.defs b/python/pytpfarstream.defs index b992d3e..b992d3e 100644 --- a/python/pytpfarsight.defs +++ b/python/pytpfarstream.defs diff --git a/python/pytpfarsight.override b/python/pytpfarstream.override index 8ad7378..e7c2286 100644 --- a/python/pytpfarsight.override +++ b/python/pytpfarstream.override @@ -4,9 +4,9 @@ headers #include <gst/gst.h> -#include <telepathy-farsight/channel.h> -#include <telepathy-farsight/content.h> -#include <telepathy-farsight/stream.h> +#include <telepathy-farstream/channel.h> +#include <telepathy-farstream/content.h> +#include <telepathy-farstream/stream.h> #include <extensions/extensions.h> #include <telepathy-glib/dbus.h> diff --git a/python/pytpfarsightmodule.c b/python/pytpfarstreammodule.c index 00cef13..3077bbd 100644 --- a/python/pytpfarsightmodule.c +++ b/python/pytpfarstreammodule.c @@ -4,25 +4,25 @@ void tf_register_classes (PyObject *d); -DL_EXPORT(void) inittpfarsight(void); +DL_EXPORT(void) inittpfarstream(void); extern PyMethodDef tf_functions[]; GST_DEBUG_CATEGORY (pygst_debug); /* for python code */ DL_EXPORT(void) -inittpfarsight(void) +inittpfarstream(void) { PyObject *m, *d; init_pygobject (); - m = Py_InitModule ("tpfarsight", tf_functions); + m = Py_InitModule ("tpfarstream", tf_functions); d = PyModule_GetDict (m); tf_register_classes (d); if (PyErr_Occurred ()) { PyErr_Print(); - Py_FatalError ("can't initialise module tpfarsight"); + Py_FatalError ("can't initialise module tpfarstream"); } } diff --git a/python/rebuild-defs.sh b/python/rebuild-defs.sh index e5bd308..e450d15 100755 --- a/python/rebuild-defs.sh +++ b/python/rebuild-defs.sh @@ -5,10 +5,10 @@ HEADERS=" \ content.h \ stream.h" -srcdir=../telepathy-farsight/ +srcdir=../telepathy-farstream/ -output=pytpfarsight.defs -filter=pytpfarsight-filter.defs +output=pytpfarstream.defs +filter=pytpfarstream-filter.defs cat ${filter} > ${output} diff --git a/telepathy-farsight/Makefile.am b/telepathy-farstream/Makefile.am index 4d04ef1..92d1d6f 100644 --- a/telepathy-farsight/Makefile.am +++ b/telepathy-farstream/Makefile.am @@ -5,10 +5,10 @@ BUILT_SOURCES = \ CLEANFILES = $(BUILT_SOURCES) tf-signals-marshal.list -tfincludedir = $(includedir)/telepathy-1.0/telepathy-farsight +tfincludedir = $(includedir)/telepathy-1.0/telepathy-farstream tfinclude_HEADERS = channel.h content.h -libtelepathy_farsight_la_SOURCES = \ +libtelepathy_farstream_la_SOURCES = \ stream.c \ stream.h \ content.c \ @@ -30,12 +30,12 @@ libtelepathy_farsight_la_SOURCES = \ call-stream.c \ utils.h -nodist_libtelepathy_farsight_la_SOURCES = $(BUILT_SOURCES) +nodist_libtelepathy_farstream_la_SOURCES = $(BUILT_SOURCES) -lib_LTLIBRARIES = libtelepathy-farsight.la +lib_LTLIBRARIES = libtelepathy-farstream.la pkgconfigdir = ${libdir}/pkgconfig -pkgconfig_DATA = telepathy-farsight.pc +pkgconfig_DATA = telepathy-farstream.pc AM_CFLAGS = \ -DG_LOG_DOMAIN=\"tp-fs\" \ @@ -48,7 +48,7 @@ AM_CFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir) -libtelepathy_farsight_la_LIBADD = \ +libtelepathy_farstream_la_LIBADD = \ $(GLIB_LIBS) \ $(DBUS_LIBS) \ $(GST_LIBS) \ @@ -56,16 +56,16 @@ libtelepathy_farsight_la_LIBADD = \ $(TELEPATHY_LIBS) \ ../extensions/libfuture-extensions.la -libtelepathy_farsight_la_LDFLAGS = -no-undefined \ +libtelepathy_farstream_la_LDFLAGS = -no-undefined \ -export-symbols-regex "^tf_.*" \ -version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)" # rules to generate signal marshallers -tf-signals-marshal.list: $(libtelepathy_farsight_la_SOURCES) Makefile.am +tf-signals-marshal.list: $(libtelepathy_farstream_la_SOURCES) Makefile.am ( cd $(srcdir) && \ sed -n -e 's/.*_tf_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \ - $(libtelepathy_farsight_la_SOURCES) ) \ + $(libtelepathy_farstream_la_SOURCES) ) \ | sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp if cmp -s $@.tmp $@; then \ rm $@.tmp; \ diff --git a/telepathy-farsight/call-channel.c b/telepathy-farstream/call-channel.c index 8ab1eb5..8ab1eb5 100644 --- a/telepathy-farsight/call-channel.c +++ b/telepathy-farstream/call-channel.c diff --git a/telepathy-farsight/call-channel.h b/telepathy-farstream/call-channel.h index 6cde870..6cde870 100644 --- a/telepathy-farsight/call-channel.h +++ b/telepathy-farstream/call-channel.h diff --git a/telepathy-farsight/call-content.c b/telepathy-farstream/call-content.c index 4cd695f..4cd695f 100644 --- a/telepathy-farsight/call-content.c +++ b/telepathy-farstream/call-content.c diff --git a/telepathy-farsight/call-content.h b/telepathy-farstream/call-content.h index 70fa8cf..70fa8cf 100644 --- a/telepathy-farsight/call-content.h +++ b/telepathy-farstream/call-content.h diff --git a/telepathy-farsight/call-stream.c b/telepathy-farstream/call-stream.c index d8f5ec4..d8f5ec4 100644 --- a/telepathy-farsight/call-stream.c +++ b/telepathy-farstream/call-stream.c diff --git a/telepathy-farsight/call-stream.h b/telepathy-farstream/call-stream.h index dc65184..dc65184 100644 --- a/telepathy-farsight/call-stream.h +++ b/telepathy-farstream/call-stream.h diff --git a/telepathy-farsight/channel-priv.h b/telepathy-farstream/channel-priv.h index 8fdee93..8fdee93 100644 --- a/telepathy-farsight/channel-priv.h +++ b/telepathy-farstream/channel-priv.h diff --git a/telepathy-farsight/channel.c b/telepathy-farstream/channel.c index 857d22c..857d22c 100644 --- a/telepathy-farsight/channel.c +++ b/telepathy-farstream/channel.c diff --git a/telepathy-farsight/channel.h b/telepathy-farstream/channel.h index eff6b8d..eff6b8d 100644 --- a/telepathy-farsight/channel.h +++ b/telepathy-farstream/channel.h diff --git a/telepathy-farsight/content-priv.h b/telepathy-farstream/content-priv.h index ec3c831..ec3c831 100644 --- a/telepathy-farsight/content-priv.h +++ b/telepathy-farstream/content-priv.h diff --git a/telepathy-farsight/content.c b/telepathy-farstream/content.c index 7de876c..7de876c 100644 --- a/telepathy-farsight/content.c +++ b/telepathy-farstream/content.c diff --git a/telepathy-farsight/content.h b/telepathy-farstream/content.h index 6ec884b..6ec884b 100644 --- a/telepathy-farsight/content.h +++ b/telepathy-farstream/content.h diff --git a/telepathy-farsight/media-signalling-channel.c b/telepathy-farstream/media-signalling-channel.c index 206f4de..440de45 100644 --- a/telepathy-farsight/media-signalling-channel.c +++ b/telepathy-farstream/media-signalling-channel.c @@ -458,7 +458,8 @@ new_stream_cb (TfSession *session, gchar *str = g_strdup_printf ("failed to construct TpMediaStreamHandler:" " bad object path '%s'?", object_path); g_warning ("%s", str); - tf_media_signalling_channel_error (self, TP_MEDIA_STREAM_ERROR_UNKNOWN, str); + tf_media_signalling_channel_error (self, TP_MEDIA_STREAM_ERROR_UNKNOWN, + str); g_free (str); return; } diff --git a/telepathy-farsight/media-signalling-channel.h b/telepathy-farstream/media-signalling-channel.h index 2c04383..2c04383 100644 --- a/telepathy-farsight/media-signalling-channel.h +++ b/telepathy-farstream/media-signalling-channel.h diff --git a/telepathy-farsight/session-priv.h b/telepathy-farstream/session-priv.h index af69c4d..af69c4d 100644 --- a/telepathy-farsight/session-priv.h +++ b/telepathy-farstream/session-priv.h diff --git a/telepathy-farsight/session.c b/telepathy-farstream/session.c index c64a23c..c64a23c 100644 --- a/telepathy-farsight/session.c +++ b/telepathy-farstream/session.c diff --git a/telepathy-farsight/stream-priv.h b/telepathy-farstream/stream-priv.h index 3e82a18..3e82a18 100644 --- a/telepathy-farsight/stream-priv.h +++ b/telepathy-farstream/stream-priv.h diff --git a/telepathy-farsight/stream.c b/telepathy-farstream/stream.c index 0dce92d..0dce92d 100644 --- a/telepathy-farsight/stream.c +++ b/telepathy-farstream/stream.c diff --git a/telepathy-farsight/stream.h b/telepathy-farstream/stream.h index f50224f..f50224f 100644 --- a/telepathy-farsight/stream.h +++ b/telepathy-farstream/stream.h diff --git a/telepathy-farsight/telepathy-farsight-uninstalled.pc.in b/telepathy-farstream/telepathy-farstream-uninstalled.pc.in index c78a0bc..7e6f073 100644 --- a/telepathy-farsight/telepathy-farsight-uninstalled.pc.in +++ b/telepathy-farstream/telepathy-farstream-uninstalled.pc.in @@ -3,9 +3,9 @@ exec_prefix= abs_top_srcdir=@abs_top_srcdir@ abs_top_builddir=@abs_top_builddir@ -Name: Telepathy-Farsight -Description: Library implementing the Telepathy Media Signalling API using Farsight2 +Name: Telepathy-Farstream +Description: Library implementing the Telepathy Call API using Farsight2 Version: @VERSION@ Requires.private: dbus-glib-1 >= 0.73, glib-2.0 >= 2.10, gobject-2.0 >= 2.10, farsight2-0.10 > 0.0.3 -Libs: ${abs_top_builddir}/telepathy-farsight/libtelepathy-farsight.la +Libs: ${abs_top_builddir}/telepathy-farstream/libtelepathy-farstream.la Cflags: -I${abs_top_srcdir} -I${abs_top_builddir} diff --git a/telepathy-farsight/telepathy-farsight.pc.in b/telepathy-farstream/telepathy-farstream.pc.in index fcae29e..04b3580 100644 --- a/telepathy-farsight/telepathy-farsight.pc.in +++ b/telepathy-farstream/telepathy-farstream.pc.in @@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: Telepathy-Farsight -Description: Library implementing the Telepathy Media Signalling API using Farsight2 +Name: Telepathy-Farstream +Description: Library implementing the Telepathy Call API using Farsight2 Version: @VERSION@ Requires.private: dbus-glib-1 >= 0.73, glib-2.0 >= 2.10, gobject-2.0 >= 2.10, farsight2-0.10 > 0.0.3, telepathy-glib >= 0.7.23, gstreamer-0.10 -Libs: -L${libdir} -ltelepathy-farsight +Libs: -L${libdir} -ltelepathy-farstream Cflags: -I${includedir}/telepathy-1.0 diff --git a/telepathy-farsight/utils.h b/telepathy-farstream/utils.h index 94b8b8a..94b8b8a 100644 --- a/telepathy-farsight/utils.h +++ b/telepathy-farstream/utils.h |