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
bbe7a373
Commit
bbe7a373
authored
Nov 09, 2016
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
output/Internal: hide Configure() and remove the non-configuring constructor
parent
d0aa154e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
12 deletions
+4
-12
Init.cxx
src/output/Init.cxx
+2
-6
Internal.hxx
src/output/Internal.hxx
+2
-2
SolarisOutputPlugin.cxx
src/output/plugins/SolarisOutputPlugin.cxx
+0
-4
No files found.
src/output/Init.cxx
View file @
bbe7a373
...
...
@@ -49,19 +49,15 @@
#define AUDIO_OUTPUT_FORMAT "format"
#define AUDIO_FILTERS "filters"
AudioOutput
::
AudioOutput
(
const
AudioOutputPlugin
&
_plugin
)
AudioOutput
::
AudioOutput
(
const
AudioOutputPlugin
&
_plugin
,
const
ConfigBlock
&
block
)
:
plugin
(
_plugin
)
{
assert
(
plugin
.
finish
!=
nullptr
);
assert
(
plugin
.
open
!=
nullptr
);
assert
(
plugin
.
close
!=
nullptr
);
assert
(
plugin
.
play
!=
nullptr
);
}
AudioOutput
::
AudioOutput
(
const
AudioOutputPlugin
&
_plugin
,
const
ConfigBlock
&
block
)
:
AudioOutput
(
_plugin
)
{
Error
error
;
if
(
!
Configure
(
block
,
error
))
throw
std
::
runtime_error
(
error
.
GetMessage
());
...
...
src/output/Internal.hxx
View file @
bbe7a373
...
...
@@ -282,8 +282,6 @@ struct AudioOutput {
*/
bool
current_chunk_finished
;
AudioOutput
(
const
AudioOutputPlugin
&
_plugin
);
/**
* Throws #std::runtime_error on error.
*/
...
...
@@ -292,8 +290,10 @@ struct AudioOutput {
~
AudioOutput
();
private
:
bool
Configure
(
const
ConfigBlock
&
block
,
Error
&
error
);
public
:
void
StartThread
();
void
StopThread
();
...
...
src/output/plugins/SolarisOutputPlugin.cxx
View file @
bbe7a373
...
...
@@ -60,10 +60,6 @@ struct SolarisOutput {
explicit
SolarisOutput
(
const
ConfigBlock
&
block
)
:
base
(
solaris_output_plugin
,
block
),
device
(
block
.
GetBlockValue
(
"device"
,
"/dev/audio"
))
{}
bool
Initialize
(
const
ConfigBlock
&
block
,
Error
&
error_r
)
{
return
base
.
Configure
(
block
,
error_r
);
}
};
static
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