Commit 154eefec authored by Sebastian Dröge's avatar Sebastian Dröge 🍵

Don't compare booleans for equality to TRUE and FALSE

TRUE is 1, but every other non-zero value is also considered true. Comparing
for equality with TRUE would only consider 1 but not the others.

Also normalize booleans in a few places.
parent f2e4c255
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
} }
} else { } else {
/* buffering busy */ /* buffering busy */
if (buffering == FALSE && target_state == GST_STATE_PLAYING) { if (!buffering && target_state == GST_STATE_PLAYING) {
/* we were not buffering but PLAYING, PAUSE the pipeline. */ /* we were not buffering but PLAYING, PAUSE the pipeline. */
gst_element_set_state (pipeline, GST_STATE_PAUSED); gst_element_set_state (pipeline, GST_STATE_PAUSED);
} }
...@@ -349,7 +349,7 @@ on_message_buffering (GstBus *bus, GstMessage *message, gpointer user_data) ...@@ -349,7 +349,7 @@ on_message_buffering (GstBus *bus, GstMessage *message, gpointer user_data)
if (percent < 100) { if (percent < 100) {
/* buffering busy */ /* buffering busy */
if (is_buffering == FALSE) { if (!is_buffering) {
is_buffering = TRUE; is_buffering = TRUE;
if (target_state == GST_STATE_PLAYING) { if (target_state == GST_STATE_PLAYING) {
/* we were not buffering but PLAYING, PAUSE the pipeline. */ /* we were not buffering but PLAYING, PAUSE the pipeline. */
...@@ -364,7 +364,7 @@ on_message_async_done (GstBus *bus, GstMessage *message, gpointer user_data) ...@@ -364,7 +364,7 @@ on_message_async_done (GstBus *bus, GstMessage *message, gpointer user_data)
{ {
GstElement *pipeline = user_data; GstElement *pipeline = user_data;
if (is_buffering == FALSE) if (!is_buffering)
gst_element_set_state (pipeline, target_state); gst_element_set_state (pipeline, target_state);
else else
g_timeout_add (500, buffer_timeout, pipeline); g_timeout_add (500, buffer_timeout, pipeline);
......
...@@ -3888,7 +3888,7 @@ bin_query_latency_fold (const GValue * vitem, GValue * ret, QueryFold * fold) ...@@ -3888,7 +3888,7 @@ bin_query_latency_fold (const GValue * vitem, GValue * ret, QueryFold * fold)
fold->max = max; fold->max = max;
else if (max < fold->max) else if (max < fold->max)
fold->max = max; fold->max = max;
if (fold->live == FALSE) if (!fold->live)
fold->live = live; fold->live = live;
} }
} else { } else {
......
...@@ -505,7 +505,7 @@ gst_bus_timed_pop_filtered (GstBus * bus, GstClockTime timeout, ...@@ -505,7 +505,7 @@ gst_bus_timed_pop_filtered (GstBus * bus, GstClockTime timeout,
if ((GST_MESSAGE_TYPE (message) & types) != 0) { if ((GST_MESSAGE_TYPE (message) & types) != 0) {
/* Extra check to ensure extended types don't get matched unless /* Extra check to ensure extended types don't get matched unless
* asked for */ * asked for */
if ((GST_MESSAGE_TYPE_IS_EXTENDED (message) == FALSE) if ((!GST_MESSAGE_TYPE_IS_EXTENDED (message))
|| (types & GST_MESSAGE_EXTENDED)) { || (types & GST_MESSAGE_EXTENDED)) {
/* exit the loop, we have a message */ /* exit the loop, we have a message */
goto beach; goto beach;
......
...@@ -468,5 +468,5 @@ gboolean ...@@ -468,5 +468,5 @@ gboolean
gst_control_binding_is_disabled (GstControlBinding * binding) gst_control_binding_is_disabled (GstControlBinding * binding)
{ {
g_return_val_if_fail (GST_IS_CONTROL_BINDING (binding), TRUE); g_return_val_if_fail (GST_IS_CONTROL_BINDING (binding), TRUE);
return (binding->disabled == TRUE); return ! !binding->disabled;
} }
...@@ -223,7 +223,7 @@ gst_device_monitor_dispose (GObject * object) ...@@ -223,7 +223,7 @@ gst_device_monitor_dispose (GObject * object)
{ {
GstDeviceMonitor *self = GST_DEVICE_MONITOR (object); GstDeviceMonitor *self = GST_DEVICE_MONITOR (object);
g_return_if_fail (self->priv->started == FALSE); g_return_if_fail (!self->priv->started);
if (self->priv->providers) { if (self->priv->providers) {
while (self->priv->providers->len) while (self->priv->providers->len)
......
...@@ -533,8 +533,7 @@ gst_ghost_pad_construct (GstGhostPad * gpad) ...@@ -533,8 +533,7 @@ gst_ghost_pad_construct (GstGhostPad * gpad)
GstPad *pad, *internal; GstPad *pad, *internal;
g_return_val_if_fail (GST_IS_GHOST_PAD (gpad), FALSE); g_return_val_if_fail (GST_IS_GHOST_PAD (gpad), FALSE);
g_return_val_if_fail (GST_GHOST_PAD_PRIVATE (gpad)->constructed == FALSE, g_return_val_if_fail (!GST_GHOST_PAD_PRIVATE (gpad)->constructed, FALSE);
FALSE);
g_object_get (gpad, "direction", &dir, "template", &templ, NULL); g_object_get (gpad, "direction", &dir, "template", &templ, NULL);
......
...@@ -1799,7 +1799,7 @@ gst_debug_set_threshold_from_string (const gchar * list, gboolean reset) ...@@ -1799,7 +1799,7 @@ gst_debug_set_threshold_from_string (const gchar * list, gboolean reset)
g_assert (list); g_assert (list);
if (reset == TRUE) if (reset)
gst_debug_set_default_threshold (0); gst_debug_set_default_threshold (0);
split = g_strsplit (list, ",", 0); split = g_strsplit (list, ",", 0);
......
...@@ -706,7 +706,7 @@ gst_plugin_load_file (const gchar * filename, GError ** error) ...@@ -706,7 +706,7 @@ gst_plugin_load_file (const gchar * filename, GError ** error)
GST_CAT_DEBUG (GST_CAT_PLUGIN_LOADING, "attempt to load plugin \"%s\"", GST_CAT_DEBUG (GST_CAT_PLUGIN_LOADING, "attempt to load plugin \"%s\"",
filename); filename);
if (g_module_supported () == FALSE) { if (!g_module_supported ()) {
GST_CAT_DEBUG (GST_CAT_PLUGIN_LOADING, "module loading not supported"); GST_CAT_DEBUG (GST_CAT_PLUGIN_LOADING, "module loading not supported");
g_set_error (error, g_set_error (error,
GST_PLUGIN_ERROR, GST_PLUGIN_ERROR,
......
...@@ -1970,7 +1970,7 @@ gst_structure_parse_range (gchar * s, gchar ** after, GValue * value, ...@@ -1970,7 +1970,7 @@ gst_structure_parse_range (gchar * s, gchar ** after, GValue * value,
s++; s++;
ret = gst_structure_parse_value (s, &s, &value1, type); ret = gst_structure_parse_value (s, &s, &value1, type);
if (ret == FALSE) if (!ret)
return FALSE; return FALSE;
while (g_ascii_isspace (*s)) while (g_ascii_isspace (*s))
...@@ -1984,7 +1984,7 @@ gst_structure_parse_range (gchar * s, gchar ** after, GValue * value, ...@@ -1984,7 +1984,7 @@ gst_structure_parse_range (gchar * s, gchar ** after, GValue * value,
s++; s++;
ret = gst_structure_parse_value (s, &s, &value2, type); ret = gst_structure_parse_value (s, &s, &value2, type);
if (ret == FALSE) if (!ret)
return FALSE; return FALSE;
while (g_ascii_isspace (*s)) while (g_ascii_isspace (*s))
...@@ -2000,7 +2000,7 @@ gst_structure_parse_range (gchar * s, gchar ** after, GValue * value, ...@@ -2000,7 +2000,7 @@ gst_structure_parse_range (gchar * s, gchar ** after, GValue * value,
s++; s++;
ret = gst_structure_parse_value (s, &s, &value3, type); ret = gst_structure_parse_value (s, &s, &value3, type);
if (ret == FALSE) if (!ret)
return FALSE; return FALSE;
while (g_ascii_isspace (*s)) while (g_ascii_isspace (*s))
...@@ -2084,7 +2084,7 @@ gst_structure_parse_any_list (gchar * s, gchar ** after, GValue * value, ...@@ -2084,7 +2084,7 @@ gst_structure_parse_any_list (gchar * s, gchar ** after, GValue * value,
} }
ret = gst_structure_parse_value (s, &s, &list_value, type); ret = gst_structure_parse_value (s, &s, &list_value, type);
if (ret == FALSE) if (!ret)
return FALSE; return FALSE;
g_array_append_val (array, list_value); g_array_append_val (array, list_value);
...@@ -2102,7 +2102,7 @@ gst_structure_parse_any_list (gchar * s, gchar ** after, GValue * value, ...@@ -2102,7 +2102,7 @@ gst_structure_parse_any_list (gchar * s, gchar ** after, GValue * value,
memset (&list_value, 0, sizeof (list_value)); memset (&list_value, 0, sizeof (list_value));
ret = gst_structure_parse_value (s, &s, &list_value, type); ret = gst_structure_parse_value (s, &s, &list_value, type);
if (ret == FALSE) if (!ret)
return FALSE; return FALSE;
g_array_append_val (array, list_value); g_array_append_val (array, list_value);
......
...@@ -339,7 +339,7 @@ gst_system_clock_obtain (void) ...@@ -339,7 +339,7 @@ gst_system_clock_obtain (void)
if (clock == NULL) { if (clock == NULL) {
GST_CAT_DEBUG (GST_CAT_CLOCK, "creating new static system clock"); GST_CAT_DEBUG (GST_CAT_CLOCK, "creating new static system clock");
g_assert (_external_default_clock == FALSE); g_assert (!_external_default_clock);
clock = g_object_new (GST_TYPE_SYSTEM_CLOCK, clock = g_object_new (GST_TYPE_SYSTEM_CLOCK,
"name", "GstSystemClock", NULL); "name", "GstSystemClock", NULL);
...@@ -738,8 +738,10 @@ gst_system_clock_id_wait_jitter_unlocked (GstClock * clock, ...@@ -738,8 +738,10 @@ gst_system_clock_id_wait_jitter_unlocked (GstClock * clock,
if (diff <= 0) { if (diff <= 0) {
/* timeout, this is fine, we can report success now */ /* timeout, this is fine, we can report success now */
if (G_UNLIKELY (!CAS_ENTRY_STATUS (entry, GST_CLOCK_DONE, GST_CLOCK_OK))) { if (G_UNLIKELY (!CAS_ENTRY_STATUS (entry, GST_CLOCK_DONE,
GST_CAT_DEBUG (GST_CAT_CLOCK, "unexpected status for entry %p", entry); GST_CLOCK_OK))) {
GST_CAT_DEBUG (GST_CAT_CLOCK, "unexpected status for entry %p",
entry);
status = GET_ENTRY_STATUS (entry); status = GET_ENTRY_STATUS (entry);
goto done; goto done;
} else { } else {
......
...@@ -4434,7 +4434,7 @@ gst_base_sink_get_position (GstBaseSink * basesink, GstFormat format, ...@@ -4434,7 +4434,7 @@ gst_base_sink_get_position (GstBaseSink * basesink, GstFormat format,
/* assume we will use the clock for getting the current position */ /* assume we will use the clock for getting the current position */
with_clock = TRUE; with_clock = TRUE;
if (basesink->sync == FALSE) if (!basesink->sync)
with_clock = FALSE; with_clock = FALSE;
/* and we need a clock */ /* and we need a clock */
......
...@@ -2464,7 +2464,7 @@ gst_base_transform_set_passthrough (GstBaseTransform * trans, ...@@ -2464,7 +2464,7 @@ gst_base_transform_set_passthrough (GstBaseTransform * trans,
bclass = GST_BASE_TRANSFORM_GET_CLASS (trans); bclass = GST_BASE_TRANSFORM_GET_CLASS (trans);
GST_OBJECT_LOCK (trans); GST_OBJECT_LOCK (trans);
if (passthrough == FALSE) { if (!passthrough) {
if (bclass->transform_ip || bclass->transform) if (bclass->transform_ip || bclass->transform)
trans->priv->passthrough = FALSE; trans->priv->passthrough = FALSE;
} else { } else {
......
...@@ -1315,7 +1315,7 @@ gst_collect_pads_check_collected (GstCollectPads * pads) ...@@ -1315,7 +1315,7 @@ gst_collect_pads_check_collected (GstCollectPads * pads)
pads->priv->numpads, GST_DEBUG_FUNCPTR_NAME (func)); pads->priv->numpads, GST_DEBUG_FUNCPTR_NAME (func));
if (G_UNLIKELY (g_atomic_int_compare_and_exchange (&pads->priv->seeking, if (G_UNLIKELY (g_atomic_int_compare_and_exchange (&pads->priv->seeking,
TRUE, FALSE) == TRUE)) { TRUE, FALSE))) {
GST_INFO_OBJECT (pads, "finished seeking"); GST_INFO_OBJECT (pads, "finished seeking");
} }
do { do {
...@@ -1333,7 +1333,7 @@ gst_collect_pads_check_collected (GstCollectPads * pads) ...@@ -1333,7 +1333,7 @@ gst_collect_pads_check_collected (GstCollectPads * pads)
GST_DEBUG_FUNCPTR_NAME (func)); GST_DEBUG_FUNCPTR_NAME (func));
if (G_UNLIKELY (g_atomic_int_compare_and_exchange (&pads->priv->seeking, if (G_UNLIKELY (g_atomic_int_compare_and_exchange (&pads->priv->seeking,
TRUE, FALSE) == TRUE)) { TRUE, FALSE))) {
GST_INFO_OBJECT (pads, "finished seeking"); GST_INFO_OBJECT (pads, "finished seeking");
} }
flow_ret = func (pads, user_data); flow_ret = func (pads, user_data);
...@@ -1664,8 +1664,8 @@ gst_collect_pads_event_default (GstCollectPads * pads, GstCollectData * data, ...@@ -1664,8 +1664,8 @@ gst_collect_pads_event_default (GstCollectPads * pads, GstCollectData * data,
{ {
if (g_atomic_int_get (&pads->priv->seeking)) { if (g_atomic_int_get (&pads->priv->seeking)) {
/* drop all but the first FLUSH_STARTs when seeking */ /* drop all but the first FLUSH_STARTs when seeking */
if (g_atomic_int_compare_and_exchange (&pads->priv->pending_flush_start, if (!g_atomic_int_compare_and_exchange (&pads->
TRUE, FALSE) == FALSE) priv->pending_flush_start, TRUE, FALSE))
goto eat; goto eat;
/* unblock collect pads */ /* unblock collect pads */
......
...@@ -954,7 +954,8 @@ weak_notify (DestroyedObjectStruct * destroyed, GObject ** object) ...@@ -954,7 +954,8 @@ weak_notify (DestroyedObjectStruct * destroyed, GObject ** object)
* Since: 1.6 * Since: 1.6
*/ */
void void
gst_check_objects_destroyed_on_unref (gpointer object_to_unref, gpointer first_object, ...) gst_check_objects_destroyed_on_unref (gpointer object_to_unref,
gpointer first_object, ...)
{ {
GObject *object; GObject *object;
GList *objs = NULL, *tmp; GList *objs = NULL, *tmp;
...@@ -984,12 +985,13 @@ gst_check_objects_destroyed_on_unref (gpointer object_to_unref, gpointer first_o ...@@ -984,12 +985,13 @@ gst_check_objects_destroyed_on_unref (gpointer object_to_unref, gpointer first_o
for (tmp = objs; tmp; tmp = tmp->next) { for (tmp = objs; tmp; tmp = tmp->next) {
DestroyedObjectStruct *destroyed = tmp->data; DestroyedObjectStruct *destroyed = tmp->data;
if (destroyed->destroyed == FALSE) { if (!destroyed->destroyed) {
fail_unless (destroyed->destroyed == TRUE, fail_unless (destroyed->destroyed,
"%s_%p is not destroyed, %d refcounts left!", "%s_%p is not destroyed, %d refcounts left!",
GST_IS_OBJECT (destroyed->object) ? GST_OBJECT_NAME (destroyed->object) : GST_IS_OBJECT (destroyed->
G_OBJECT_TYPE_NAME (destroyed), object) ? GST_OBJECT_NAME (destroyed->object) :
destroyed->object, destroyed->object->ref_count); G_OBJECT_TYPE_NAME (destroyed), destroyed->object,
destroyed->object->ref_count);
} }
g_slice_free (DestroyedObjectStruct, tmp->data); g_slice_free (DestroyedObjectStruct, tmp->data);
} }
......
...@@ -500,7 +500,7 @@ G_STMT_START { \ ...@@ -500,7 +500,7 @@ G_STMT_START { \
g_usleep (1); \ g_usleep (1); \
} G_STMT_END; } G_STMT_END;
#define THREAD_TEST_RUNNING() (_gst_check_threads_running == TRUE) #define THREAD_TEST_RUNNING() (!!_gst_check_threads_running)
/* additional assertions */ /* additional assertions */
#define ASSERT_CRITICAL(code) \ #define ASSERT_CRITICAL(code) \
......
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
* g_assert_cmpint (GST_BUFFER_TIMESTAMP (buf), ==, latency); * g_assert_cmpint (GST_BUFFER_TIMESTAMP (buf), ==, latency);
* gst_buffer_unref (buf); * gst_buffer_unref (buf);
* GST_INFO ("Check that element does not wait for any clock notification\n"); * GST_INFO ("Check that element does not wait for any clock notification\n");
* g_assert (gst_test_clock_peek_next_pending_id (test_clock, NULL) == FALSE); * g_assert (!gst_test_clock_peek_next_pending_id (test_clock, NULL));
* *
* GST_INFO ("Set time, create and push the second buffer\n"); * GST_INFO ("Set time, create and push the second buffer\n");
* gst_test_clock_advance_time (test_clock, 10 * GST_SECOND); * gst_test_clock_advance_time (test_clock, 10 * GST_SECOND);
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
* 10 * GST_SECOND + latency + 7 * GST_MSECOND); * 10 * GST_SECOND + latency + 7 * GST_MSECOND);
* gst_buffer_unref (buf); * gst_buffer_unref (buf);
* GST_INFO ("Check that element does not wait for any clock notification\n"); * GST_INFO ("Check that element does not wait for any clock notification\n");
* g_assert (gst_test_clock_peek_next_pending_id (test_clock, NULL) == FALSE); * g_assert (!gst_test_clock_peek_next_pending_id (test_clock, NULL));
* ... * ...
* </programlisting> * </programlisting>
* </example> * </example>
......
...@@ -210,7 +210,7 @@ gst_funnel_all_sinkpads_eos_unlocked (GstFunnel * funnel, GstPad * pad) ...@@ -210,7 +210,7 @@ gst_funnel_all_sinkpads_eos_unlocked (GstFunnel * funnel, GstPad * pad)
for (item = element->sinkpads; item != NULL; item = g_list_next (item)) { for (item = element->sinkpads; item != NULL; item = g_list_next (item)) {
GstFunnelPad *sinkpad = GST_FUNNEL_PAD_CAST (item->data); GstFunnelPad *sinkpad = GST_FUNNEL_PAD_CAST (item->data);
if (sinkpad->got_eos == FALSE) { if (!sinkpad->got_eos) {
return FALSE; return FALSE;
} }
} }
......
...@@ -299,7 +299,7 @@ gst_identity_sink_event (GstBaseTransform * trans, GstEvent * event) ...@@ -299,7 +299,7 @@ gst_identity_sink_event (GstBaseTransform * trans, GstEvent * event)
} }
if (identity->single_segment && (GST_EVENT_TYPE (event) == GST_EVENT_SEGMENT)) { if (identity->single_segment && (GST_EVENT_TYPE (event) == GST_EVENT_SEGMENT)) {
if (trans->have_segment == FALSE) { if (!trans->have_segment) {
GstEvent *news; GstEvent *news;
GstSegment segment; GstSegment segment;
......
...@@ -1591,7 +1591,7 @@ gst_input_selector_query (GstPad * pad, GstObject * parent, GstQuery * query) ...@@ -1591,7 +1591,7 @@ gst_input_selector_query (GstPad * pad, GstObject * parent, GstQuery * query)
resmax = max; resmax = max;
else if (max < resmax) else if (max < resmax)
resmax = max; resmax = max;
if (reslive == FALSE) if (!reslive)
reslive = live; reslive = live;
} }
} }
......
...@@ -492,7 +492,7 @@ intr_handler (gpointer user_data) ...@@ -492,7 +492,7 @@ intr_handler (gpointer user_data)
return FALSE; return FALSE;
} }
#if defined(G_OS_WIN32) /* G_OS_UNIX */ #if defined(G_OS_WIN32) /* G_OS_UNIX */
static BOOL WINAPI static BOOL WINAPI
w32_intr_handler (DWORD dwCtrlType) w32_intr_handler (DWORD dwCtrlType)
{ {
...@@ -732,7 +732,7 @@ event_loop (GstElement * pipeline, gboolean blocking, gboolean do_progress, ...@@ -732,7 +732,7 @@ event_loop (GstElement * pipeline, gboolean blocking, gboolean do_progress,
goto exit; goto exit;
} else { } else {
/* buffering busy */ /* buffering busy */
if (buffering == FALSE && target_state == GST_STATE_PLAYING) { if (!buffering && target_state == GST_STATE_PLAYING) {
/* we were not buffering but PLAYING, PAUSE the pipeline. */ /* we were not buffering but PLAYING, PAUSE the pipeline. */
PRINT (_("Buffering, setting pipeline to PAUSED ...\n")); PRINT (_("Buffering, setting pipeline to PAUSED ...\n"));
gst_element_set_state (pipeline, GST_STATE_PAUSED); gst_element_set_state (pipeline, GST_STATE_PAUSED);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment