1 diff -up amsn-0.98.4/Compile.mk.farstream amsn-0.98.4/Compile.mk
2 --- amsn-0.98.4/Compile.mk.farstream 2009-10-15 04:39:25.000000000 -0400
3 +++ amsn-0.98.4/Compile.mk 2012-03-09 18:04:13.304674222 -0500
4 @@ -22,15 +22,15 @@ compile_m = $(CC) $(CFLAGS) -ObjC -fobj
5 compile_cc = $(CXX) $(CXXFLAGS) -c -o $@ $<
8 -compile_farsight = $(CC) $(CFLAGS) -ObjC -fobjc-gc $(GST_CFLAGS) $(FARSIGHT2_CFLAGS) -c -o $@ $<
9 +compile_farsight = $(CC) $(CFLAGS) -ObjC -fobjc-gc $(GST_CFLAGS) $(FARSTREAM_CFLAGS) -c -o $@ $<
10 SHARED := -dynamiclib -fno-common -Wl,-single_module -shared-libgcc
12 -compile_farsight = $(CC) $(CFLAGS) $(GST_CFLAGS) $(FARSIGHT2_CFLAGS) -c -o $@ $<
13 +compile_farsight = $(CC) $(CFLAGS) $(GST_CFLAGS) $(FARSTREAM_CFLAGS) -c -o $@ $<
17 link_app = $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
18 -link_farsight = $(CC) $(LDFLAGS) $^ $(LDLIBS) $(GST_LIBS) $(FARSIGHT2_LIBS) $(SHARED) -o $@
19 +link_farsight = $(CC) $(LDFLAGS) $^ $(LDLIBS) $(GST_LIBS) $(FARSTREAM_LIBS) $(SHARED) -o $@
20 link_so = $(CC) $(LDFLAGS) $^ $(LDLIBS) $(SHARED) -o $@
21 link_so_addlibs = $(link_so) $(ADDLIBS)
22 link_so_cpp = $(CXX) $(LDFLAGS) $^ $(LDLIBS) $(CXX_LIB) $(SHARED) -o $@
23 diff -up amsn-0.98.4/configure.ac.farstream amsn-0.98.4/configure.ac
24 --- amsn-0.98.4/configure.ac.farstream 2012-03-09 18:04:13.296674304 -0500
25 +++ amsn-0.98.4/configure.ac 2012-03-09 18:04:13.305674212 -0500
26 @@ -440,10 +440,10 @@ else
28 AC_MSG_RESULT($USE_MMX)
34 -FARSIGHT_REQUIRED=0.0.9
35 +FARSTREAM_REQUIRED=0.1
37 dnl Check for pkgconfig first
38 AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
39 @@ -467,9 +467,9 @@ if test "x$HAVE_PKGCONFIG" = "xyes"; the
41 dnl Give error and exit if we don't have gstreamer
42 if test "x$HAVE_GST" = "xyes"; then
43 - PKG_CHECK_MODULES(FARSIGHT2, \
44 - farsight2-$GST_MAJORMINOR >= $FARSIGHT_REQUIRED,
45 - HAVE_FARSIGHT=yes,HAVE_FARSIGHT=no)
46 + PKG_CHECK_MODULES(FARSTREAM, \
47 + farstream-$FARSTREAM_REQUIRED,
48 + HAVE_FARSTREAM=yes,HAVE_FARSTREAM=no)
52 @@ -519,10 +519,10 @@ AC_SUBST(GST_LIBS)
53 AC_SUBST(GST_INTERFACES_CFLAGS)
54 AC_SUBST(GST_INTERFACES_LIBS)
56 -AC_SUBST(FARSIGHT2_CFLAGS)
57 -AC_SUBST(FARSIGHT2_LIBS)
58 +AC_SUBST(FARSTREAM_CFLAGS)
59 +AC_SUBST(FARSTREAM_LIBS)
61 -AC_SUBST(HAVE_FARSIGHT)
62 +AC_SUBST(HAVE_FARSTREAM)
64 dnl ---------------------------------------------------------------------
66 @@ -540,14 +540,14 @@ compile time options summary
70 - FARSIGHT : $HAVE_FARSIGHT
71 + FARSTREAM : $HAVE_FARSTREAM
73 GUPNP-IGD : $HAVE_GUPNP
77 -if test x"$HAVE_FARSIGHT" = "xno"; then
78 - echo "*** You do not seem to have gstreamer and farsight2 installed."
79 +if test x"$HAVE_FARSTREAM" = "xno"; then
80 + echo "*** You do not seem to have gstreamer and farstream installed."
81 echo "*** You will not be able to build the required component for audio conversations."
82 echo "*** Read this for more information : http://amsn-project.net/wiki/Farsight"
84 diff -up amsn-0.98.4/Makefile.in.farstream amsn-0.98.4/Makefile.in
85 --- amsn-0.98.4/Makefile.in.farstream 2010-03-18 15:58:48.000000000 -0400
86 +++ amsn-0.98.4/Makefile.in 2012-03-09 18:04:15.967646846 -0500
87 @@ -127,8 +127,8 @@ endif
89 GST_LIBS := @GST_LIBS@ @GST_INTERFACES_LIBS@
90 GST_CFLAGS := @GST_CFLAGS@ @GST_INTERFACES_CFLAGS@
91 -FARSIGHT2_LIBS := @FARSIGHT2_LIBS@
92 -FARSIGHT2_CFLAGS := @FARSIGHT2_CFLAGS@
93 +FARSTREAM_LIBS := @FARSTREAM_LIBS@
94 +FARSTREAM_CFLAGS := @FARSTREAM_CFLAGS@
98 @@ -169,7 +169,7 @@ ifeq (@HAVE_GUPNP@,yes)
99 FILES_TO_INSTALL += utils/gupnp/gupnp.$(SHLIB_EXTENSION) utils/gupnp/pkgIndex.tcl
102 -ifeq (@HAVE_FARSIGHT@,yes)
103 +ifeq (@HAVE_FARSTREAM@,yes)
104 FILES_TO_INSTALL += utils/farsight/tcl_farsight.$(SHLIB_EXTENSION) utils/farsight/pkgIndex.tcl
107 @@ -319,7 +319,7 @@ include $(tclISF_dir)/src/Rules.mk
108 include $(async_dir)/Rules.mk
109 include $(async_dir)/src/Rules.mk
111 -ifeq (@HAVE_FARSIGHT@,yes)
112 +ifeq (@HAVE_FARSTREAM@,yes)
113 include $(tcl_farsight_dir)/Rules.mk
114 include $(tcl_farsight_dir)/src/Rules.mk
116 diff -up amsn-0.98.4/utils/farsight/src/tcl_farsight.c.farstream amsn-0.98.4/utils/farsight/src/tcl_farsight.c
117 --- amsn-0.98.4/utils/farsight/src/tcl_farsight.c.farstream 2009-12-14 15:21:11.000000000 -0500
118 +++ amsn-0.98.4/utils/farsight/src/tcl_farsight.c 2012-03-09 18:06:12.954448444 -0500
123 -#include <gst/farsight/fs-conference-iface.h>
124 -#include <gst/farsight/fs-stream-transmitter.h>
125 +#include <farstream/fs-conference.h>
126 +#include <farstream/fs-stream-transmitter.h>
127 #include <gst/interfaces/propertyprobe.h>
128 #include <gst/interfaces/xoverlay.h>
130 -#include <gst/farsight/fs-element-added-notifier.h>
131 +#include <farstream/fs-element-added-notifier.h>
134 #include <winsock2.h>
135 @@ -1630,22 +1630,22 @@ static int Farsight_BusEventProc (Tcl_Ev
136 case GST_MESSAGE_ELEMENT:
138 const GstStructure *s = gst_message_get_structure (message);
139 - if (gst_structure_has_name (s, "farsight-error")) {
140 + if (gst_structure_has_name (s, "farstream-error")) {
141 const GValue *errorvalue, *debugvalue, *error_no;
143 error_no = gst_structure_get_value (message->structure, "error-no");
144 errorvalue = gst_structure_get_value (message->structure, "error-msg");
145 debugvalue = gst_structure_get_value (message->structure, "debug-msg");
147 - if (g_value_get_enum (error_no) != FS_ERROR_UNKNOWN_CNAME) {
148 + if (g_value_get_enum (error_no)) {
149 _notify_debug ("Error on BUS (%d) %s .. %s", g_value_get_enum (error_no),
150 g_value_get_string (errorvalue),
151 g_value_get_string (debugvalue));
153 - if (g_value_get_enum (error_no) != FS_ERROR_UNKNOWN_CNAME) {
154 - _notify_error ("Farsight error");
155 + if (g_value_get_enum (error_no)) {
156 + _notify_error ("Farstream error");
158 - } else if (gst_structure_has_name (s, "farsight-new-local-candidate")) {
159 + } else if (gst_structure_has_name (s, "farstream-new-local-candidate")) {
161 FsCandidate *candidate;
163 @@ -1658,7 +1658,7 @@ static int Farsight_BusEventProc (Tcl_Ev
165 _new_local_candidate (stream, candidate);
166 } else if (gst_structure_has_name (s,
167 - "farsight-local-candidates-prepared")) {
168 + "farstream-local-candidates-prepared")) {
172 @@ -1667,7 +1667,7 @@ static int Farsight_BusEventProc (Tcl_Ev
175 _local_candidates_prepared (stream);
176 - } else if (gst_structure_has_name (s, "farsight-codecs-changed")) {
177 + } else if (gst_structure_has_name (s, "farstream-codecs-changed")) {
180 if (!audio_codecs_ready) {
181 @@ -1682,7 +1682,7 @@ static int Farsight_BusEventProc (Tcl_Ev
182 _codecs_ready (video_session);
185 - } else if (gst_structure_has_name (s, "farsight-new-active-candidate-pair")) {
186 + } else if (gst_structure_has_name (s, "farstream-new-active-candidate-pair")) {
190 @@ -1856,16 +1856,16 @@ _bus_callback (GstBus *bus, GstMessage *
191 case GST_MESSAGE_ELEMENT:
193 const GstStructure *s = gst_message_get_structure (message);
194 - if (gst_structure_has_name (s, "farsight-error")) {
195 + if (gst_structure_has_name (s, "farstream-error")) {
197 - } else if (gst_structure_has_name (s, "farsight-new-local-candidate")) {
198 + } else if (gst_structure_has_name (s, "farstream-new-local-candidate")) {
200 } else if (gst_structure_has_name (s,
201 - "farsight-local-candidates-prepared")) {
202 + "farstream-local-candidates-prepared")) {
204 - } else if (gst_structure_has_name (s, "farsight-codecs-changed")) {
205 + } else if (gst_structure_has_name (s, "farstream-codecs-changed")) {
207 - } else if (gst_structure_has_name (s, "farsight-new-active-candidate-pair")) {
208 + } else if (gst_structure_has_name (s, "farstream-new-active-candidate-pair")) {
210 } else if (gst_structure_has_name (s, "level")) {
212 @@ -2918,7 +2918,7 @@ int Farsight_Prepare _ANSI_ARGS_((Client
213 G_CALLBACK (_conference_element_added), NULL);
215 participant = fs_conference_new_participant (FS_CONFERENCE (conference),
220 snprintf (temp, 1000, "Error while creating new participant (%d): %s",
221 @@ -3157,7 +3157,14 @@ int Farsight_Prepare _ANSI_ARGS_((Client
224 audio_stream = fs_session_new_stream (audio_session, participant, FS_DIRECTION_BOTH,
225 - "nice", total_params, transmitter_params, &error);
228 + if(!fs_stream_set_transmitter(audio_stream, "nice",
229 + transmitter_params, total_params, &error)) {
231 + snprintf (temp, 1000, "Could not set transmitter \"nice\" (%d): %s.", error->code, error->message);
237 @@ -3310,7 +3317,14 @@ int Farsight_Prepare _ANSI_ARGS_((Client
240 video_stream = fs_session_new_stream (video_session, participant,
241 - FS_DIRECTION_BOTH, "nice", total_params, transmitter_params, &error);
242 + FS_DIRECTION_BOTH, &error);
244 + if(!fs_stream_set_transmitter(video_stream, "nice",
245 + transmitter_params, total_params, &error)) {
247 + snprintf (temp, 1000, "Could not set transmitter \"nice\" (%d): %s.", error->code, error->message);
253 @@ -3391,7 +3405,7 @@ int Farsight_Start _ANSI_ARGS_((ClientDa
256 if (pipeline == NULL) {
257 - Tcl_AppendResult (interp, "Farsight needs to be prepared first",
258 + Tcl_AppendResult (interp, "Farstream needs to be prepared first",
262 @@ -3568,7 +3582,7 @@ static int _SetMute (GstElement *element
264 g_object_set (element, "mute", mute, NULL);
266 - Tcl_AppendResult (interp, "Farsight isn't running", (char *) NULL);
267 + Tcl_AppendResult (interp, "Farstream isn't running", (char *) NULL);
271 @@ -3602,7 +3616,7 @@ static int _GetMute (GstElement *element
272 g_object_get (element, "mute", &mute, NULL);
273 Tcl_SetObjResult(interp, Tcl_NewBooleanObj(mute));
275 - Tcl_AppendResult (interp, "Farsight isn't running", (char *) NULL);
276 + Tcl_AppendResult (interp, "Farstream isn't running", (char *) NULL);
280 @@ -3641,7 +3655,7 @@ static int _SetVolume (GstElement *eleme
282 g_object_set (element, "volume", volume, NULL);
284 - Tcl_AppendResult (interp, "Farsight isn't running", (char *) NULL);
285 + Tcl_AppendResult (interp, "Farstream isn't running", (char *) NULL);
289 @@ -3676,7 +3690,7 @@ static int _GetVolume (GstElement *eleme
290 g_object_get (element, "volume", &volume, NULL);
291 Tcl_SetObjResult(interp, Tcl_NewDoubleObj(volume));
293 - Tcl_AppendResult (interp, "Farsight isn't running", (char *) NULL);
294 + Tcl_AppendResult (interp, "Farstream isn't running", (char *) NULL);