[Telepathy-commits] [telepathy-stream-engine/master] Use gstelements.conf to set up the default jitterbuffer latency

[Olivier Crête]

---
 Makefile.am            |    2 +-
 gstelements.conf       |    2 ++
 src/tp-stream-engine.c |    3 ---
 3 files changed, 3 insertions(+), 4 deletions(-)
 create mode 100644 gstelements.conf

diff --git a/Makefile.am b/Makefile.am
index b5cce96..37a260f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = tools api src test doc data
 
 confdir = $(sysconfdir)/stream-engine
-conf_DATA = gstcodecs.conf
+conf_DATA = gstcodecs.conf gstelements.conf
 
 EXTRA_DIST = $(conf_DATA)
 
diff --git a/gstelements.conf b/gstelements.conf
new file mode 100644
index 0000000..27290cb
--- /dev/null
+++ b/gstelements.conf
@@ -0,0 +1,2 @@
+[gstrtpbin]
+latency=100
diff --git a/src/tp-stream-engine.c b/src/tp-stream-engine.c
index cff4f18..255db20 100644
--- a/src/tp-stream-engine.c
+++ b/src/tp-stream-engine.c
@@ -492,9 +492,6 @@ channel_session_created (TfChannel *chan G_GNUC_UNUSED,
 
   g_return_if_fail (conference);
 
-  if (g_object_has_property (G_OBJECT (conference), "latency"))
-    g_object_set (conference, "latency", 100, NULL);
-
   if (!gst_bin_add (GST_BIN (self->priv->pipeline), GST_ELEMENT (conference)))
     g_error ("Could not add conference to pipeline");
 
-- 
1.5.6.5