[farsight2/master] Make handoff handler configurable in the stream

Olivier Crête olivier.crete at collabora.co.uk
Tue Dec 23 15:21:19 PST 2008


---
 tests/check/main/generic.h       |    2 ++
 tests/check/main/rtpconference.c |    3 ++-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/tests/check/main/generic.h b/tests/check/main/generic.h
index 2629a27..7159903 100644
--- a/tests/check/main/generic.h
+++ b/tests/check/main/generic.h
@@ -49,6 +49,8 @@ struct SimpleTestStream {
 
   gint buffer_count;
 
+  GCallback handoff_handler;
+
   gint flags;
 };
 
diff --git a/tests/check/main/rtpconference.c b/tests/check/main/rtpconference.c
index e2fa299..43a21b7 100644
--- a/tests/check/main/rtpconference.c
+++ b/tests/check/main/rtpconference.c
@@ -337,7 +337,7 @@ _src_pad_added (FsStream *self, GstPad *pad, FsCodec *codec, gpointer user_data)
   g_object_weak_ref (G_OBJECT (fakesink),
       (GWeakNotify) fs_codec_destroy, codeccopy);
 
-  g_signal_connect (fakesink, "handoff", G_CALLBACK (_handoff_handler), st);
+  g_signal_connect (fakesink, "handoff", st->handoff_handler, st);
 
   gst_bin_add (GST_BIN (st->dat->pipeline), fakesink);
 
@@ -626,6 +626,7 @@ nway_test (int in_count)
         struct SimpleTestStream *st = NULL;
 
         st = simple_conference_add_stream (dats[i], dats[j]);
+        st->handoff_handler = G_CALLBACK (_handoff_handler);
         rtpconference_connect_streams_signals (st);
       }
 
-- 
1.5.6.5




More information about the farsight-commits mailing list