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
2e65686f
Commit
2e65686f
authored
May 22, 2017
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
output/Control: add method Configure()
Prepare to move some configuration settings from AudioOutput to AudioOutputControl.
parent
e5847f1d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
1 deletion
+24
-1
Control.cxx
src/output/Control.cxx
+6
-0
Control.hxx
src/output/Control.hxx
+6
-0
MultipleOutputs.cxx
src/output/MultipleOutputs.cxx
+12
-1
No files found.
src/output/Control.cxx
View file @
2e65686f
...
...
@@ -44,6 +44,12 @@ AudioOutputControl::AudioOutputControl(AudioOutput *_output)
{
}
void
AudioOutputControl
::
Configure
(
const
ConfigBlock
&
block
)
{
(
void
)
block
;
}
const
char
*
AudioOutputControl
::
GetName
()
const
{
...
...
src/output/Control.hxx
View file @
2e65686f
...
...
@@ -38,6 +38,7 @@
enum
class
ReplayGainMode
:
uint8_t
;
struct
AudioOutput
;
struct
MusicChunk
;
struct
ConfigBlock
;
class
MusicPipe
;
class
Mutex
;
class
Mixer
;
...
...
@@ -158,6 +159,11 @@ public:
AudioOutputControl
(
const
AudioOutputControl
&
)
=
delete
;
AudioOutputControl
&
operator
=
(
const
AudioOutputControl
&
)
=
delete
;
/**
* Throws #std::runtime_error on error.
*/
void
Configure
(
const
ConfigBlock
&
block
);
gcc_pure
const
char
*
GetName
()
const
;
...
...
src/output/MultipleOutputs.cxx
View file @
2e65686f
...
...
@@ -75,7 +75,18 @@ LoadOutputControl(EventLoop &event_loop,
auto
*
output
=
LoadOutput
(
event_loop
,
replay_gain_config
,
mixer_listener
,
client
,
block
);
return
new
AudioOutputControl
(
output
);
auto
*
control
=
new
AudioOutputControl
(
output
);
try
{
control
->
Configure
(
block
);
}
catch
(...)
{
control
->
BeginDestroy
();
control
->
FinishDestroy
();
delete
control
;
throw
;
}
return
control
;
}
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