From bb4af295bc2ee493a3f680c621449566d206976c Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 21 May 2019 14:53:31 +0200 Subject: [PATCH] feat(pulseaudio): source info --- include/modules/pulseaudio.hpp | 22 +++++++++----- resources/config | 4 ++- src/modules/pulseaudio.cpp | 54 +++++++++++++++++++++++++++++----- 3 files changed, 64 insertions(+), 16 deletions(-) diff --git a/include/modules/pulseaudio.hpp b/include/modules/pulseaudio.hpp index 7d4b6290..9f92374a 100644 --- a/include/modules/pulseaudio.hpp +++ b/include/modules/pulseaudio.hpp @@ -18,6 +18,7 @@ class Pulseaudio : public ALabel { static void subscribeCb(pa_context*, pa_subscription_event_type_t, uint32_t, void*); static void contextStateCb(pa_context*, void*); static void sinkInfoCb(pa_context*, const pa_sink_info*, int, void*); + static void sourceInfoCb(pa_context*, const pa_source_info* i, int, void* data); static void serverInfoCb(pa_context*, const pa_server_info*, void*); static void volumeModifyCb(pa_context*, int, void*); bool handleVolume(GdkEventScroll* e); @@ -27,14 +28,21 @@ class Pulseaudio : public ALabel { pa_threaded_mainloop* mainloop_; pa_mainloop_api* mainloop_api_; pa_context* context_; - uint32_t sink_idx_{0}; - uint16_t volume_; - pa_cvolume pa_volume_; - bool muted_; - std::string port_name_; - std::string desc_; - std::string monitor_; bool scrolling_; + // SINK + uint32_t sink_idx_{0}; + uint16_t volume_; + pa_cvolume pa_volume_; + bool muted_; + std::string port_name_; + std::string desc_; + std::string monitor_; + // SOURCE + uint32_t source_idx_{0}; + uint16_t source_volume_; + bool source_muted_; + std::string source_port_name_; + std::string source_desc_; }; } // namespace waybar::modules diff --git a/resources/config b/resources/config index f5349895..c5742d37 100644 --- a/resources/config +++ b/resources/config @@ -112,9 +112,11 @@ }, "pulseaudio": { // "scroll-step": 1, // %, can be a float - "format": "{volume}% {icon}", + "format": "{volume}% {icon} {format_source}", "format-bluetooth": "{volume}% {icon}", "format-muted": "", + "format-source": "{volume}% ", + "format-source-muted": "", "format-icons": { "headphones": "", "handsfree": "", diff --git a/src/modules/pulseaudio.cpp b/src/modules/pulseaudio.cpp index 9200ece3..dc6b0641 100644 --- a/src/modules/pulseaudio.cpp +++ b/src/modules/pulseaudio.cpp @@ -1,15 +1,18 @@ #include "modules/pulseaudio.hpp" -#include +#include waybar::modules::Pulseaudio::Pulseaudio(const std::string &id, const Json::Value &config) : ALabel(config, "{volume}%"), mainloop_(nullptr), mainloop_api_(nullptr), context_(nullptr), + scrolling_(false), sink_idx_(0), volume_(0), muted_(false), - scrolling_(false) { + source_idx_(0), + source_volume_(0), + source_muted_(false) { label_.set_name("pulseaudio"); if (!id.empty()) { label_.get_style_context()->add_class(id); @@ -58,7 +61,12 @@ void waybar::modules::Pulseaudio::contextStateCb(pa_context *c, void *data) { case PA_CONTEXT_READY: pa_context_get_server_info(c, serverInfoCb, data); pa_context_set_subscribe_callback(c, subscribeCb, data); - pa_context_subscribe(c, PA_SUBSCRIPTION_MASK_SINK, nullptr, nullptr); + pa_context_subscribe( + c, + static_cast(static_cast(PA_SUBSCRIPTION_MASK_SINK) | + static_cast(PA_SUBSCRIPTION_MASK_SOURCE)), + nullptr, + nullptr); break; case PA_CONTEXT_FAILED: pa->mainloop_api_->quit(pa->mainloop_api_, 1); @@ -76,10 +84,10 @@ bool waybar::modules::Pulseaudio::handleVolume(GdkEventScroll *e) { if (scrolling_) { return false; } - bool direction_up = false; - double volume_tick = (double)PA_VOLUME_NORM / 100; + bool direction_up = false; + double volume_tick = (double)PA_VOLUME_NORM / 100; pa_volume_t change = volume_tick; - pa_cvolume pa_volume = pa_volume_; + pa_cvolume pa_volume = pa_volume_; scrolling_ = true; if (e->direction == GDK_SCROLL_UP) { direction_up = true; @@ -127,6 +135,8 @@ void waybar::modules::Pulseaudio::subscribeCb(pa_context * conte unsigned facility = type & PA_SUBSCRIPTION_EVENT_FACILITY_MASK; if (facility == PA_SUBSCRIPTION_EVENT_SINK) { pa_context_get_sink_info_by_index(context, idx, sinkInfoCb, data); + } else if (facility == PA_SUBSCRIPTION_EVENT_SOURCE) { + pa_context_get_source_info_by_index(context, idx, sourceInfoCb, data); } } @@ -140,6 +150,23 @@ void waybar::modules::Pulseaudio::volumeModifyCb(pa_context *c, int success, voi } } +/* + * Called when the requested source information is ready. + */ +void waybar::modules::Pulseaudio::sourceInfoCb(pa_context * /*context*/, const pa_source_info *i, + int /*eol*/, void *data) { + if (i != nullptr) { + auto self = static_cast(data); + auto source_volume = static_cast(pa_cvolume_avg(&(i->volume))) / float{PA_VOLUME_NORM}; + self->source_volume_ = std::round(source_volume * 100.0F); + self->source_idx_ = i->index; + self->source_muted_ = i->mute != 0; + self->source_desc_ = i->description; + self->source_port_name_ = i->active_port != nullptr ? i->active_port->name : "Unknown"; + self->dp.emit(); + } +} + /* * Called when the requested sink information is ready. */ @@ -166,6 +193,7 @@ void waybar::modules::Pulseaudio::sinkInfoCb(pa_context * /*context*/, const pa_ void waybar::modules::Pulseaudio::serverInfoCb(pa_context *context, const pa_server_info *i, void *data) { pa_context_get_sink_info_by_name(context, i->default_sink_name, sinkInfoCb, data); + pa_context_get_source_info_by_name(context, i->default_source_name, sourceInfoCb, data); } static const std::array ports = { @@ -206,8 +234,18 @@ auto waybar::modules::Pulseaudio::update() -> void { label_.get_style_context()->remove_class("bluetooth"); } } - label_.set_markup(fmt::format( - format, fmt::arg("volume", volume_), fmt::arg("icon", getIcon(volume_, getPortIcon())))); + // TODO: find a better way to split source/sink + std::string format_source = "{source_volume}%"; + if (source_muted_ && config_["format-source-muted"].isString()) { + format_source = config_["format-source-muted"].asString(); + } else if (!source_muted_ && config_["format-source"].isString()) { + format_source = config_["format-source"].asString(); + } + format_source = fmt::format(format_source, fmt::arg("volume", source_volume_)); + label_.set_markup(fmt::format(format, + fmt::arg("volume", volume_), + fmt::arg("format_source", format_source), + fmt::arg("icon", getIcon(volume_, getPortIcon())))); getState(volume_); if (tooltipEnabled()) { label_.set_tooltip_text(desc_);