Zander671/Waybar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3464 from findus/pulseaudio-default-sink

Browse Source 
pulseaudio: volume indicator update on default output switch
This commit is contained in:
Alexis Rouillard
2024-10-25 08:52:18 +02:00
committed by GitHub
parent dacecb9b26 57156bce7e
commit 9d89ddae9b
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/util/audio_backend.hpp
View File

@ -38,6 +38,8 @@ class AudioBackend {
std::string desc_; std::string desc_;
std::string monitor_; std::string monitor_;
std::string current_sink_name_; std::string current_sink_name_;
std::string default_sink_name;
bool default_sink_running_;
bool current_sink_running_; bool current_sink_running_;
// SOURCE // SOURCE
uint32_t source_idx_{0}; uint32_t source_idx_{0};

22
src/util/audio_backend.cpp
View File

@ -1,9 +1,12 @@
#include "util/audio_backend.hpp" #include "util/audio_backend.hpp"
#include <fmt/core.h> #include <fmt/core.h>
#include <pulse/def.h>
#include <pulse/error.h> #include <pulse/error.h>
#include <pulse/introspect.h>
#include <pulse/subscribe.h> #include <pulse/subscribe.h>
#include <pulse/volume.h> #include <pulse/volume.h>
#include <spdlog/spdlog.h>
#include <algorithm> #include <algorithm>
#include <cmath> #include <cmath>
@ -139,6 +142,10 @@ void AudioBackend::sinkInfoCb(pa_context * /*context*/, const pa_sink_info *i, i
void *data) { void *data) {
if (i == nullptr) return; if (i == nullptr) return;
auto running = i->state == PA_SINK_RUNNING;
auto idle = i->state == PA_SINK_IDLE;
spdlog::trace("Sink name {} Running:[{}] Idle:[{}]", i->name, running, idle);
auto *backend = static_cast<AudioBackend *>(data); auto *backend = static_cast<AudioBackend *>(data);
if (!backend->ignored_sinks_.empty()) { if (!backend->ignored_sinks_.empty()) {
@ -155,11 +162,19 @@ void AudioBackend::sinkInfoCb(pa_context * /*context*/, const pa_sink_info *i, i
} }
} }
if (backend->current_sink_name_ == i->name) { backend->default_sink_running_ = backend->default_sink_name == i->name &&
backend->current_sink_running_ = i->state == PA_SINK_RUNNING; (i->state == PA_SINK_RUNNING || i->state == PA_SINK_IDLE);
if (i->name != backend->default_sink_name && !backend->default_sink_running_) {
return;
} }
if (!backend->current_sink_running_ && i->state == PA_SINK_RUNNING) { if (backend->current_sink_name_ == i->name) {
backend->current_sink_running_ = (i->state == PA_SINK_RUNNING || i->state == PA_SINK_IDLE);
}
if (!backend->current_sink_running_ &&
(i->state == PA_SINK_RUNNING || i->state == PA_SINK_IDLE)) {
backend->current_sink_name_ = i->name; backend->current_sink_name_ = i->name;
backend->current_sink_running_ = true; backend->current_sink_running_ = true;
} }
@ -207,6 +222,7 @@ void AudioBackend::sourceInfoCb(pa_context * /*context*/, const pa_source_info *
void AudioBackend::serverInfoCb(pa_context *context, const pa_server_info *i, void *data) { void AudioBackend::serverInfoCb(pa_context *context, const pa_server_info *i, void *data) {
auto *backend = static_cast<AudioBackend *>(data); auto *backend = static_cast<AudioBackend *>(data);
backend->current_sink_name_ = i->default_sink_name; backend->current_sink_name_ = i->default_sink_name;
backend->default_sink_name = i->default_sink_name;
backend->default_source_name_ = i->default_source_name; backend->default_source_name_ = i->default_source_name;
pa_context_get_sink_info_list(context, sinkInfoCb, data); pa_context_get_sink_info_list(context, sinkInfoCb, data);