[farsight2/master] Setup the source with the rest of the pipeline, not later

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


---
 tests/check/main/rtpconference.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/tests/check/main/rtpconference.c b/tests/check/main/rtpconference.c
index 0590483..0ff5f10 100644
--- a/tests/check/main/rtpconference.c
+++ b/tests/check/main/rtpconference.c
@@ -361,16 +361,11 @@ static void
 _new_active_candidate_pair (FsStream *stream, FsCandidate *local,
     FsCandidate *remote, gpointer user_data)
 {
-  struct SimpleTestStream *st = user_data;
-
   ts_fail_if (local == NULL, "Local candidate NULL");
   ts_fail_if (remote == NULL, "Remote candidate NULL");
 
   if (local->component_id != 1)
     return;
-
-  if (!st->dat->fakesrc)
-    setup_fakesrc (st->dat);
 }
 
 static struct SimpleTestStream *
@@ -615,6 +610,8 @@ nway_test (int in_count, extra_init extrainit)
     rtpconference_connect_signals (dats[i]);
     g_idle_add (_start_pipeline, dats[i]);
 
+    setup_fakesrc (dats[i]);
+
     if (i != 0)
       g_signal_connect (dats[i]->session, "new-negotiated-codecs",
           G_CALLBACK (_new_negotiated_codecs), dats[i]);
-- 
1.5.6.5




More information about the farsight-commits mailing list