aboutsummaryrefslogtreecommitdiff
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
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
-rw-r--r--data/CMakeLists.txt4
-rw-r--r--data/org.ayatana.sound.gschema.xml9
-rw-r--r--src/options-gsettings.vala10
-rw-r--r--tests/CMakeLists.txt5
-rw-r--r--tests/integration/indicator-sound-test-base.cpp10
5 files changed, 15 insertions, 23 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index c7634b8..f2873d9 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -66,10 +66,6 @@ install(
add_schema ("org.ayatana.indicator.sound.gschema.xml")
-if(NOT EXISTS /usr/share/glib-2.0/schemas/com.lomiri.sound.gschema.xml)
- add_schema ("org.ayatana.sound.gschema.xml")
-endif()
-
#########################################
# Accounts Service Iface: Sound Indicator
#########################################
diff --git a/data/org.ayatana.sound.gschema.xml b/data/org.ayatana.sound.gschema.xml
deleted file mode 100644
index 8c3bd73..0000000
--- a/data/org.ayatana.sound.gschema.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schemalist gettext-domain="ayatana-indicator-sound">
- <schema path="/org/ayatana/sound/" id="org.ayatana.sound">
- <key type="b" name="allow-amplified-volume">
- <default>false</default>
- <summary>Whether the volume slider allows setting the volume above 100%</summary>
- </key>
- </schema>
-</schemalist>
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);
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 75dab34..30b0e13 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -34,10 +34,7 @@ add_custom_target (
set (XDG_DATA_DIRS "${CMAKE_CURRENT_BINARY_DIR}/gsettings-schemas")
set (SCHEMA_DIR "${XDG_DATA_DIRS}/glib-2.0/schemas")
if (EXISTS /usr/share/glib-2.0/schemas/com.lomiri.sound.gschema.xml)
- set (SOUND_SCHEMA /usr/share/glib-2.0/schemas/com.lomiri.sound.gschema.xml)
add_definitions ( -DHAS_LOMIRI_SOUND_SCHEMA )
-else()
- set (SOUND_SCHEMA ${CMAKE_SOURCE_DIR}/data/org.ayatana.sound.gschema.xml)
endif()
add_definitions(-DSCHEMA_DIR="${SCHEMA_DIR}")
execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas
@@ -47,7 +44,7 @@ add_custom_command (OUTPUT gschemas.compiled
DEPENDS ${CMAKE_SOURCE_DIR}/data/org.ayatana.indicator.sound.gschema.xml
COMMAND mkdir -p ${SCHEMA_DIR}
COMMAND cp -f ${CMAKE_SOURCE_DIR}/data/org.ayatana.indicator.sound.gschema.xml ${SCHEMA_DIR}
- COMMAND cp -f ${SOUND_SCHEMA} ${SCHEMA_DIR}
+ COMMAND test -e /usr/share/glib-2.0/schemas/com.lomiri.sound.gschema.xml && cp -f /usr/share/glib-2.0/schemas/com.lomiri.sound.gschema.xml ${SCHEMA_DIR} || echo "File does not exist" >&2
COMMAND ${COMPILE_SCHEMA_EXECUTABLE} ${SCHEMA_DIR})
add_custom_target (
diff --git a/tests/integration/indicator-sound-test-base.cpp b/tests/integration/indicator-sound-test-base.cpp
index 45e8acc..3217764 100644
--- a/tests/integration/indicator-sound-test-base.cpp
+++ b/tests/integration/indicator-sound-test-base.cpp
@@ -179,18 +179,20 @@ bool IndicatorSoundTestBase::clearGSettingsPlayers()
bool IndicatorSoundTestBase::resetAllowAmplifiedVolume()
{
+#if HAS_LOMIRI_SOUND_SCHEMA
QProcess proc;
proc.start("gsettings", QStringList()
<< "reset"
-#ifdef HAS_LOMIRI_SOUND_SCHEMA
+
<< "com.lomiri.sound"
-#else
- << "org.ayatana.sound"
-#endif
+
<< "allow-amplified-volume");
return runProcess(proc);
+#else
+ return TRUE;
+#endif
}
bool IndicatorSoundTestBase::runProcess(QProcess& proc)