Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
a958abde
Commit
a958abde
authored
Nov 11, 2018
by
Max Kellermann
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix_362' of
git://github.com/miccoli/MPD
parents
583208db
6d48a568
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
NEWS
NEWS
+2
-0
volume_mapping.c
src/mixer/plugins/volume_mapping.c
+8
-1
No files found.
NEWS
View file @
a958abde
...
...
@@ -4,6 +4,8 @@ ver 0.21.2 (not yet released)
- ffmpeg: fix broken sound with certain codecs
* output
- httpd: fix two crash bugs
* mixer
- alsa: fix more rounding errors
* fix zlib support
ver 0.21.1 (2018/11/04)
...
...
src/mixer/plugins/volume_mapping.c
View file @
a958abde
...
...
@@ -135,6 +135,13 @@ static int set_normalized_volume(snd_mixer_elem_t *elem,
if
(
err
<
0
)
return
err
;
/* two special cases to avoid rounding errors at 0% and
100% */
if
(
volume
<=
0
)
return
set_raw
[
ctl_dir
](
elem
,
min
);
else
if
(
volume
>=
1
)
return
set_raw
[
ctl_dir
](
elem
,
max
);
value
=
lrint_dir
(
volume
*
(
max
-
min
),
dir
)
+
min
;
return
set_raw
[
ctl_dir
](
elem
,
value
);
}
...
...
@@ -143,7 +150,7 @@ static int set_normalized_volume(snd_mixer_elem_t *elem,
100% */
if
(
volume
<=
0
)
return
set_dB
[
ctl_dir
](
elem
,
min
,
dir
);
else
if
(
volume
>=
1
00
)
else
if
(
volume
>=
1
)
return
set_dB
[
ctl_dir
](
elem
,
max
,
dir
);
if
(
use_linear_dB_scale
(
min
,
max
))
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment