aboutsummaryrefslogtreecommitdiff
path: root/src/options-gsettings.vala
diff options
context:
space:
mode:
authorRobert Tari <robert@tari.in>2021-11-09 23:43:40 +0100
committerRobert Tari <robert@tari.in>2021-11-10 00:32:47 +0100
commit9cb09d85c6b652e0c7c683973a9fce10f8f5209f (patch)
treeb419599d61efaa0bc63bed29b66bd5a855286629 /src/options-gsettings.vala
parentb5989ea9d655339b8d2cdcd35e11478c566007ec (diff)
downloadayatana-indicator-sound-9cb09d85c6b652e0c7c683973a9fce10f8f5209f.tar.gz
ayatana-indicator-sound-9cb09d85c6b652e0c7c683973a9fce10f8f5209f.tar.bz2
ayatana-indicator-sound-9cb09d85c6b652e0c7c683973a9fce10f8f5209f.zip
Drop data/org.ayatana.sound.gschema.xml
Diffstat (limited to 'src/options-gsettings.vala')
-rw-r--r--src/options-gsettings.vala10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/options-gsettings.vala b/src/options-gsettings.vala
index 5691a17..17e07c6 100644
--- a/src/options-gsettings.vala
+++ b/src/options-gsettings.vala
@@ -1,6 +1,7 @@
/*
* -*- Mode:Vala; indent-tabs-mode:t; tab-width:4; encoding:utf8 -*-
* Copyright 2015 Canonical Ltd.
+ * Copyright 2021 Robert Tari
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,6 +17,7 @@
*
* Authors:
* Charles Kerr <charles.kerr@canonical.com>
+ * Robert Tari <robert@tari.in>
*/
using PulseAudio;
@@ -33,8 +35,6 @@ public class IndicatorSound.OptionsGSettings : Options
private Settings _settings = new Settings ("org.ayatana.indicator.sound");
#if HAS_LOMIRI_SOUND_SCHEMA
private Settings _shared_settings = new Settings ("com.lomiri.sound");
-#else
- private Settings _shared_settings = new Settings ("org.ayatana.sound");
#endif
/** MAX VOLUME PROPERTY **/
@@ -45,7 +45,9 @@ public class IndicatorSound.OptionsGSettings : Options
private void init_max_volume() {
_settings.changed[NORMAL_dB_KEY].connect(() => update_max_volume());
_settings.changed[AMP_dB_KEY].connect(() => update_max_volume());
+#if HAS_LOMIRI_SOUND_SCHEMA
_shared_settings.changed[ALLOW_AMP_KEY].connect(() => update_max_volume());
+#endif
update_max_volume();
}
private void update_max_volume () {
@@ -58,9 +60,13 @@ public class IndicatorSound.OptionsGSettings : Options
}
}
private double calculate_max_volume () {
+#if HAS_LOMIRI_SOUND_SCHEMA
unowned string decibel_key = _shared_settings.get_boolean(ALLOW_AMP_KEY)
? AMP_dB_KEY
: NORMAL_dB_KEY;
+#else
+ unowned string decibel_key = NORMAL_dB_KEY;
+#endif
var volume_dB = _settings.get_double(decibel_key);
var volume_sw = PulseAudio.Volume.sw_from_dB (volume_dB);
return VolumeControlPulse.volume_to_double (volume_sw);