ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-17 14:48:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dde_bsd: update mixer state report on HP sense

Browse Source 
Issue #4946.
This commit is contained in:
Josef Söntgen
2023-04-28 11:21:56 +02:00
committed by Norman Feske
parent fa3f5edcc2
commit ff0ba89e91
1 changed files with 46 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
repos/dde_bsd/src/lib/audio/driver.cc
View File

@ -85,6 +85,8 @@ struct Mixer
{ {
mixer_devinfo_t *info; mixer_devinfo_t *info;
unsigned num; unsigned num;
bool report_state;
}; };
@ -342,28 +344,22 @@ static bool open_audio_device(dev_t dev)
} }
static void configure_mixer(Genode::Env &env, Mixer &mixer, Genode::Xml_node config) static void report_mixer_state(Mixer &mixer, Genode::Env *env = nullptr)
{ {
using namespace Genode; using namespace Genode;
static Reporter mixer_reporter(env, "mixer_state"); static Constructible<Expanding_reporter> mixer_reporter { };
bool const v = config.attribute_value<bool>("report_mixer", false); if (!mixer.report_state)
mixer_reporter.enabled(v); return;
config.for_each_sub_node("mixer", [&] (Xml_node node) { if (env && !mixer_reporter.constructed())
mixer_reporter.construct(*env, "mixer_state", "mixer_state");
typedef String<32> Field; if (!mixer_reporter.constructed())
typedef String<16> Value; return;
Field const field = node.attribute_value("field", Field()); mixer_reporter->generate([&] (Xml_generator &xml) {
Value const value = node.attribute_value("value", Value());
set_mixer_value(mixer, field.string(), value.string());
});
if (mixer_reporter.enabled()) try {
Genode::Reporter::Xml_generator xml(mixer_reporter, [&]() {
for (unsigned i = 0; i < mixer.num; i++) { for (unsigned i = 0; i < mixer.num; i++) {
if (mixer.info[i].type == AUDIO_MIXER_CLASS) if (mixer.info[i].type == AUDIO_MIXER_CLASS)
@ -386,7 +382,26 @@ static void configure_mixer(Genode::Env &env, Mixer &mixer, Genode::Xml_node con
} }
} }
}); });
} catch (...) { Genode::warning("Could not report mixer state"); } }
static void configure_mixer(Genode::Env &env, Mixer &mixer, Genode::Xml_node config)
{
using namespace Genode;
config.for_each_sub_node("mixer", [&] (Xml_node node) {
typedef String<32> Field;
typedef String<16> Value;
Field const field = node.attribute_value("field", Field());
Value const value = node.attribute_value("value", Value());
set_mixer_value(mixer, field.string(), value.string());
});
mixer.report_state = config.attribute_value<bool>("report_mixer", false);
report_mixer_state(mixer, &env);
} }
@ -601,6 +616,8 @@ extern "C" void notify_record()
extern "C" void notify_hp_sense(int const sense) extern "C" void notify_hp_sense(int const sense)
{ {
set_mixer_value(mixer, "record.adc-0:1_source", sense ? "mic2" : "mic"); set_mixer_value(mixer, "record.adc-0:1_source", sense ? "mic2" : "mic");
report_mixer_state(mixer, nullptr);
} }