playback: Don't special-case G_SIGNAL_RUN_CLEANUP stage in signal acc…

…umulators All these signals don't run the class handler in the CLEANUP stage. Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1076>
sailfishos-mirror · Mar 26, 2021 · 6bcd6e1 · 6bcd6e1
1 parent 0644da8
commit 6bcd6e1
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 17 deletions.
diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c
@@ -615,7 +615,6 @@ _gst_boolean_accumulator (GSignalInvocationHint * ihint,
   gboolean myboolean;
 
   myboolean = g_value_get_boolean (handler_return);
-  if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
   g_value_set_boolean (return_accu, myboolean);
 
   /* stop emission if FALSE */
@@ -632,7 +631,6 @@ _gst_boolean_or_accumulator (GSignalInvocationHint * ihint,
   myboolean = g_value_get_boolean (handler_return);
   retboolean = g_value_get_boolean (return_accu);
 
-  if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
   g_value_set_boolean (return_accu, myboolean || retboolean);
 
   return TRUE;
@@ -646,7 +644,6 @@ _gst_array_accumulator (GSignalInvocationHint * ihint,
   gpointer array;
 
   array = g_value_get_boxed (handler_return);
-  if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
   g_value_set_boxed (return_accu, array);
 
   return FALSE;
@@ -659,7 +656,6 @@ _gst_select_accumulator (GSignalInvocationHint * ihint,
   GstAutoplugSelectResult res;
 
   res = g_value_get_enum (handler_return);
-  if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
   g_value_set_enum (return_accu, res);
 
   /* Call the next handler in the chain (if any) when the current callback
@@ -679,7 +675,6 @@ _gst_array_hasvalue_accumulator (GSignalInvocationHint * ihint,
   gpointer array;
 
   array = g_value_get_boxed (handler_return);
-  if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
   g_value_set_boxed (return_accu, array);
 
   if (array != NULL)

diff --git a/gst/playback/gstdecodebin3.c b/gst/playback/gstdecodebin3.c
@@ -535,7 +535,6 @@ _gst_int_accumulator (GSignalInvocationHint * ihint,
 {
   gint res = g_value_get_int (handler_return);
 
-  if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
   g_value_set_int (return_accu, res);
 
   if (res == -1)

diff --git a/gst/playback/gstparsebin.c b/gst/playback/gstparsebin.c
@@ -513,7 +513,6 @@ _gst_boolean_accumulator (GSignalInvocationHint * ihint,
   gboolean myboolean;
 
   myboolean = g_value_get_boolean (handler_return);
-  if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
   g_value_set_boolean (return_accu, myboolean);
 
   /* stop emission if FALSE */
@@ -530,7 +529,6 @@ _gst_boolean_or_accumulator (GSignalInvocationHint * ihint,
   myboolean = g_value_get_boolean (handler_return);
   retboolean = g_value_get_boolean (return_accu);
 
-  if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
   g_value_set_boolean (return_accu, myboolean || retboolean);
 
   return TRUE;
@@ -544,7 +542,6 @@ _gst_array_accumulator (GSignalInvocationHint * ihint,
   gpointer array;
 
   array = g_value_get_boxed (handler_return);
-  if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
   g_value_set_boxed (return_accu, array);
 
   return FALSE;
@@ -557,7 +554,6 @@ _gst_select_accumulator (GSignalInvocationHint * ihint,
   GstAutoplugSelectResult res;
 
   res = g_value_get_enum (handler_return);
-  if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
   g_value_set_enum (return_accu, res);
 
   /* Call the next handler in the chain (if any) when the current callback
@@ -577,7 +573,6 @@ _gst_array_hasvalue_accumulator (GSignalInvocationHint * ihint,
   gpointer array;
 
   array = g_value_get_boxed (handler_return);
-  if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
   g_value_set_boxed (return_accu, array);
 
   if (array != NULL)

diff --git a/gst/playback/gsturidecodebin.c b/gst/playback/gsturidecodebin.c
@@ -235,7 +235,6 @@ _gst_boolean_accumulator (GSignalInvocationHint * ihint,
   gboolean myboolean;
 
   myboolean = g_value_get_boolean (handler_return);
-  if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
   g_value_set_boolean (return_accu, myboolean);
 
   /* stop emission if FALSE */
@@ -252,7 +251,6 @@ _gst_boolean_or_accumulator (GSignalInvocationHint * ihint,
   myboolean = g_value_get_boolean (handler_return);
   retboolean = g_value_get_boolean (return_accu);
 
-  if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
   g_value_set_boolean (return_accu, myboolean || retboolean);
 
   return TRUE;
@@ -265,7 +263,6 @@ _gst_array_accumulator (GSignalInvocationHint * ihint,
   gpointer array;
 
   array = g_value_get_boxed (handler_return);
-  if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
   g_value_set_boxed (return_accu, array);
 
   return FALSE;
@@ -278,7 +275,6 @@ _gst_select_accumulator (GSignalInvocationHint * ihint,
   GstAutoplugSelectResult res;
 
   res = g_value_get_enum (handler_return);
-  if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
   g_value_set_enum (return_accu, res);
 
   /* Call the next handler in the chain (if any) when the current callback
@@ -298,7 +294,6 @@ _gst_array_hasvalue_accumulator (GSignalInvocationHint * ihint,
   gpointer array;
 
   array = g_value_get_boxed (handler_return);
-  if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
   g_value_set_boxed (return_accu, array);
 
   if (array != NULL)

diff --git a/gst/playback/gsturidecodebin3.c b/gst/playback/gsturidecodebin3.c
@@ -360,7 +360,6 @@ _gst_int_accumulator (GSignalInvocationHint * ihint,
 {
   gint res = g_value_get_int (handler_return);
 
-  if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
   g_value_set_int (return_accu, res);
 
   if (res == -1)