[farsight2/master] Make add_gst_stream take the agent as an argument
Olivier Crête
olivier.crete at collabora.co.uk
Tue Dec 23 15:26:20 PST 2008
---
transmitters/nice/fs-nice-stream-transmitter.c | 1 +
transmitters/nice/fs-nice-transmitter.c | 5 +++--
transmitters/nice/fs-nice-transmitter.h | 1 +
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/transmitters/nice/fs-nice-stream-transmitter.c b/transmitters/nice/fs-nice-stream-transmitter.c
index c9ddf4d..f288fe3 100644
--- a/transmitters/nice/fs-nice-stream-transmitter.c
+++ b/transmitters/nice/fs-nice-stream-transmitter.c
@@ -823,6 +823,7 @@ fs_nice_stream_transmitter_build (FsNiceStreamTransmitter *self,
self->priv->gststream = fs_nice_transmitter_add_gst_stream (
self->priv->transmitter,
+ self->priv->transmitter->agent,
self->priv->stream_id,
error);
if (self->priv->gststream == NULL)
diff --git a/transmitters/nice/fs-nice-transmitter.c b/transmitters/nice/fs-nice-transmitter.c
index 9a7dae1..2e4f07a 100644
--- a/transmitters/nice/fs-nice-transmitter.c
+++ b/transmitters/nice/fs-nice-transmitter.c
@@ -942,6 +942,7 @@ struct _NiceGstStream {
NiceGstStream *
fs_nice_transmitter_add_gst_stream (FsNiceTransmitter *self,
+ NiceAgent *agent,
guint stream_id,
GError **error)
{
@@ -959,7 +960,7 @@ fs_nice_transmitter_add_gst_stream (FsNiceTransmitter *self,
ns->nicesrcs[c] = _create_sinksource ("nicesrc",
GST_BIN (self->priv->gst_src),
self->priv->src_funnels[c],
- self->agent,
+ agent,
stream_id,
c,
GST_PAD_SRC,
@@ -972,7 +973,7 @@ fs_nice_transmitter_add_gst_stream (FsNiceTransmitter *self,
ns->nicesinks[c] = _create_sinksource ("nicesink",
GST_BIN (self->priv->gst_sink),
self->priv->sink_tees[c],
- self->agent,
+ agent,
stream_id,
c,
GST_PAD_SINK,
diff --git a/transmitters/nice/fs-nice-transmitter.h b/transmitters/nice/fs-nice-transmitter.h
index 81f924a..0272305 100644
--- a/transmitters/nice/fs-nice-transmitter.h
+++ b/transmitters/nice/fs-nice-transmitter.h
@@ -92,6 +92,7 @@ struct _NiceGstStream;
typedef struct _NiceGstStream NiceGstStream;
NiceGstStream *fs_nice_transmitter_add_gst_stream (FsNiceTransmitter *self,
+ NiceAgent *agent,
guint stream_id,
GError **error);
--
1.5.6.5
More information about the farsight-commits
mailing list