mirror of https://github.com/polybar/polybar.git
Compare commits
5 Commits
ce7f5908b8
...
de9c979521
Author | SHA1 | Date |
---|---|---|
Joseph Dalrymple | de9c979521 | |
Roddy Rappaport | 11b522c313 | |
Roddy Rappaport | 82a81ce07c | |
Roddy Rappaport | c2dd279bf7 | |
patrick96 | 174ce34285 |
|
@ -9,6 +9,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
### Added
|
||||||
|
- An option `unmute-on-scroll` for `internal/pulseaudio` and `internal/alsa` to unmute audio when the user scrolls on the widget.
|
||||||
|
|
||||||
## [3.7.1] - 2023-11-27
|
## [3.7.1] - 2023-11-27
|
||||||
### Build
|
### Build
|
||||||
|
|
|
@ -4,4 +4,4 @@
|
||||||
sphinx~=7.2.6
|
sphinx~=7.2.6
|
||||||
sphinx-rtd-theme~=2.0.0rc2
|
sphinx-rtd-theme~=2.0.0rc2
|
||||||
sphinx-notfound-page~=1.0.0
|
sphinx-notfound-page~=1.0.0
|
||||||
readthedocs-sphinx-search~=0.3.1
|
readthedocs-sphinx-search~=0.3.2
|
||||||
|
|
|
@ -153,6 +153,9 @@ internal/alsa
|
||||||
``interval`` is the config setting in the module. Volume changed like this
|
``interval`` is the config setting in the module. Volume changed like this
|
||||||
will never go above 100%.
|
will never go above 100%.
|
||||||
|
|
||||||
|
if ``unmute-on-scroll`` is turned on, the sound will also be unmuted when
|
||||||
|
this action is called.
|
||||||
|
|
||||||
:``toggle``:
|
:``toggle``:
|
||||||
Toggles between muted and unmuted.
|
Toggles between muted and unmuted.
|
||||||
|
|
||||||
|
@ -165,6 +168,9 @@ internal/pulseaudio
|
||||||
will never go above ~153% (if ``use-ui-max`` is set to ``true``) or 100% (if
|
will never go above ~153% (if ``use-ui-max`` is set to ``true``) or 100% (if
|
||||||
not).
|
not).
|
||||||
|
|
||||||
|
if ``unmute-on-scroll`` is turned on, the sound will also be unmuted when
|
||||||
|
this action is called.
|
||||||
|
|
||||||
:``toggle``:
|
:``toggle``:
|
||||||
Toggles between muted and unmuted.
|
Toggles between muted and unmuted.
|
||||||
|
|
||||||
|
|
|
@ -67,6 +67,7 @@ namespace modules {
|
||||||
map<control, control_t> m_ctrl;
|
map<control, control_t> m_ctrl;
|
||||||
int m_headphoneid{0};
|
int m_headphoneid{0};
|
||||||
bool m_mapped{false};
|
bool m_mapped{false};
|
||||||
|
bool m_unmute_on_scroll{false};
|
||||||
int m_interval{5};
|
int m_interval{5};
|
||||||
atomic<bool> m_muted{false};
|
atomic<bool> m_muted{false};
|
||||||
atomic<bool> m_headphones{false};
|
atomic<bool> m_headphones{false};
|
||||||
|
|
|
@ -51,6 +51,7 @@ namespace modules {
|
||||||
pulseaudio_t m_pulseaudio;
|
pulseaudio_t m_pulseaudio;
|
||||||
|
|
||||||
int m_interval{5};
|
int m_interval{5};
|
||||||
|
bool m_unmute_on_scroll{false};
|
||||||
atomic<bool> m_muted{false};
|
atomic<bool> m_muted{false};
|
||||||
atomic<int> m_volume{0};
|
atomic<int> m_volume{0};
|
||||||
atomic<double> m_decibels{0};
|
atomic<double> m_decibels{0};
|
||||||
|
|
|
@ -28,6 +28,7 @@ namespace modules {
|
||||||
// Load configuration values
|
// Load configuration values
|
||||||
m_mapped = m_conf.get(name(), "mapped", m_mapped);
|
m_mapped = m_conf.get(name(), "mapped", m_mapped);
|
||||||
m_interval = m_conf.get(name(), "interval", m_interval);
|
m_interval = m_conf.get(name(), "interval", m_interval);
|
||||||
|
m_unmute_on_scroll = m_conf.get(name(), "unmute-on-scroll", m_unmute_on_scroll);
|
||||||
|
|
||||||
auto master_mixer_name = m_conf.get(name(), "master-mixer", "Master"s);
|
auto master_mixer_name = m_conf.get(name(), "master-mixer", "Master"s);
|
||||||
auto speaker_mixer_name = m_conf.get(name(), "speaker-mixer", ""s);
|
auto speaker_mixer_name = m_conf.get(name(), "speaker-mixer", ""s);
|
||||||
|
@ -261,6 +262,9 @@ namespace modules {
|
||||||
}
|
}
|
||||||
const auto& mixers = get_mixers();
|
const auto& mixers = get_mixers();
|
||||||
for (auto&& mixer : mixers) {
|
for (auto&& mixer : mixers) {
|
||||||
|
if (m_unmute_on_scroll) {
|
||||||
|
mixer->set_mute(true);
|
||||||
|
}
|
||||||
m_mapped ? mixer->set_normalized_volume(math_util::cap<float>(mixer->get_normalized_volume() + interval, 0, 100))
|
m_mapped ? mixer->set_normalized_volume(math_util::cap<float>(mixer->get_normalized_volume() + interval, 0, 100))
|
||||||
: mixer->set_volume(math_util::cap<float>(mixer->get_volume() + interval, 0, 100));
|
: mixer->set_volume(math_util::cap<float>(mixer->get_volume() + interval, 0, 100));
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,6 +23,7 @@ namespace modules {
|
||||||
|
|
||||||
// Load configuration values
|
// Load configuration values
|
||||||
m_interval = m_conf.get(name(), "interval", m_interval);
|
m_interval = m_conf.get(name(), "interval", m_interval);
|
||||||
|
m_unmute_on_scroll = m_conf.get(name(), "unmute-on-scroll", m_unmute_on_scroll);
|
||||||
|
|
||||||
auto sink_name = m_conf.get(name(), "sink", ""s);
|
auto sink_name = m_conf.get(name(), "sink", ""s);
|
||||||
bool m_max_volume = m_conf.get(name(), "use-ui-max", true);
|
bool m_max_volume = m_conf.get(name(), "use-ui-max", true);
|
||||||
|
@ -156,10 +157,16 @@ namespace modules {
|
||||||
}
|
}
|
||||||
|
|
||||||
void pulseaudio_module::action_inc() {
|
void pulseaudio_module::action_inc() {
|
||||||
|
if (m_unmute_on_scroll) {
|
||||||
|
m_pulseaudio->set_mute(false);
|
||||||
|
}
|
||||||
m_pulseaudio->inc_volume(m_interval);
|
m_pulseaudio->inc_volume(m_interval);
|
||||||
}
|
}
|
||||||
|
|
||||||
void pulseaudio_module::action_dec() {
|
void pulseaudio_module::action_dec() {
|
||||||
|
if (m_unmute_on_scroll) {
|
||||||
|
m_pulseaudio->set_mute(false);
|
||||||
|
}
|
||||||
m_pulseaudio->inc_volume(-m_interval);
|
m_pulseaudio->inc_volume(-m_interval);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue