mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

play: Improve play message API inconsistencies

Browse source 
* Check for the correct message type when parsing
  * Use correct field name for warning message details

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7779>
This commit is contained in:
Sebastian Dröge 2024-10-26 11:42:48 +03:00
parent 3efd5a358e
commit 74cafe7b20
3 changed files with 63 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
girs/GstPlay-1.0.gir
View file

@ -1813,7 +1813,7 @@ See also #gst_play_get_message_bus()</doc-version>
</parameters> </parameters>
</function> </function>
<function name="parse_buffering_percent" c:identifier="gst_play_message_parse_buffering_percent" version="1.20"> <function name="parse_buffering_percent" c:identifier="gst_play_message_parse_buffering_percent" version="1.20">
<doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given buffering-percent @msg and extract the corresponding value</doc> <doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given buffering @msg and extract the corresponding value</doc>
<source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/> <source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/>
<return-value transfer-ownership="none"> <return-value transfer-ownership="none">
<type name="none" c:type="void"/> <type name="none" c:type="void"/>
@ -1830,7 +1830,7 @@ See also #gst_play_get_message_bus()</doc-version>
</parameters> </parameters>
</function> </function>
<function name="parse_duration_updated" c:identifier="gst_play_message_parse_duration_updated" version="1.20"> <function name="parse_duration_updated" c:identifier="gst_play_message_parse_duration_updated" version="1.20">
<doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given duration @msg and extract the corresponding #GstClockTime</doc> <doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given duration-changed @msg and extract the corresponding #GstClockTime</doc>
<source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/> <source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/>
<return-value transfer-ownership="none"> <return-value transfer-ownership="none">
<type name="none" c:type="void"/> <type name="none" c:type="void"/>
@ -1868,7 +1868,7 @@ See also #gst_play_get_message_bus()</doc-version>
</parameters> </parameters>
</function> </function>
<function name="parse_media_info_updated" c:identifier="gst_play_message_parse_media_info_updated" version="1.20"> <function name="parse_media_info_updated" c:identifier="gst_play_message_parse_media_info_updated" version="1.20">
<doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given @msg and extract the corresponding media information</doc> <doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given media-info-updated @msg and extract the corresponding media information</doc>
<source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/> <source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/>
<return-value transfer-ownership="none"> <return-value transfer-ownership="none">
<type name="none" c:type="void"/> <type name="none" c:type="void"/>
@ -1885,7 +1885,7 @@ See also #gst_play_get_message_bus()</doc-version>
</parameters> </parameters>
</function> </function>
<function name="parse_muted_changed" c:identifier="gst_play_message_parse_muted_changed" version="1.20"> <function name="parse_muted_changed" c:identifier="gst_play_message_parse_muted_changed" version="1.20">
<doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given @msg and extract the corresponding audio muted state</doc> <doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given mute-changed @msg and extract the corresponding audio muted state</doc>
<source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/> <source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/>
<return-value transfer-ownership="none"> <return-value transfer-ownership="none">
<type name="none" c:type="void"/> <type name="none" c:type="void"/>
@ -1902,7 +1902,7 @@ See also #gst_play_get_message_bus()</doc-version>
</parameters> </parameters>
</function> </function>
<function name="parse_position_updated" c:identifier="gst_play_message_parse_position_updated" version="1.20"> <function name="parse_position_updated" c:identifier="gst_play_message_parse_position_updated" version="1.20">
<doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given position @msg and extract the corresponding #GstClockTime</doc> <doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given position-updated @msg and extract the corresponding #GstClockTime</doc>
<source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/> <source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/>
<return-value transfer-ownership="none"> <return-value transfer-ownership="none">
<type name="none" c:type="void"/> <type name="none" c:type="void"/>
@ -1919,7 +1919,7 @@ See also #gst_play_get_message_bus()</doc-version>
</parameters> </parameters>
</function> </function>
<function name="parse_state_changed" c:identifier="gst_play_message_parse_state_changed" version="1.20"> <function name="parse_state_changed" c:identifier="gst_play_message_parse_state_changed" version="1.20">
<doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given state @msg and extract the corresponding #GstPlayState</doc> <doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given state-changed @msg and extract the corresponding #GstPlayState</doc>
<source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/> <source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/>
<return-value transfer-ownership="none"> <return-value transfer-ownership="none">
<type name="none" c:type="void"/> <type name="none" c:type="void"/>
@ -1953,7 +1953,7 @@ See also #gst_play_get_message_bus()</doc-version>
</parameters> </parameters>
</function> </function>
<function name="parse_video_dimensions_changed" c:identifier="gst_play_message_parse_video_dimensions_changed" version="1.20"> <function name="parse_video_dimensions_changed" c:identifier="gst_play_message_parse_video_dimensions_changed" version="1.20">
<doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given @msg and extract the corresponding video dimensions</doc> <doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given video-dimensions-changed @msg and extract the corresponding video dimensions</doc>
<source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/> <source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/>
<return-value transfer-ownership="none"> <return-value transfer-ownership="none">
<type name="none" c:type="void"/> <type name="none" c:type="void"/>
@ -1974,7 +1974,7 @@ See also #gst_play_get_message_bus()</doc-version>
</parameters> </parameters>
</function> </function>
<function name="parse_volume_changed" c:identifier="gst_play_message_parse_volume_changed" version="1.20"> <function name="parse_volume_changed" c:identifier="gst_play_message_parse_volume_changed" version="1.20">
<doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given @msg and extract the corresponding audio volume</doc> <doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given volume-changed @msg and extract the corresponding audio volume</doc>
<source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/> <source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/>
<return-value transfer-ownership="none"> <return-value transfer-ownership="none">
<type name="none" c:type="void"/> <type name="none" c:type="void"/>
@ -1991,7 +1991,7 @@ See also #gst_play_get_message_bus()</doc-version>
</parameters> </parameters>
</function> </function>
<function name="parse_warning" c:identifier="gst_play_message_parse_warning" version="1.20"> <function name="parse_warning" c:identifier="gst_play_message_parse_warning" version="1.20">
<doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given error @msg and extract the corresponding #GError warning</doc> <doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given warning @msg and extract the corresponding #GError</doc>
<source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/> <source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/>
<return-value transfer-ownership="none"> <return-value transfer-ownership="none">
<type name="none" c:type="void"/> <type name="none" c:type="void"/>
@ -2756,7 +2756,7 @@ freed using gst_play_visualization_free().</doc>
</parameters> </parameters>
</function> </function>
<function name="play_message_parse_buffering_percent" c:identifier="gst_play_message_parse_buffering_percent" moved-to="PlayMessage.parse_buffering_percent" version="1.20"> <function name="play_message_parse_buffering_percent" c:identifier="gst_play_message_parse_buffering_percent" moved-to="PlayMessage.parse_buffering_percent" version="1.20">
<doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given buffering-percent @msg and extract the corresponding value</doc> <doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given buffering @msg and extract the corresponding value</doc>
<source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/> <source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/>
<return-value transfer-ownership="none"> <return-value transfer-ownership="none">
<type name="none" c:type="void"/> <type name="none" c:type="void"/>
@ -2773,7 +2773,7 @@ freed using gst_play_visualization_free().</doc>
</parameters> </parameters>
</function> </function>
<function name="play_message_parse_duration_updated" c:identifier="gst_play_message_parse_duration_updated" moved-to="PlayMessage.parse_duration_updated" version="1.20"> <function name="play_message_parse_duration_updated" c:identifier="gst_play_message_parse_duration_updated" moved-to="PlayMessage.parse_duration_updated" version="1.20">
<doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given duration @msg and extract the corresponding #GstClockTime</doc> <doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given duration-changed @msg and extract the corresponding #GstClockTime</doc>
<source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/> <source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/>
<return-value transfer-ownership="none"> <return-value transfer-ownership="none">
<type name="none" c:type="void"/> <type name="none" c:type="void"/>
@ -2811,7 +2811,7 @@ freed using gst_play_visualization_free().</doc>
</parameters> </parameters>
</function> </function>
<function name="play_message_parse_media_info_updated" c:identifier="gst_play_message_parse_media_info_updated" moved-to="PlayMessage.parse_media_info_updated" version="1.20"> <function name="play_message_parse_media_info_updated" c:identifier="gst_play_message_parse_media_info_updated" moved-to="PlayMessage.parse_media_info_updated" version="1.20">
<doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given @msg and extract the corresponding media information</doc> <doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given media-info-updated @msg and extract the corresponding media information</doc>
<source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/> <source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/>
<return-value transfer-ownership="none"> <return-value transfer-ownership="none">
<type name="none" c:type="void"/> <type name="none" c:type="void"/>
@ -2828,7 +2828,7 @@ freed using gst_play_visualization_free().</doc>
</parameters> </parameters>
</function> </function>
<function name="play_message_parse_muted_changed" c:identifier="gst_play_message_parse_muted_changed" moved-to="PlayMessage.parse_muted_changed" version="1.20"> <function name="play_message_parse_muted_changed" c:identifier="gst_play_message_parse_muted_changed" moved-to="PlayMessage.parse_muted_changed" version="1.20">
<doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given @msg and extract the corresponding audio muted state</doc> <doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given mute-changed @msg and extract the corresponding audio muted state</doc>
<source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/> <source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/>
<return-value transfer-ownership="none"> <return-value transfer-ownership="none">
<type name="none" c:type="void"/> <type name="none" c:type="void"/>
@ -2845,7 +2845,7 @@ freed using gst_play_visualization_free().</doc>
</parameters> </parameters>
</function> </function>
<function name="play_message_parse_position_updated" c:identifier="gst_play_message_parse_position_updated" moved-to="PlayMessage.parse_position_updated" version="1.20"> <function name="play_message_parse_position_updated" c:identifier="gst_play_message_parse_position_updated" moved-to="PlayMessage.parse_position_updated" version="1.20">
<doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given position @msg and extract the corresponding #GstClockTime</doc> <doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given position-updated @msg and extract the corresponding #GstClockTime</doc>
<source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/> <source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/>
<return-value transfer-ownership="none"> <return-value transfer-ownership="none">
<type name="none" c:type="void"/> <type name="none" c:type="void"/>
@ -2862,7 +2862,7 @@ freed using gst_play_visualization_free().</doc>
</parameters> </parameters>
</function> </function>
<function name="play_message_parse_state_changed" c:identifier="gst_play_message_parse_state_changed" moved-to="PlayMessage.parse_state_changed" version="1.20"> <function name="play_message_parse_state_changed" c:identifier="gst_play_message_parse_state_changed" moved-to="PlayMessage.parse_state_changed" version="1.20">
<doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given state @msg and extract the corresponding #GstPlayState</doc> <doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given state-changed @msg and extract the corresponding #GstPlayState</doc>
<source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/> <source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/>
<return-value transfer-ownership="none"> <return-value transfer-ownership="none">
<type name="none" c:type="void"/> <type name="none" c:type="void"/>
@ -2896,7 +2896,7 @@ freed using gst_play_visualization_free().</doc>
</parameters> </parameters>
</function> </function>
<function name="play_message_parse_video_dimensions_changed" c:identifier="gst_play_message_parse_video_dimensions_changed" moved-to="PlayMessage.parse_video_dimensions_changed" version="1.20"> <function name="play_message_parse_video_dimensions_changed" c:identifier="gst_play_message_parse_video_dimensions_changed" moved-to="PlayMessage.parse_video_dimensions_changed" version="1.20">
<doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given @msg and extract the corresponding video dimensions</doc> <doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given video-dimensions-changed @msg and extract the corresponding video dimensions</doc>
<source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/> <source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/>
<return-value transfer-ownership="none"> <return-value transfer-ownership="none">
<type name="none" c:type="void"/> <type name="none" c:type="void"/>
@ -2917,7 +2917,7 @@ freed using gst_play_visualization_free().</doc>
</parameters> </parameters>
</function> </function>
<function name="play_message_parse_volume_changed" c:identifier="gst_play_message_parse_volume_changed" moved-to="PlayMessage.parse_volume_changed" version="1.20"> <function name="play_message_parse_volume_changed" c:identifier="gst_play_message_parse_volume_changed" moved-to="PlayMessage.parse_volume_changed" version="1.20">
<doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given @msg and extract the corresponding audio volume</doc> <doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given volume-changed @msg and extract the corresponding audio volume</doc>
<source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/> <source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/>
<return-value transfer-ownership="none"> <return-value transfer-ownership="none">
<type name="none" c:type="void"/> <type name="none" c:type="void"/>
@ -2934,7 +2934,7 @@ freed using gst_play_visualization_free().</doc>
</parameters> </parameters>
</function> </function>
<function name="play_message_parse_warning" c:identifier="gst_play_message_parse_warning" moved-to="PlayMessage.parse_warning" version="1.20"> <function name="play_message_parse_warning" c:identifier="gst_play_message_parse_warning" moved-to="PlayMessage.parse_warning" version="1.20">
<doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given error @msg and extract the corresponding #GError warning</doc> <doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c">Parse the given warning @msg and extract the corresponding #GError</doc>
<source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/> <source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h"/>
<return-value transfer-ownership="none"> <return-value transfer-ownership="none">
<type name="none" c:type="void"/> <type name="none" c:type="void"/>

