From ca1b8db04afaaa42eefe1b5e9560fa036fbb30f4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 29 Feb 2008 17:59:16 +0000 Subject: [PATCH] gst-libs/gst/interfaces/mixer.c: De-cruft and fix message type assertions (NULL is not a really valid mixer message t... Original commit message from CVS: * gst-libs/gst/interfaces/mixer.c: (GST_MIXER_MESSAGE_HAS_TYPE), (gst_mixer_message_parse_mute_toggled), (gst_mixer_message_parse_record_toggled), (gst_mixer_message_parse_volume_changed), (gst_mixer_message_parse_option_changed): De-cruft and fix message type assertions (NULL is not a really valid mixer message type string). --- ChangeLog | 10 ++++++++++ common | 2 +- gst-libs/gst/interfaces/mixer.c | 27 +++++++++++---------------- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4663948..3567a67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-02-29 Tim-Philipp Müller + + * gst-libs/gst/interfaces/mixer.c: (GST_MIXER_MESSAGE_HAS_TYPE), + (gst_mixer_message_parse_mute_toggled), + (gst_mixer_message_parse_record_toggled), + (gst_mixer_message_parse_volume_changed), + (gst_mixer_message_parse_option_changed): + De-cruft and fix message type assertions (NULL is not a really + valid mixer message type string). + 2008-02-29 Wim Taymans * ext/libvisual/visual.c: (gst_vis_src_negotiate): diff --git a/common b/common index e746d20..4fa1159 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit e746d20ef536a73aea9964666c7d5f6d5c9465df +Subproject commit 4fa1159996900100f3a1cd3b43d7f0f027310cdb diff --git a/gst-libs/gst/interfaces/mixer.c b/gst-libs/gst/interfaces/mixer.c index 49ef7d9..f8c91bf 100644 --- a/gst-libs/gst/interfaces/mixer.c +++ b/gst-libs/gst/interfaces/mixer.c @@ -549,6 +549,9 @@ gst_mixer_message_get_type (GstMessage * message) return GST_MIXER_MESSAGE_INVALID; } +#define GST_MIXER_MESSAGE_HAS_TYPE(msg,msg_type) \ +(gst_mixer_message_get_type (msg) == GST_MIXER_MESSAGE_ ## msg_type) + /** * gst_mixer_message_parse_mute_toggled: * @message: A mute-toggled change notification message. @@ -568,13 +571,11 @@ gst_mixer_message_parse_mute_toggled (GstMessage * message, GstMixerTrack ** track, gboolean * mute) { const GstStructure *s; - const gchar *m_type; g_return_if_fail (gst_mixer_message_is_mixer_message (message)); - s = gst_message_get_structure (message); + g_return_if_fail (GST_MIXER_MESSAGE_HAS_TYPE (message, MUTE_TOGGLED)); - m_type = gst_structure_get_string (s, "type"); - g_return_if_fail (m_type == NULL || g_str_equal (m_type, "mute-toggled")); + s = gst_message_get_structure (message); if (track) { const GValue *v = gst_structure_get_value (s, "track"); @@ -607,13 +608,11 @@ gst_mixer_message_parse_record_toggled (GstMessage * message, GstMixerTrack ** track, gboolean * record) { const GstStructure *s; - const gchar *m_type; g_return_if_fail (gst_mixer_message_is_mixer_message (message)); - s = gst_message_get_structure (message); + g_return_if_fail (GST_MIXER_MESSAGE_HAS_TYPE (message, RECORD_TOGGLED)); - m_type = gst_structure_get_string (s, "type"); - g_return_if_fail (m_type == NULL || g_str_equal (m_type, "record-toggled")); + s = gst_message_get_structure (message); if (track) { const GValue *v = gst_structure_get_value (s, "track"); @@ -649,13 +648,11 @@ gst_mixer_message_parse_volume_changed (GstMessage * message, GstMixerTrack ** track, gint ** volumes, gint * num_channels) { const GstStructure *s; - const gchar *m_type; g_return_if_fail (gst_mixer_message_is_mixer_message (message)); - s = gst_message_get_structure (message); + g_return_if_fail (GST_MIXER_MESSAGE_HAS_TYPE (message, VOLUME_CHANGED)); - m_type = gst_structure_get_string (s, "type"); - g_return_if_fail (m_type == NULL || g_str_equal (m_type, "volume-changed")); + s = gst_message_get_structure (message); if (track) { const GValue *v = gst_structure_get_value (s, "track"); @@ -706,13 +703,11 @@ gst_mixer_message_parse_option_changed (GstMessage * message, GstMixerOptions ** options, const gchar ** value) { const GstStructure *s; - const gchar *m_type; g_return_if_fail (gst_mixer_message_is_mixer_message (message)); - s = gst_message_get_structure (message); + g_return_if_fail (GST_MIXER_MESSAGE_HAS_TYPE (message, OPTION_CHANGED)); - m_type = gst_structure_get_string (s, "type"); - g_return_if_fail (m_type == NULL || g_str_equal (m_type, "option-changed")); + s = gst_message_get_structure (message); if (options) { const GValue *v = gst_structure_get_value (s, "options"); -- 2.7.4