message: explicitly cast to the right enum types

Fixes warning #188: enumerated type mixed with another type reported by ICC.
This commit is contained in:
Josep Torra 2011-08-16 22:51:29 +02:00
parent 2a6ba0b29d
commit c27ce79ba1

View file

@ -1134,7 +1134,8 @@ gst_message_parse_buffering_stats (GstMessage * message,
g_return_if_fail (GST_MESSAGE_TYPE (message) == GST_MESSAGE_BUFFERING); g_return_if_fail (GST_MESSAGE_TYPE (message) == GST_MESSAGE_BUFFERING);
if (mode) if (mode)
*mode = g_value_get_enum (gst_structure_id_get_value (message->structure, *mode = (GstBufferingMode)
g_value_get_enum (gst_structure_id_get_value (message->structure,
GST_QUARK (BUFFERING_MODE))); GST_QUARK (BUFFERING_MODE)));
if (avg_in) if (avg_in)
*avg_in = g_value_get_int (gst_structure_id_get_value (message->structure, *avg_in = g_value_get_int (gst_structure_id_get_value (message->structure,
@ -1186,15 +1187,16 @@ gst_message_parse_state_changed (GstMessage * message,
g_return_if_fail (GST_MESSAGE_TYPE (message) == GST_MESSAGE_STATE_CHANGED); g_return_if_fail (GST_MESSAGE_TYPE (message) == GST_MESSAGE_STATE_CHANGED);
if (oldstate) if (oldstate)
*oldstate = *oldstate = (GstState)
g_value_get_enum (gst_structure_id_get_value (message->structure, g_value_get_enum (gst_structure_id_get_value (message->structure,
GST_QUARK (OLD_STATE))); GST_QUARK (OLD_STATE)));
if (newstate) if (newstate)
*newstate = *newstate = (GstState)
g_value_get_enum (gst_structure_id_get_value (message->structure, g_value_get_enum (gst_structure_id_get_value (message->structure,
GST_QUARK (NEW_STATE))); GST_QUARK (NEW_STATE)));
if (pending) if (pending)
*pending = g_value_get_enum (gst_structure_id_get_value (message->structure, *pending = (GstState)
g_value_get_enum (gst_structure_id_get_value (message->structure,
GST_QUARK (PENDING_STATE))); GST_QUARK (PENDING_STATE)));
} }
@ -1317,7 +1319,8 @@ gst_message_parse_structure_change (GstMessage * message,
g_return_if_fail (G_VALUE_TYPE (owner_gvalue) == GST_TYPE_ELEMENT); g_return_if_fail (G_VALUE_TYPE (owner_gvalue) == GST_TYPE_ELEMENT);
if (type) if (type)
*type = g_value_get_enum (gst_structure_id_get_value (message->structure, *type = (GstStructureChangeType)
g_value_get_enum (gst_structure_id_get_value (message->structure,
GST_QUARK (TYPE))); GST_QUARK (TYPE)));
if (owner) if (owner)
*owner = (GstElement *) g_value_get_object (owner_gvalue); *owner = (GstElement *) g_value_get_object (owner_gvalue);
@ -1483,7 +1486,7 @@ gst_message_parse_segment_start (GstMessage * message, GstFormat * format,
g_return_if_fail (GST_MESSAGE_TYPE (message) == GST_MESSAGE_SEGMENT_START); g_return_if_fail (GST_MESSAGE_TYPE (message) == GST_MESSAGE_SEGMENT_START);
if (format) if (format)
*format = *format = (GstFormat)
g_value_get_enum (gst_structure_id_get_value (message->structure, g_value_get_enum (gst_structure_id_get_value (message->structure,
GST_QUARK (FORMAT))); GST_QUARK (FORMAT)));
if (position) if (position)
@ -1510,7 +1513,7 @@ gst_message_parse_segment_done (GstMessage * message, GstFormat * format,
g_return_if_fail (GST_MESSAGE_TYPE (message) == GST_MESSAGE_SEGMENT_DONE); g_return_if_fail (GST_MESSAGE_TYPE (message) == GST_MESSAGE_SEGMENT_DONE);
if (format) if (format)
*format = *format = (GstFormat)
g_value_get_enum (gst_structure_id_get_value (message->structure, g_value_get_enum (gst_structure_id_get_value (message->structure,
GST_QUARK (FORMAT))); GST_QUARK (FORMAT)));
if (position) if (position)
@ -1540,7 +1543,7 @@ gst_message_parse_duration (GstMessage * message, GstFormat * format,
g_return_if_fail (GST_MESSAGE_TYPE (message) == GST_MESSAGE_DURATION); g_return_if_fail (GST_MESSAGE_TYPE (message) == GST_MESSAGE_DURATION);
if (format) if (format)
*format = *format = (GstFormat)
g_value_get_enum (gst_structure_id_get_value (message->structure, g_value_get_enum (gst_structure_id_get_value (message->structure,
GST_QUARK (FORMAT))); GST_QUARK (FORMAT)));
if (duration) if (duration)
@ -1590,7 +1593,8 @@ gst_message_parse_request_state (GstMessage * message, GstState * state)
g_return_if_fail (GST_MESSAGE_TYPE (message) == GST_MESSAGE_REQUEST_STATE); g_return_if_fail (GST_MESSAGE_TYPE (message) == GST_MESSAGE_REQUEST_STATE);
if (state) if (state)
*state = g_value_get_enum (gst_structure_id_get_value (message->structure, *state = (GstState)
g_value_get_enum (gst_structure_id_get_value (message->structure,
GST_QUARK (NEW_STATE))); GST_QUARK (NEW_STATE)));
} }
@ -1652,7 +1656,8 @@ gst_message_parse_stream_status (GstMessage * message,
g_return_if_fail (owner_gvalue != NULL); g_return_if_fail (owner_gvalue != NULL);
if (type) if (type)
*type = g_value_get_enum (gst_structure_id_get_value (message->structure, *type = (GstStreamStatusType)
g_value_get_enum (gst_structure_id_get_value (message->structure,
GST_QUARK (TYPE))); GST_QUARK (TYPE)));
if (owner) if (owner)
*owner = (GstElement *) g_value_get_object (owner_gvalue); *owner = (GstElement *) g_value_get_object (owner_gvalue);