80
subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c
View file

@ -4721,9 +4721,12 @@ gst_play_is_play_message (GstMessage * msg)
return g_str_equal (gst_structure_get_name (data), GST_PLAY_MESSAGE_DATA); return g_str_equal (gst_structure_get_name (data), GST_PLAY_MESSAGE_DATA);
} }
#define PARSE_MESSAGE_FIELD(msg, field, value_type, value) G_STMT_START { \ #define PARSE_MESSAGE_FIELD(msg, expected_msg_type, field, value_type, value) G_STMT_START { \
const GstStructure *data = NULL; \ const GstStructure *data = NULL; \
GstPlayMessage msg_type; \
g_return_if_fail (gst_play_is_play_message (msg)); \ g_return_if_fail (gst_play_is_play_message (msg)); \
gst_play_message_parse_type (msg, &msg_type); \
g_return_if_fail (msg_type == expected_msg_type); \
data = gst_message_get_structure (msg); \ data = gst_message_get_structure (msg); \
gst_structure_get (data, field, value_type, value, NULL); \ gst_structure_get (data, field, value_type, value, NULL); \
} G_STMT_END } G_STMT_END
@ -4740,8 +4743,11 @@ gst_play_is_play_message (GstMessage * msg)
void void
gst_play_message_parse_type (GstMessage * msg, GstPlayMessage * type) gst_play_message_parse_type (GstMessage * msg, GstPlayMessage * type)
{ {
PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_DATA_TYPE, const GstStructure *data = NULL;
GST_TYPE_PLAY_MESSAGE, type); g_return_if_fail (gst_play_is_play_message (msg));
data = gst_message_get_structure (msg);
gst_structure_get (data, GST_PLAY_MESSAGE_DATA_TYPE, GST_TYPE_PLAY_MESSAGE,
type, NULL);
} }
/** /**
@ -4749,7 +4755,7 @@ gst_play_message_parse_type (GstMessage * msg, GstPlayMessage * type)
* @msg: A #GstMessage * @msg: A #GstMessage
* @duration: (out) (optional): the resulting duration * @duration: (out) (optional): the resulting duration
* *
* Parse the given duration @msg and extract the corresponding #GstClockTime * Parse the given duration-changed @msg and extract the corresponding #GstClockTime
* *
* Since: 1.20 * Since: 1.20
*/ */
@ -4757,8 +4763,8 @@ void
gst_play_message_parse_duration_updated (GstMessage * msg, gst_play_message_parse_duration_updated (GstMessage * msg,
GstClockTime * duration) GstClockTime * duration)
{ {
PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_DATA_DURATION, PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_DURATION_CHANGED,
GST_TYPE_CLOCK_TIME, duration); GST_PLAY_MESSAGE_DATA_DURATION, GST_TYPE_CLOCK_TIME, duration);
} }
/** /**
@ -4766,7 +4772,7 @@ gst_play_message_parse_duration_updated (GstMessage * msg,
* @msg: A #GstMessage * @msg: A #GstMessage
* @position: (out) (optional): the resulting position * @position: (out) (optional): the resulting position
* *
* Parse the given position @msg and extract the corresponding #GstClockTime * Parse the given position-updated @msg and extract the corresponding #GstClockTime
* *
* Since: 1.20 * Since: 1.20
*/ */
@ -4774,8 +4780,8 @@ void
gst_play_message_parse_position_updated (GstMessage * msg, gst_play_message_parse_position_updated (GstMessage * msg,
GstClockTime * position) GstClockTime * position)
{ {
PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_DATA_POSITION, PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_POSITION_UPDATED,
GST_TYPE_CLOCK_TIME, position); GST_PLAY_MESSAGE_DATA_POSITION, GST_TYPE_CLOCK_TIME, position);
} }
/** /**
@ -4783,15 +4789,15 @@ gst_play_message_parse_position_updated (GstMessage * msg,
* @msg: A #GstMessage * @msg: A #GstMessage
* @state: (out) (optional): the resulting play state * @state: (out) (optional): the resulting play state
* *
* Parse the given state @msg and extract the corresponding #GstPlayState * Parse the given state-changed @msg and extract the corresponding #GstPlayState
* *
* Since: 1.20 * Since: 1.20
*/ */
void void
gst_play_message_parse_state_changed (GstMessage * msg, GstPlayState * state) gst_play_message_parse_state_changed (GstMessage * msg, GstPlayState * state)
{ {
PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_DATA_PLAY_STATE, PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_STATE_CHANGED,
GST_TYPE_PLAY_STATE, state); GST_PLAY_MESSAGE_DATA_PLAY_STATE, GST_TYPE_PLAY_STATE, state);
} }
/** /**
@ -4799,15 +4805,15 @@ gst_play_message_parse_state_changed (GstMessage * msg, GstPlayState * state)
* @msg: A #GstMessage * @msg: A #GstMessage
* @percent: (out) (optional): the resulting buffering percent * @percent: (out) (optional): the resulting buffering percent
* *
* Parse the given buffering-percent @msg and extract the corresponding value * Parse the given buffering @msg and extract the corresponding value
* *
* Since: 1.20 * Since: 1.20
*/ */
void void
gst_play_message_parse_buffering_percent (GstMessage * msg, guint * percent) gst_play_message_parse_buffering_percent (GstMessage * msg, guint * percent)
{ {
PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_DATA_BUFFERING_PERCENT, PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_BUFFERING,
G_TYPE_UINT, percent); GST_PLAY_MESSAGE_DATA_BUFFERING_PERCENT, G_TYPE_UINT, percent);
} }
/** /**
@ -4824,9 +4830,10 @@ void
gst_play_message_parse_error (GstMessage * msg, GError ** error, gst_play_message_parse_error (GstMessage * msg, GError ** error,
GstStructure ** details) GstStructure ** details)
{ {
PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_DATA_ERROR, G_TYPE_ERROR, error); PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_ERROR, GST_PLAY_MESSAGE_DATA_ERROR,
PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_DATA_ERROR_DETAILS, G_TYPE_ERROR, error);
GST_TYPE_STRUCTURE, details); PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_ERROR,
GST_PLAY_MESSAGE_DATA_ERROR_DETAILS, GST_TYPE_STRUCTURE, details);
} }
/** /**
@ -4835,7 +4842,7 @@ gst_play_message_parse_error (GstMessage * msg, GError ** error,
* @error: (out) (optional) (transfer full): the resulting warning * @error: (out) (optional) (transfer full): the resulting warning
* @details: (out) (optional) (nullable) (transfer full): A #GstStructure containing additional details about the warning * @details: (out) (optional) (nullable) (transfer full): A #GstStructure containing additional details about the warning
* *
* Parse the given error @msg and extract the corresponding #GError warning * Parse the given warning @msg and extract the corresponding #GError
* *
* Since: 1.20 * Since: 1.20
*/ */
@ -4843,9 +4850,10 @@ void
gst_play_message_parse_warning (GstMessage * msg, GError ** error, gst_play_message_parse_warning (GstMessage * msg, GError ** error,
GstStructure ** details) GstStructure ** details)
{ {
PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_DATA_WARNING, G_TYPE_ERROR, error); PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_WARNING,
PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_DATA_WARNING, GST_TYPE_STRUCTURE, GST_PLAY_MESSAGE_DATA_WARNING, G_TYPE_ERROR, error);
details); PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_WARNING,
GST_PLAY_MESSAGE_DATA_WARNING_DETAILS, GST_TYPE_STRUCTURE, details);
} }
/** /**
@ -4854,7 +4862,7 @@ gst_play_message_parse_warning (GstMessage * msg, GError ** error,
* @width: (out) (optional): the resulting video width * @width: (out) (optional): the resulting video width
* @height: (out) (optional): the resulting video height * @height: (out) (optional): the resulting video height
* *
* Parse the given @msg and extract the corresponding video dimensions * Parse the given video-dimensions-changed @msg and extract the corresponding video dimensions
* *
* Since: 1.20 * Since: 1.20
*/ */
@ -4862,10 +4870,10 @@ void
gst_play_message_parse_video_dimensions_changed (GstMessage * msg, gst_play_message_parse_video_dimensions_changed (GstMessage * msg,
guint * width, guint * height) guint * width, guint * height)
{ {
PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_DATA_VIDEO_WIDTH, PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_VIDEO_DIMENSIONS_CHANGED,
G_TYPE_UINT, width); GST_PLAY_MESSAGE_DATA_VIDEO_WIDTH, G_TYPE_UINT, width);
PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_DATA_VIDEO_HEIGHT, PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_VIDEO_DIMENSIONS_CHANGED,
G_TYPE_UINT, height); GST_PLAY_MESSAGE_DATA_VIDEO_HEIGHT, G_TYPE_UINT, height);
} }
/** /**
@ -4873,7 +4881,7 @@ gst_play_message_parse_video_dimensions_changed (GstMessage * msg,
* @msg: A #GstMessage * @msg: A #GstMessage
* @info: (out) (optional) (transfer full): the resulting media info * @info: (out) (optional) (transfer full): the resulting media info
* *
* Parse the given @msg and extract the corresponding media information * Parse the given media-info-updated @msg and extract the corresponding media information
* *
* Since: 1.20 * Since: 1.20
*/ */
@ -4881,8 +4889,8 @@ void
gst_play_message_parse_media_info_updated (GstMessage * msg, gst_play_message_parse_media_info_updated (GstMessage * msg,
GstPlayMediaInfo ** info) GstPlayMediaInfo ** info)
{ {
PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_DATA_MEDIA_INFO, PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_MEDIA_INFO_UPDATED,
GST_TYPE_PLAY_MEDIA_INFO, info); GST_PLAY_MESSAGE_DATA_MEDIA_INFO, GST_TYPE_PLAY_MEDIA_INFO, info);
} }
/** /**
@ -4890,15 +4898,15 @@ gst_play_message_parse_media_info_updated (GstMessage * msg,
* @msg: A #GstMessage * @msg: A #GstMessage
* @volume: (out) (optional): the resulting audio volume * @volume: (out) (optional): the resulting audio volume
* *
* Parse the given @msg and extract the corresponding audio volume * Parse the given volume-changed @msg and extract the corresponding audio volume
* *
* Since: 1.20 * Since: 1.20
*/ */
void void
gst_play_message_parse_volume_changed (GstMessage * msg, gdouble * volume) gst_play_message_parse_volume_changed (GstMessage * msg, gdouble * volume)
{ {
PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_DATA_VOLUME, G_TYPE_DOUBLE, PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_VOLUME_CHANGED,
volume); GST_PLAY_MESSAGE_DATA_VOLUME, G_TYPE_DOUBLE, volume);
} }
/** /**
@ -4906,13 +4914,13 @@ gst_play_message_parse_volume_changed (GstMessage * msg, gdouble * volume)
* @msg: A #GstMessage * @msg: A #GstMessage
* @muted: (out) (optional): the resulting audio muted state * @muted: (out) (optional): the resulting audio muted state
* *
* Parse the given @msg and extract the corresponding audio muted state * Parse the given mute-changed @msg and extract the corresponding audio muted state
* *
* Since: 1.20 * Since: 1.20
*/ */
void void
gst_play_message_parse_muted_changed (GstMessage * msg, gboolean * muted) gst_play_message_parse_muted_changed (GstMessage * msg, gboolean * muted)
{ {
PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_DATA_IS_MUTED, G_TYPE_BOOLEAN, PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_MUTE_CHANGED,
muted); GST_PLAY_MESSAGE_DATA_IS_MUTED, G_TYPE_BOOLEAN, muted);
} }

2
subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.h
View file

@ -409,7 +409,7 @@ GstSample * gst_play_get_video_snapshot (GstPlay * play,
GstPlaySnapshotFormat format, const GstStructure * config); GstPlaySnapshotFormat format, const GstStructure * config);
GST_PLAY_API GST_PLAY_API
gboolean gst_play_is_play_message (GstMessage *msg); gboolean gst_play_is_play_message (GstMessage *msg);
GST_PLAY_API GST_PLAY_API
void gst_play_message_parse_type (GstMessage *msg, GstPlayMessage *type); void gst_play_message_parse_type (GstMessage *msg, GstPlayMessage *type);