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
5f5b5f63
Commit
5f5b5f63
authored
3 years ago
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mixer/alsa: move code to NormalizedToPercent()
parent
ad6e3030
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
AlsaMixerPlugin.cxx
src/mixer/plugins/AlsaMixerPlugin.cxx
+7
-2
No files found.
src/mixer/plugins/AlsaMixerPlugin.cxx
View file @
5f5b5f63
...
@@ -97,6 +97,11 @@ public:
...
@@ -97,6 +97,11 @@ public:
void
SetVolume
(
unsigned
volume
)
override
;
void
SetVolume
(
unsigned
volume
)
override
;
private
:
private
:
[[
gnu
::
const
]]
static
unsigned
NormalizedToPercent
(
double
normalized
)
noexcept
{
return
lround
(
100
*
normalized
);
}
[[
gnu
::
pure
]]
[[
gnu
::
pure
]]
double
GetNormalizedVolume
()
const
noexcept
{
double
GetNormalizedVolume
()
const
noexcept
{
return
get_normalized_playback_volume
(
elem
,
return
get_normalized_playback_volume
(
elem
,
...
@@ -280,7 +285,7 @@ AlsaMixer::GetVolume()
...
@@ -280,7 +285,7 @@ AlsaMixer::GetVolume()
throw
FormatRuntimeError
(
"snd_mixer_handle_events() failed: %s"
,
throw
FormatRuntimeError
(
"snd_mixer_handle_events() failed: %s"
,
snd_strerror
(
err
));
snd_strerror
(
err
));
return
lround
(
100
*
GetNormalizedVolume
());
return
NormalizedToPercent
(
GetNormalizedVolume
());
}
}
void
void
...
@@ -289,7 +294,7 @@ AlsaMixer::SetVolume(unsigned volume)
...
@@ -289,7 +294,7 @@ AlsaMixer::SetVolume(unsigned volume)
assert
(
handle
!=
nullptr
);
assert
(
handle
!=
nullptr
);
double
cur
=
GetNormalizedVolume
();
double
cur
=
GetNormalizedVolume
();
int
delta
=
volume
-
lround
(
100.
*
cur
);
int
delta
=
volume
-
NormalizedToPercent
(
cur
);
int
err
=
set_normalized_playback_volume
(
elem
,
cur
+
0.01
*
delta
,
delta
);
int
err
=
set_normalized_playback_volume
(
elem
,
cur
+
0.01
*
delta
,
delta
);
if
(
err
<
0
)
if
(
err
<
0
)
throw
FormatRuntimeError
(
"failed to set ALSA volume: %s"
,
throw
FormatRuntimeError
(
"failed to set ALSA volume: %s"
,
...
...
This diff is collapsed.
Click to expand it.
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