diff --git a/common b/common index 88e512c..dd9d403 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 88e512ca7197a45c4114f7fa993108f23245bf50 +Subproject commit dd9d4031075713cf37c656ce639b6d60d6f9dde3 diff --git a/configure.ac b/configure.ac index 65cbb6f..1f750a4 100644 --- a/configure.ac +++ b/configure.ac @@ -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.1.2], +AC_INIT([GstInterpipe],[1.1.3], [http://www.github.com/RidgeRun/gst-interpipe-1.0], [gst-interpipe], [http://developer.ridgerun.com/wiki/index.php?title=GstInterpipe]) diff --git a/gst-interpipe.doap b/gst-interpipe.doap index 4c04fe1..8dd5865 100644 --- a/gst-interpipe.doap +++ b/gst-interpipe.doap @@ -30,6 +30,16 @@ GstInterpipe is a plug-in with two elements which allow the communication betwee + + + 1.1.3 + master + + 2020-09-15 + + + + 1.1.2 diff --git a/gst/interpipe/gstinterpipesink.c b/gst/interpipe/gstinterpipesink.c index cad622b..4e6eeb3 100644 --- a/gst/interpipe/gstinterpipesink.c +++ b/gst/interpipe/gstinterpipesink.c @@ -742,7 +742,7 @@ gst_inter_pipe_sink_add_listener (GstInterPipeINode * iface, gboolean has_listeners; if (!sinkcaps) - goto sinkcaps_null; + goto add_to_list; has_listeners = 0 != g_hash_table_size (listeners); @@ -786,6 +786,7 @@ gst_inter_pipe_sink_add_listener (GstInterPipeINode * iface, if (sinkcaps) gst_caps_unref (sinkcaps); +add_to_list: g_mutex_lock (&sink->listeners_mutex); if (g_hash_table_contains (listeners, listener_name)) goto already_registered; @@ -798,13 +799,6 @@ gst_inter_pipe_sink_add_listener (GstInterPipeINode * iface, return TRUE; /* Errors */ -sinkcaps_null: - { - GST_ERROR_OBJECT (sink, - "Can not add listener %s because our caps are not defined yet", - listener_name); - goto error; - } renegotiate_error: { GST_ERROR_OBJECT (sink, "Can not connect listener, caps do not intersect"); diff --git a/gst/interpipe/meson.build b/gst/interpipe/meson.build index b627c6e..8f644b9 100644 --- a/gst/interpipe/meson.build +++ b/gst/interpipe/meson.build @@ -17,10 +17,9 @@ gst_interpipes_headers = [ ] # Build plugin library -gst_interpipes_lib = library('gstinterpipes-@0@'.format(apiversion), +gst_interpipes_lib = library('gstinterpipe', gst_interpipes_sources, c_args : gst_c_args, - version : apiversion, include_directories : configinc, install : true, install_dir : plugin_install_dir, diff --git a/meson.build b/meson.build index 08dee92..78bbd81 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('gst-interpipes', 'c', - version : '1.1.2', + version : '1.1.3', meson_version : '>= 0.50',) gst_interpipes_version = meson.project_version()