1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
|
diff -rupN old/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in new/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
--- old/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in 2015-05-04 15:32:57.000000000 +0200
+++ new/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in 2015-05-29 11:55:56.423075521 +0200
@@ -124,5 +124,11 @@
<_summary>Priority to use for this plugin</_summary>
<_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
</key>
+ <key name="volume-step" type="i">
+ <default>6</default>
+ <range min="1" max="20"/>
+ <_summary>Size of volume step</_summary>
+ <_description>Size of the volume step for each consecutive press of the volume up or volume down key</_description>
+ </key>
</schema>
</schemalist>
diff -rupN old/plugins/media-keys/gsd-media-keys-manager.c new/plugins/media-keys/gsd-media-keys-manager.c
--- old/plugins/media-keys/gsd-media-keys-manager.c 2015-05-04 15:32:57.000000000 +0200
+++ new/plugins/media-keys/gsd-media-keys-manager.c 2015-05-29 12:04:31.312850233 +0200
@@ -102,10 +102,11 @@ static const gchar introspection_xml[] =
#define SETTINGS_POWER_DIR "org.gnome.settings-daemon.plugins.power"
#define SETTINGS_XSETTINGS_DIR "org.gnome.settings-daemon.plugins.xsettings"
#define SETTINGS_TOUCHPAD_DIR "org.gnome.desktop.peripherals.touchpad"
+#define SETTINGS_SOUND_DIR "org.gnome.settings-daemon.plugins.sound"
#define TOUCHPAD_ENABLED_KEY "send-events"
+#define VOLUME_STEP_KEY "volume-step"
#define HIGH_CONTRAST "HighContrast"
-#define VOLUME_STEP 6 /* percents for one volume button press */
#define MAX_VOLUME 65536.0
#define SYSTEMD_DBUS_NAME "org.freedesktop.login1"
@@ -144,6 +145,7 @@ struct GsdMediaKeysManagerPrivate
GvcMixerStream *source;
ca_context *ca;
GtkSettings *gtksettings;
+ GSettings *sound_settings;
#ifdef HAVE_GUDEV
GHashTable *streams; /* key = X device ID, value = stream id */
GUdevClient *udev_client;
@@ -1180,7 +1182,7 @@ do_sound_action (GsdMediaKeysManager *ma
{
GvcMixerStream *stream;
gboolean old_muted, new_muted;
- guint old_vol, new_vol, norm_vol_step;
+ guint old_vol, new_vol, vol_step, norm_vol_step;
gboolean sound_changed;
/* Find the stream that corresponds to the device, if any */
@@ -1199,7 +1201,8 @@ do_sound_action (GsdMediaKeysManager *ma
if (stream == NULL)
return;
- norm_vol_step = PA_VOLUME_NORM * VOLUME_STEP / 100;
+ vol_step = g_settings_get_int (manager->priv->sound_settings, VOLUME_STEP_KEY);
+ norm_vol_step = PA_VOLUME_NORM * vol_step / 100;
/* FIXME: this is racy */
new_vol = old_vol = gvc_mixer_stream_get_volume (stream);
@@ -2357,6 +2360,8 @@ start_media_keys_idle_cb (GsdMediaKeysMa
g_hash_table_new_full (g_str_hash, g_str_equal,
g_free, g_object_unref);
+ manager->priv->sound_settings = g_settings_new (SETTINGS_SOUND_DIR);
+
/* for the power plugin interface code */
manager->priv->power_settings = g_settings_new (SETTINGS_POWER_DIR);
@@ -2460,6 +2465,7 @@ gsd_media_keys_manager_stop (GsdMediaKey
g_clear_object (&priv->logind_proxy);
g_clear_object (&priv->settings);
+ g_clear_object (&priv->sound_settings);
g_clear_object (&priv->power_settings);
g_clear_object (&priv->power_proxy);
g_clear_object (&priv->power_screen_proxy);
|