RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 19:27:45 +00:00
Code Issues Activity Actions

AudioApplet: Use LibConfig instead of Core::ConfigFile

Browse source 
No longer need to store `RefPtr<Core::ConfigFile>` :^)
This commit is contained in:
Mustafa Quraish 2021-08-27 09:37:36 -04:00 • committed by Andreas Kling
parent 0af3855fb9
commit c646efaf49
2 changed files with 10 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Applets/Audio/CMakeLists.txt
View file

@ -9,4 +9,4 @@ set(SOURCES
) )
serenity_app(Audio.Applet ICON audio-volume-high) serenity_app(Audio.Applet ICON audio-volume-high)
target_link_libraries(Audio.Applet LibGUI LibGfx LibAudio LibCore) target_link_libraries(Audio.Applet LibGUI LibGfx LibAudio LibCore LibConfig)

28
Userland/Applets/Audio/main.cpp
View file

@ -6,7 +6,7 @@
*/ */
#include <LibAudio/ClientConnection.h> #include <LibAudio/ClientConnection.h>
#include <LibCore/ConfigFile.h> #include <LibConfig/Client.h>
#include <LibGUI/Application.h> #include <LibGUI/Application.h>
#include <LibGUI/BoxLayout.h> #include <LibGUI/BoxLayout.h>
#include <LibGUI/CheckBox.h> #include <LibGUI/CheckBox.h>
@ -22,10 +22,9 @@
class AudioWidget final : public GUI::Widget { class AudioWidget final : public GUI::Widget {
C_OBJECT(AudioWidget) C_OBJECT(AudioWidget)
public: public:
AudioWidget(NonnullRefPtr<Core::ConfigFile> config, int initial_volume, bool initial_mute_state) AudioWidget(int initial_volume, bool initial_mute_state)
: m_audio_client(Audio::ClientConnection::construct()) : m_audio_client(Audio::ClientConnection::construct())
, m_config(move(config)) , m_show_percent(Config::read_bool("AudioApplet", "Applet", "ShowPercent", false))
, m_show_percent(m_config->read_bool_entry("Applet", "ShowPercent", false))
, m_audio_muted(initial_mute_state) , m_audio_muted(initial_mute_state)
, m_audio_volume(initial_volume) , m_audio_volume(initial_volume)
{ {
@ -85,10 +84,7 @@ public:
reposition_slider_window(); reposition_slider_window();
GUI::Application::the()->hide_tooltip(); GUI::Application::the()->hide_tooltip();
m_config->write_bool_entry("Applet", "ShowPercent", m_show_percent); Config::write_bool("AudioApplet", "Applet", "ShowPercent", m_show_percent);
auto sync_success = m_config->sync();
if (!sync_success)
warnln("Could not write applet configuration.");
}; };
m_slider = m_root_container->add<GUI::VerticalSlider>(); m_slider = m_root_container->add<GUI::VerticalSlider>();
@ -191,7 +187,6 @@ private:
}; };
NonnullRefPtr<Audio::ClientConnection> m_audio_client; NonnullRefPtr<Audio::ClientConnection> m_audio_client;
NonnullRefPtr<Core::ConfigFile> m_config;
Vector<VolumeBitmapPair, 5> m_volume_level_bitmaps; Vector<VolumeBitmapPair, 5> m_volume_level_bitmaps;
bool m_show_percent { false }; bool m_show_percent { false };
bool m_audio_muted { false }; bool m_audio_muted { false };
@ -211,22 +206,21 @@ int main(int argc, char** argv)
return 1; return 1;
} }
auto config = Core::ConfigFile::open_for_app("AudioApplet", Core::ConfigFile::AllowWriting::Yes);
// To not upset the audio server state, we responsibly read this once.
auto audio_master_config = Core::ConfigFile::open_for_app("Audio");
auto app = GUI::Application::construct(argc, argv); auto app = GUI::Application::construct(argc, argv);
Config::pledge_domains({ "Audio", "AudioApplet" });
auto window = GUI::Window::construct(); auto window = GUI::Window::construct();
window->set_has_alpha_channel(true); window->set_has_alpha_channel(true);
window->set_title("Audio"); window->set_title("Audio");
window->set_window_type(GUI::WindowType::Applet); window->set_window_type(GUI::WindowType::Applet);
window->set_main_widget<AudioWidget>(config, audio_master_config->read_num_entry("Master", "Volume", 100), audio_master_config->read_bool_entry("Master", "Mute", false)); auto initial_volume = Config::read_i32("Audio", "Master", "Volume", 100);
auto initial_muted = Config::read_bool("Audio", "Master", "Muted", false);
window->set_main_widget<AudioWidget>(initial_volume, initial_muted);
window->show(); window->show();
// This positioning code depends on the window actually existing. // This positioning code depends on the window actually existing.
if (!config->read_bool_entry("Applet", "ShowPercent")) { if (!Config::read_bool("AudioApplet", "Applet", "ShowPercent", false)) {
window->resize(16, 16); window->resize(16, 16);
} else { } else {
window->resize(44, 16); window->resize(44, 16);
@ -236,10 +230,6 @@ int main(int argc, char** argv)
perror("unveil"); perror("unveil");
return 1; return 1;
} }
if (unveil(config->filename().characters(), "rwc") < 0) {
perror("unveil");
return 1;
}
unveil(nullptr, nullptr); unveil(nullptr, nullptr);