Verified Commit 2a7a100a authored by Georges Basile Stavracas Neto's avatar Georges Basile Stavracas Neto
Browse files

mixer-control: Remove unnecessary instance checks

gvc_mixer_control_get_vol_max_norm() and gvc_mixer_control_get_vol_max_amplified()
do not access any of the instance variables. In GNOME Settings, we even
pass NULL to these functions. So checking the instance is not necessary.

In fact, this is causing instance check failures in GNOME Settings, and
the entire Sound panel is broken since those functions are returning zero.

The reason that only the checks are being dropped, and not the parameter
entirely, is to preserve API compatibility.
parent 468022b7
Pipeline #88569 passed with stage
in 3 minutes and 29 seconds
......@@ -3744,13 +3744,11 @@ gvc_mixer_control_new (const char *name)
gdouble
gvc_mixer_control_get_vol_max_norm (GvcMixerControl *control)
{
g_return_val_if_fail (GVC_IS_MIXER_CONTROL (control), 0);
return (gdouble) PA_VOLUME_NORM;
}
gdouble
gvc_mixer_control_get_vol_max_amplified (GvcMixerControl *control)
{
g_return_val_if_fail (GVC_IS_MIXER_CONTROL (control), 0);
return (gdouble) PA_VOLUME_UI_MAX;
}
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