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
f86e1595
Commit
f86e1595
authored
Feb 05, 2014
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Mixer: rename struct mixer_plugin to MixerPlugin
parent
243c4e1e
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
24 additions
and
21 deletions
+24
-21
MixerControl.cxx
src/mixer/MixerControl.cxx
+1
-1
MixerControl.hxx
src/mixer/MixerControl.hxx
+2
-2
MixerInternal.hxx
src/mixer/MixerInternal.hxx
+3
-3
MixerList.hxx
src/mixer/MixerList.hxx
+8
-6
MixerPlugin.hxx
src/mixer/MixerPlugin.hxx
+1
-1
AlsaMixerPlugin.cxx
src/mixer/plugins/AlsaMixerPlugin.cxx
+1
-1
OssMixerPlugin.cxx
src/mixer/plugins/OssMixerPlugin.cxx
+1
-1
PulseMixerPlugin.cxx
src/mixer/plugins/PulseMixerPlugin.cxx
+1
-1
RoarMixerPlugin.cxx
src/mixer/plugins/RoarMixerPlugin.cxx
+1
-1
SoftwareMixerPlugin.cxx
src/mixer/plugins/SoftwareMixerPlugin.cxx
+1
-1
WinmmMixerPlugin.cxx
src/mixer/plugins/WinmmMixerPlugin.cxx
+1
-1
Init.cxx
src/output/Init.cxx
+1
-1
OutputPlugin.hxx
src/output/OutputPlugin.hxx
+2
-1
No files found.
src/mixer/MixerControl.cxx
View file @
f86e1595
...
...
@@ -26,7 +26,7 @@
Mixer
*
mixer_new
(
EventLoop
&
event_loop
,
const
mixer_p
lugin
*
plugin
,
void
*
ao
,
const
MixerP
lugin
*
plugin
,
void
*
ao
,
const
config_param
&
param
,
Error
&
error
)
{
...
...
src/mixer/MixerControl.hxx
View file @
f86e1595
...
...
@@ -28,11 +28,11 @@
class
Error
;
class
Mixer
;
class
EventLoop
;
struct
mixer_p
lugin
;
struct
MixerP
lugin
;
struct
config_param
;
Mixer
*
mixer_new
(
EventLoop
&
event_loop
,
const
mixer_p
lugin
*
plugin
,
void
*
ao
,
mixer_new
(
EventLoop
&
event_loop
,
const
MixerP
lugin
*
plugin
,
void
*
ao
,
const
config_param
&
param
,
Error
&
error
);
...
...
src/mixer/MixerInternal.hxx
View file @
f86e1595
...
...
@@ -26,7 +26,7 @@
class
Mixer
{
public
:
const
struct
mixer_p
lugin
*
plugin
;
const
MixerP
lugin
*
plugin
;
/**
* This mutex protects all of the mixer struct, including its
...
...
@@ -46,12 +46,12 @@ public:
bool
failed
;
public
:
Mixer
(
const
mixer_p
lugin
&
_plugin
)
Mixer
(
const
MixerP
lugin
&
_plugin
)
:
plugin
(
&
_plugin
),
open
(
false
),
failed
(
false
)
{}
bool
IsPlugin
(
const
mixer_p
lugin
&
other
)
const
{
bool
IsPlugin
(
const
MixerP
lugin
&
other
)
const
{
return
plugin
==
&
other
;
}
};
...
...
src/mixer/MixerList.hxx
View file @
f86e1595
...
...
@@ -25,11 +25,13 @@
#ifndef MPD_MIXER_LIST_HXX
#define MPD_MIXER_LIST_HXX
extern
const
struct
mixer_plugin
software_mixer_plugin
;
extern
const
struct
mixer_plugin
alsa_mixer_plugin
;
extern
const
struct
mixer_plugin
oss_mixer_plugin
;
extern
const
struct
mixer_plugin
roar_mixer_plugin
;
extern
const
struct
mixer_plugin
pulse_mixer_plugin
;
extern
const
struct
mixer_plugin
winmm_mixer_plugin
;
struct
MixerPlugin
;
extern
const
MixerPlugin
software_mixer_plugin
;
extern
const
MixerPlugin
alsa_mixer_plugin
;
extern
const
MixerPlugin
oss_mixer_plugin
;
extern
const
MixerPlugin
roar_mixer_plugin
;
extern
const
MixerPlugin
pulse_mixer_plugin
;
extern
const
MixerPlugin
winmm_mixer_plugin
;
#endif
src/mixer/MixerPlugin.hxx
View file @
f86e1595
...
...
@@ -32,7 +32,7 @@ class Mixer;
class
EventLoop
;
class
Error
;
struct
mixer_p
lugin
{
struct
MixerP
lugin
{
/**
* Alocates and configures a mixer device.
*
...
...
src/mixer/plugins/AlsaMixerPlugin.cxx
View file @
f86e1595
...
...
@@ -374,7 +374,7 @@ alsa_mixer_set_volume(Mixer *mixer, unsigned volume, Error &error)
return
am
->
SetVolume
(
volume
,
error
);
}
const
struct
mixer_p
lugin
alsa_mixer_plugin
=
{
const
MixerP
lugin
alsa_mixer_plugin
=
{
alsa_mixer_init
,
alsa_mixer_finish
,
alsa_mixer_open
,
...
...
src/mixer/plugins/OssMixerPlugin.cxx
View file @
f86e1595
...
...
@@ -231,7 +231,7 @@ oss_mixer_set_volume(Mixer *mixer, unsigned volume, Error &error)
return
om
->
SetVolume
(
volume
,
error
);
}
const
struct
mixer_p
lugin
oss_mixer_plugin
=
{
const
MixerP
lugin
oss_mixer_plugin
=
{
oss_mixer_init
,
oss_mixer_finish
,
oss_mixer_open
,
...
...
src/mixer/plugins/PulseMixerPlugin.cxx
View file @
f86e1595
...
...
@@ -215,7 +215,7 @@ pulse_mixer_set_volume(Mixer *mixer, unsigned volume, Error &error)
return
success
;
}
const
struct
mixer_p
lugin
pulse_mixer_plugin
=
{
const
MixerP
lugin
pulse_mixer_plugin
=
{
pulse_mixer_init
,
pulse_mixer_finish
,
nullptr
,
...
...
src/mixer/plugins/RoarMixerPlugin.cxx
View file @
f86e1595
...
...
@@ -64,7 +64,7 @@ roar_mixer_set_volume(Mixer *mixer, unsigned volume,
return
roar_output_set_volume
(
self
->
self
,
volume
);
}
const
struct
mixer_p
lugin
roar_mixer_plugin
=
{
const
MixerP
lugin
roar_mixer_plugin
=
{
roar_mixer_init
,
roar_mixer_finish
,
nullptr
,
...
...
src/mixer/plugins/SoftwareMixerPlugin.cxx
View file @
f86e1595
...
...
@@ -110,7 +110,7 @@ software_mixer_set_volume(Mixer *mixer, unsigned volume,
return
true
;
}
const
struct
mixer_p
lugin
software_mixer_plugin
=
{
const
MixerP
lugin
software_mixer_plugin
=
{
software_mixer_init
,
software_mixer_finish
,
nullptr
,
...
...
src/mixer/plugins/WinmmMixerPlugin.cxx
View file @
f86e1595
...
...
@@ -104,7 +104,7 @@ winmm_mixer_set_volume(Mixer *mixer, unsigned volume, Error &error)
return
true
;
}
const
struct
mixer_p
lugin
winmm_mixer_plugin
=
{
const
MixerP
lugin
winmm_mixer_plugin
=
{
winmm_mixer_init
,
winmm_mixer_finish
,
nullptr
,
...
...
src/output/Init.cxx
View file @
f86e1595
...
...
@@ -114,7 +114,7 @@ audio_output_mixer_type(const config_param ¶m)
static
Mixer
*
audio_output_load_mixer
(
EventLoop
&
event_loop
,
AudioOutput
*
ao
,
const
config_param
&
param
,
const
struct
mixer_p
lugin
*
plugin
,
const
MixerP
lugin
*
plugin
,
Filter
&
filter_chain
,
Error
&
error
)
{
...
...
src/output/OutputPlugin.hxx
View file @
f86e1595
...
...
@@ -28,6 +28,7 @@ struct config_param;
struct
AudioFormat
;
struct
Tag
;
struct
AudioOutput
;
struct
MixerPlugin
;
class
Error
;
/**
...
...
@@ -147,7 +148,7 @@ struct AudioOutputPlugin {
* created, this mixer plugin gets the same #config_param as
* this audio output device.
*/
const
struct
mixer_p
lugin
*
mixer_plugin
;
const
MixerP
lugin
*
mixer_plugin
;
};
static
inline
bool
...
...
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