Skip to content

Commit

Permalink
Merge branch 'release/v1.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
migueltaylor committed Feb 5, 2020
2 parents 71f0ffc + 8f72d2b commit da5da69
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 2 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dnl please read gstreamer/docs/random/autotools before changing this file
dnl initialize autoconf
dnl releases only do -Wall, git and prerelease does -Werror too
dnl use a three digit version number for releases, and four for git/pre
AC_INIT([GstInterpipe],[1.0.7],
AC_INIT([GstInterpipe],[1.1.0],
[http://www.github.com/RidgeRun/gst-interpipe-1.0],
[gst-interpipe],
[http://developer.ridgerun.com/wiki/index.php?title=GstInterpipe])
Expand Down
10 changes: 10 additions & 0 deletions gst-interpipe.doap
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,16 @@ GstInterpipe is a plug-in with two elements which allow the communication betwee
</GitRepository>
</repository>

<release>
<Version>
<revision>1.1.0</revision>
<branch>master</branch>
<name></name>
<created>2020-02-05</created>
<file-release rdf:resource="" />
</Version>
</release>

<release>
<Version>
<revision>1.0.7</revision>
Expand Down
19 changes: 18 additions & 1 deletion gst/interpipe/gstinterpipesink.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ enum
{
PROP_0,
PROP_FORWARD_EOS,
PROP_FORWARD_EVENTS
PROP_FORWARD_EVENTS,
PROP_NUM_LISTENERS
};

static void gst_inter_pipe_sink_update_node_name (GstInterPipeSink * sink,
Expand Down Expand Up @@ -165,6 +166,11 @@ gst_inter_pipe_sink_class_init (GstInterPipeSinkClass * klass)
"Forward downstream events to all the listeners (except for EOS)",
FALSE, G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS));

g_object_class_install_property (gobject_class, PROP_NUM_LISTENERS,
g_param_spec_uint ("num-listeners", "Number of listeners",
"Number of interpipe sources listening to this specific sink",
0, G_MAXUINT, 0, G_PARAM_READABLE));

basesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_inter_pipe_sink_get_caps);
basesink_class->set_caps = GST_DEBUG_FUNCPTR (gst_inter_pipe_sink_set_caps);
basesink_class->event = GST_DEBUG_FUNCPTR (gst_inter_pipe_sink_event);
Expand Down Expand Up @@ -250,9 +256,20 @@ static void
gst_inter_pipe_sink_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec)
{
GstInterPipeSink *sink;
GHashTable *listeners;

g_return_if_fail (GST_IS_INTER_PIPE_SINK (object));

sink = GST_INTER_PIPE_SINK (object);
listeners = GST_INTER_PIPE_SINK_LISTENERS (sink);

switch (prop_id) {
case PROP_NUM_LISTENERS:
g_mutex_lock (&sink->listeners_mutex);
g_value_set_uint (value, g_hash_table_size (listeners));
g_mutex_unlock (&sink->listeners_mutex);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
Expand Down

0 comments on commit da5da69

Please sign in to comment.