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
90ee4885
Commit
90ee4885
authored
Feb 26, 2009
by
Avuton Olrich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mixer: Add "disabled" mixer_type.
parent
1b79449e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
1 deletion
+9
-1
mpd.conf.5
doc/mpd.conf.5
+1
-1
mpdconf.example
doc/mpdconf.example
+4
-0
volume.c
src/volume.c
+3
-0
volume.h
src/volume.h
+1
-0
No files found.
doc/mpd.conf.5
View file @
90ee4885
...
...
@@ -163,7 +163,7 @@ Linear interpolator, very fast, poor quality.
For an up-to-date list of available converters, please see the libsamplerate
documentation (available online at <\fBhttp://www.mega-nerd.com/SRC/\fP>).
.TP
.B mixer_type <alsa, oss, software
or hardware
>
.B mixer_type <alsa, oss, software
, hardware or disabled
>
This specifies which mixer to use. The default is hardware and depends on
what audio output support mpd was built with. Options alsa and oss are
legacy and should not be used in new configs, but when set mixer_device
...
...
doc/mpdconf.example
View file @
90ee4885
...
...
@@ -245,6 +245,10 @@ log_file "~/.mpd/log"
#
#mixer_type "software"
#
# This example will not allow MPD to touch the mixer at all.
#
#mixer_type "disabled"
#
###############################################################################
...
...
src/volume.c
View file @
90ee4885
...
...
@@ -36,6 +36,7 @@
#define VOLUME_MIXER_TYPE_SOFTWARE 0
#define VOLUME_MIXER_TYPE_HARDWARE 1
#define VOLUME_MIXER_TYPE_DISABLED 2
#define VOLUME_MIXER_SOFTWARE_DEFAULT ""
#define SW_VOLUME_STATE "sw_volume: "
...
...
@@ -131,6 +132,8 @@ void volume_init(void)
if
(
param
)
{
if
(
strcmp
(
param
->
value
,
VOLUME_MIXER_SOFTWARE
)
==
0
)
{
volume_mixer_type
=
VOLUME_MIXER_TYPE_SOFTWARE
;
}
else
if
(
strcmp
(
param
->
value
,
VOLUME_MIXER_DISABLED
)
==
0
)
{
volume_mixer_type
=
VOLUME_MIXER_TYPE_DISABLED
;
}
else
if
(
strcmp
(
param
->
value
,
VOLUME_MIXER_HARDWARE
)
==
0
)
{
//nothing to do
}
else
{
...
...
src/volume.h
View file @
90ee4885
...
...
@@ -25,6 +25,7 @@
#define VOLUME_MIXER_ALSA "alsa"
#define VOLUME_MIXER_SOFTWARE "software"
#define VOLUME_MIXER_HARDWARE "hardware"
#define VOLUME_MIXER_DISABLED "disabled"
void
volume_init
(
void
);
...
...
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