applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sound: Respect allow-volume-above-100-percent setting

Browse source 
Instead of always allowing above 100% volumes for hardware that supports
it, only enable it when the allow-volume-above-100-percent setting is
set to true as well.

See https://bugzilla.gnome.org/show_bug.cgi?id=790988

https://bugzilla.gnome.org/show_bug.cgi?id=791272
This commit is contained in:
Bastien Nocera 2018-01-12 19:27:09 +01:00
parent b3d51d9051
commit 7ce6bd1e55
2 changed files with 41 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -98,7 +98,7 @@ NETWORK_MANAGER_APPLET_REQUIRED_VERSION=1.2.0
MODEM_MANAGER_REQUIRED_VERSION=0.7 MODEM_MANAGER_REQUIRED_VERSION=0.7
LIBNOTIFY_REQUIRED_VERSION=0.7.3 LIBNOTIFY_REQUIRED_VERSION=0.7.3
GNOME_DESKTOP_REQUIRED_VERSION=3.21.2 GNOME_DESKTOP_REQUIRED_VERSION=3.21.2
SCHEMAS_REQUIRED_VERSION=3.21.4 SCHEMAS_REQUIRED_VERSION=3.27.2
LIBWACOM_REQUIRED_VERSION=0.7 LIBWACOM_REQUIRED_VERSION=0.7
CLUTTER_REQUIRED_VERSION=1.11.3 CLUTTER_REQUIRED_VERSION=1.11.3
GOA_REQUIRED_VERSION=3.25.3 GOA_REQUIRED_VERSION=3.25.3

40
panels/sound/gvc-mixer-dialog.c
View file

@ -44,6 +44,7 @@
#include "gvc-speaker-test.h" #include "gvc-speaker-test.h"
#include "gvc-mixer-control-private.h" #include "gvc-mixer-control-private.h"
#define KEY_SOUNDS_SCHEMA "org.gnome.desktop.sound"
#define SCALE_SIZE 128 #define SCALE_SIZE 128
struct _GvcMixerDialog struct _GvcMixerDialog
@ -78,6 +79,8 @@ struct _GvcMixerDialog
GtkWidget *test_dialog; GtkWidget *test_dialog;
GtkSizeGroup *size_group; GtkSizeGroup *size_group;
GSettings *settings;
gboolean allow_volume_above_100_percent;
gdouble last_input_peak; gdouble last_input_peak;
guint num_apps; guint num_apps;
}; };
@ -189,6 +192,7 @@ update_output_settings (GvcMixerDialog *dialog,
gvc_channel_bar_set_base_volume (GVC_CHANNEL_BAR (dialog->output_bar), gvc_channel_bar_set_base_volume (GVC_CHANNEL_BAR (dialog->output_bar),
gvc_mixer_stream_get_base_volume (stream)); gvc_mixer_stream_get_base_volume (stream));
gvc_channel_bar_set_is_amplified (GVC_CHANNEL_BAR (dialog->output_bar), gvc_channel_bar_set_is_amplified (GVC_CHANNEL_BAR (dialog->output_bar),
dialog->allow_volume_above_100_percent &&
gvc_mixer_stream_get_can_decibel (stream)); gvc_mixer_stream_get_can_decibel (stream));
/* Update the adjustment in case the previous bar wasn't decibel /* Update the adjustment in case the previous bar wasn't decibel
@ -500,6 +504,7 @@ update_input_settings (GvcMixerDialog *dialog,
gvc_channel_bar_set_base_volume (GVC_CHANNEL_BAR (dialog->input_bar), gvc_channel_bar_set_base_volume (GVC_CHANNEL_BAR (dialog->input_bar),
gvc_mixer_stream_get_base_volume (stream)); gvc_mixer_stream_get_base_volume (stream));
gvc_channel_bar_set_is_amplified (GVC_CHANNEL_BAR (dialog->input_bar), gvc_channel_bar_set_is_amplified (GVC_CHANNEL_BAR (dialog->input_bar),
dialog->allow_volume_above_100_percent &&
gvc_mixer_stream_get_can_decibel (stream)); gvc_mixer_stream_get_can_decibel (stream));
/* Update the adjustment in case the previous bar wasn't decibel /* Update the adjustment in case the previous bar wasn't decibel
@ -1904,6 +1909,34 @@ gvc_mixer_dialog_class_init (GvcMixerDialogClass *klass)
G_PARAM_READWRITE|G_PARAM_CONSTRUCT)); G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
} }
static void
allow_volume_above_100_percent_cb (GObject *gobject,
GParamSpec *pspec,
gpointer user_data)
{
GvcMixerDialog *dialog = user_data;
gboolean output_amplified, input_amplified;
dialog->allow_volume_above_100_percent = g_settings_get_boolean (dialog->settings,
"allow-volume-above-100-percent");
if (dialog->allow_volume_above_100_percent) {
GvcMixerStream *stream;
stream = g_object_get_data (G_OBJECT (dialog->output_bar), "gvc-mixer-dialog-stream");
output_amplified = gvc_mixer_stream_get_can_decibel (stream);
stream = g_object_get_data (G_OBJECT (dialog->input_bar), "gvc-mixer-dialog-stream");
input_amplified = gvc_mixer_stream_get_can_decibel (stream);
} else {
output_amplified = input_amplified = FALSE;
}
gvc_channel_bar_set_is_amplified (GVC_CHANNEL_BAR (dialog->output_bar),
output_amplified);
gvc_channel_bar_set_is_amplified (GVC_CHANNEL_BAR (dialog->input_bar),
input_amplified);
}
static void static void
gvc_mixer_dialog_init (GvcMixerDialog *dialog) gvc_mixer_dialog_init (GvcMixerDialog *dialog)
@ -1912,6 +1945,12 @@ gvc_mixer_dialog_init (GvcMixerDialog *dialog)
GTK_ORIENTATION_VERTICAL); GTK_ORIENTATION_VERTICAL);
dialog->bars = g_hash_table_new (NULL, NULL); dialog->bars = g_hash_table_new (NULL, NULL);
dialog->size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); dialog->size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
dialog->settings = g_settings_new (KEY_SOUNDS_SCHEMA);
g_signal_connect (dialog->settings, "changed::allow-volume-above-100-percent",
G_CALLBACK (allow_volume_above_100_percent_cb), dialog);
dialog->allow_volume_above_100_percent = g_settings_get_boolean (dialog->settings,
"allow-volume-above-100-percent");
} }
static void static void
@ -1925,6 +1964,7 @@ gvc_mixer_dialog_finalize (GObject *object)
mixer_dialog = GVC_MIXER_DIALOG (object); mixer_dialog = GVC_MIXER_DIALOG (object);
g_return_if_fail (mixer_dialog != NULL); g_return_if_fail (mixer_dialog != NULL);
g_clear_object (&mixer_dialog->settings);
G_OBJECT_CLASS (gvc_mixer_dialog_parent_class)->finalize (object); G_OBJECT_CLASS (gvc_mixer_dialog_parent_class)->finalize (object);
} }