]> git.pld-linux.org Git - packages/amsn.git/blame - farstream.patch
projects / packages / amsn.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- farsight to farstream patch from fedora
[packages/amsn.git] / farstream.patch
CommitLineData
cb70a201
ER		 1diff -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 $@ $<
6
7 ifeq ($(FOUND_OS),mac)
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
11 else
12-compile_farsight = $(CC) $(CFLAGS) $(GST_CFLAGS) $(FARSIGHT2_CFLAGS) -c -o $@ $<
13+compile_farsight = $(CC) $(CFLAGS) $(GST_CFLAGS) $(FARSTREAM_CFLAGS) -c -o $@ $<
14 SHARED := -shared
15 endif
16
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 $@
23diff -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
27 fi
28 AC_MSG_RESULT($USE_MMX)
29
30-HAVE_FARSIGHT=no
31+HAVE_FARSTREAM=no
32 GST_REQUIRED=0.10.22
33 GST_MAJORMINOR=0.10
34-FARSIGHT_REQUIRED=0.0.9
35+FARSTREAM_REQUIRED=0.1
36
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
40
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)
49 fi
50 fi
51
52@@ -519,10 +519,10 @@ AC_SUBST(GST_LIBS)
53 AC_SUBST(GST_INTERFACES_CFLAGS)
54 AC_SUBST(GST_INTERFACES_LIBS)
55
56-AC_SUBST(FARSIGHT2_CFLAGS)
57-AC_SUBST(FARSIGHT2_LIBS)
58+AC_SUBST(FARSTREAM_CFLAGS)
59+AC_SUBST(FARSTREAM_LIBS)
60
61-AC_SUBST(HAVE_FARSIGHT)
62+AC_SUBST(HAVE_FARSTREAM)
63
64 dnl ---------------------------------------------------------------------
65 dnl write out stuff
66@@ -540,14 +540,14 @@ compile time options summary
67 TK : $TK_VERSION
68 DEBUG : $DEBUG
69 STATIC : $STATIC
70- FARSIGHT : $HAVE_FARSIGHT
71+ FARSTREAM : $HAVE_FARSTREAM
72 LIBV4L : $HAVE_LIBV4L
73 GUPNP-IGD : $HAVE_GUPNP
74
75 EOF
76
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"
83 fi
84diff -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
88
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@
95
96
97 # for gcc3
98@@ -169,7 +169,7 @@ ifeq (@HAVE_GUPNP@,yes)
99 FILES_TO_INSTALL += utils/gupnp/gupnp.$(SHLIB_EXTENSION) utils/gupnp/pkgIndex.tcl
100 endif
101
102-ifeq (@HAVE_FARSIGHT@,yes)
103+ifeq (@HAVE_FARSTREAM@,yes)
104 FILES_TO_INSTALL += utils/farsight/tcl_farsight.$(SHLIB_EXTENSION) utils/farsight/pkgIndex.tcl
105 endif
106
107@@ -319,7 +319,7 @@ include $(tclISF_dir)/src/Rules.mk
108 include $(async_dir)/Rules.mk
109 include $(async_dir)/src/Rules.mk
110
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
115 endif
116diff -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
119@@ -14,12 +14,12 @@
120 #include <math.h>
121
122 #include <gst/gst.h>
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>
129
130-#include <gst/farsight/fs-element-added-notifier.h>
131+#include <farstream/fs-element-added-notifier.h>
132
133 #ifdef G_OS_WIN32
134 #include <winsock2.h>
135@@ -1630,22 +1630,22 @@ static int Farsight_BusEventProc (Tcl_Ev
136 case GST_MESSAGE_ELEMENT:
137 {
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;
142
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");
146
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));
152 }
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");
157 }
158- } else if (gst_structure_has_name (s, "farsight-new-local-candidate")) {
159+ } else if (gst_structure_has_name (s, "farstream-new-local-candidate")) {
160 FsStream *stream;
161 FsCandidate *candidate;
162 const GValue *value;
163@@ -1658,7 +1658,7 @@ static int Farsight_BusEventProc (Tcl_Ev
164
165 _new_local_candidate (stream, candidate);
166 } else if (gst_structure_has_name (s,
167- "farsight-local-candidates-prepared")) {
168+ "farstream-local-candidates-prepared")) {
169 FsStream *stream;
170 const GValue *value;
171
172@@ -1667,7 +1667,7 @@ static int Farsight_BusEventProc (Tcl_Ev
173
174
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")) {
178 gboolean ready;
179
180 if (!audio_codecs_ready) {
181@@ -1682,7 +1682,7 @@ static int Farsight_BusEventProc (Tcl_Ev
182 _codecs_ready (video_session);
183 }
184 }
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")) {
187 FsCandidate *local;
188 FsCandidate *remote;
189 FsStream *stream;
190@@ -1856,16 +1856,16 @@ _bus_callback (GstBus *bus, GstMessage *
191 case GST_MESSAGE_ELEMENT:
192 {
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")) {
196 goto drop;
197- } else if (gst_structure_has_name (s, "farsight-new-local-candidate")) {
198+ } else if (gst_structure_has_name (s, "farstream-new-local-candidate")) {
199 goto drop;
200 } else if (gst_structure_has_name (s,
201- "farsight-local-candidates-prepared")) {
202+ "farstream-local-candidates-prepared")) {
203 goto drop;
204- } else if (gst_structure_has_name (s, "farsight-codecs-changed")) {
205+ } else if (gst_structure_has_name (s, "farstream-codecs-changed")) {
206 goto drop;
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")) {
209 goto drop;
210 } else if (gst_structure_has_name (s, "level")) {
211 goto drop;
212@@ -2918,7 +2918,7 @@ int Farsight_Prepare _ANSI_ARGS_((Client
213 G_CALLBACK (_conference_element_added), NULL);
214
215 participant = fs_conference_new_participant (FS_CONFERENCE (conference),
216- "", &error);
217+ &error);
218 if (error) {
219 char temp[1000];
220 snprintf (temp, 1000, "Error while creating new participant (%d): %s",
221@@ -3157,7 +3157,14 @@ int Farsight_Prepare _ANSI_ARGS_((Client
222 }
223
224 audio_stream = fs_session_new_stream (audio_session, participant, FS_DIRECTION_BOTH,
225- "nice", total_params, transmitter_params, &error);
226+ &error);
227+
228+ if(!fs_stream_set_transmitter(audio_stream, "nice",
229+ transmitter_params, total_params, &error)) {
230+ char temp[1000];
231+ snprintf (temp, 1000, "Could not set transmitter \"nice\" (%d): %s.", error->code, error->message);
232+ goto error;
233+ }
234
235 if (error) {
236 char temp[1000];
237@@ -3310,7 +3317,14 @@ int Farsight_Prepare _ANSI_ARGS_((Client
238 }
239
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);
243+
244+ if(!fs_stream_set_transmitter(video_stream, "nice",
245+ transmitter_params, total_params, &error)) {
246+ char temp[1000];
247+ snprintf (temp, 1000, "Could not set transmitter \"nice\" (%d): %s.", error->code, error->message);
248+ goto error;
249+ }
250
251 if (error) {
252 char temp[1000];
253@@ -3391,7 +3405,7 @@ int Farsight_Start _ANSI_ARGS_((ClientDa
254
255
256 if (pipeline == NULL) {
257- Tcl_AppendResult (interp, "Farsight needs to be prepared first",
258+ Tcl_AppendResult (interp, "Farstream needs to be prepared first",
259 (char *) NULL);
260 return TCL_ERROR;
261 }
262@@ -3568,7 +3582,7 @@ static int _SetMute (GstElement *element
263 if (element) {
264 g_object_set (element, "mute", mute, NULL);
265 } else {
266- Tcl_AppendResult (interp, "Farsight isn't running", (char *) NULL);
267+ Tcl_AppendResult (interp, "Farstream isn't running", (char *) NULL);
268 return TCL_ERROR;
269 }
270
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));
274 } else {
275- Tcl_AppendResult (interp, "Farsight isn't running", (char *) NULL);
276+ Tcl_AppendResult (interp, "Farstream isn't running", (char *) NULL);
277 return TCL_ERROR;
278 }
279
280@@ -3641,7 +3655,7 @@ static int _SetVolume (GstElement *eleme
281 if (element) {
282 g_object_set (element, "volume", volume, NULL);
283 } else {
284- Tcl_AppendResult (interp, "Farsight isn't running", (char *) NULL);
285+ Tcl_AppendResult (interp, "Farstream isn't running", (char *) NULL);
286 return TCL_ERROR;
287 }
288
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));
292 } else {
293- Tcl_AppendResult (interp, "Farsight isn't running", (char *) NULL);
294+ Tcl_AppendResult (interp, "Farstream isn't running", (char *) NULL);
295 return TCL_ERROR;
296 }
297
MSN Messenger clone for Linux
This page took 0.084155 seconds and 4 git commands to generate.