fix(Pulseaudio): avoid handleScroll override

Alexays · May 13, 2019 · 4f1defe · 4f1defe
1 parent 92967c7
commit 4f1defe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/include/modules/pulseaudio.hpp b/include/modules/pulseaudio.hpp
@@ -20,7 +20,7 @@ class Pulseaudio : public ALabel {
   static void sinkInfoCb(pa_context*, const pa_sink_info*, int, void*);
   static void serverInfoCb(pa_context*, const pa_server_info*, void*);
   static void volumeModifyCb(pa_context*, int, void*);
-  bool        handleScroll(GdkEventScroll* e);
+  bool        handleVolume(GdkEventScroll* e);
 
   const std::string getPortIcon() const;
 

diff --git a/src/modules/pulseaudio.cpp b/src/modules/pulseaudio.cpp
@@ -39,7 +39,7 @@ waybar::modules::Pulseaudio::Pulseaudio(const std::string &id, const Json::Value
   // events are configured
   if (!config["on-scroll-up"].isString() && !config["on-scroll-down"].isString()) {
     event_box_.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
-    event_box_.signal_scroll_event().connect(sigc::mem_fun(*this, &Pulseaudio::handleScroll));
+    event_box_.signal_scroll_event().connect(sigc::mem_fun(*this, &Pulseaudio::handleVolume));
   }
 }
 
@@ -71,7 +71,7 @@ void waybar::modules::Pulseaudio::contextStateCb(pa_context *c, void *data) {
   }
 }
 
-bool waybar::modules::Pulseaudio::handleScroll(GdkEventScroll *e) {
+bool waybar::modules::Pulseaudio::handleVolume(GdkEventScroll *e) {
   // Avoid concurrent scroll event
   bool       direction_up = false;
   uint16_t   change = config_["scroll-step"].isUInt() ? config_["scroll-step"].asUInt() * 100 : 100;