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
645751f6
Commit
645751f6
authored
Jun 22, 2016
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
output/Init: use C++11 initializers
parent
2d3b6879
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
24 deletions
+13
-24
Init.cxx
src/output/Init.cxx
+1
-12
Internal.hxx
src/output/Internal.hxx
+12
-12
No files found.
src/output/Init.cxx
View file @
645751f6
...
@@ -48,18 +48,7 @@
...
@@ -48,18 +48,7 @@
#define AUDIO_FILTERS "filters"
#define AUDIO_FILTERS "filters"
AudioOutput
::
AudioOutput
(
const
AudioOutputPlugin
&
_plugin
)
AudioOutput
::
AudioOutput
(
const
AudioOutputPlugin
&
_plugin
)
:
plugin
(
_plugin
),
:
plugin
(
_plugin
)
mixer
(
nullptr
),
enabled
(
true
),
really_enabled
(
false
),
open
(
false
),
pause
(
false
),
allow_play
(
true
),
in_playback_loop
(
false
),
woken_for_play
(
false
),
filter
(
nullptr
),
replay_gain_filter
(
nullptr
),
other_replay_gain_filter
(
nullptr
),
command
(
Command
::
NONE
)
{
{
assert
(
plugin
.
finish
!=
nullptr
);
assert
(
plugin
.
finish
!=
nullptr
);
assert
(
plugin
.
open
!=
nullptr
);
assert
(
plugin
.
open
!=
nullptr
);
...
...
src/output/Internal.hxx
View file @
645751f6
...
@@ -81,7 +81,7 @@ struct AudioOutput {
...
@@ -81,7 +81,7 @@ struct AudioOutput {
* May be nullptr if none is available, or if software volume is
* May be nullptr if none is available, or if software volume is
* configured.
* configured.
*/
*/
Mixer
*
mixer
;
Mixer
*
mixer
=
nullptr
;
/**
/**
* Will this output receive tags from the decoder? The
* Will this output receive tags from the decoder? The
...
@@ -99,13 +99,13 @@ struct AudioOutput {
...
@@ -99,13 +99,13 @@ struct AudioOutput {
/**
/**
* Has the user enabled this device?
* Has the user enabled this device?
*/
*/
bool
enabled
;
bool
enabled
=
true
;
/**
/**
* Is this device actually enabled, i.e. the "enable" method
* Is this device actually enabled, i.e. the "enable" method
* has succeeded?
* has succeeded?
*/
*/
bool
really_enabled
;
bool
really_enabled
=
false
;
/**
/**
* Is the device (already) open and functional?
* Is the device (already) open and functional?
...
@@ -115,13 +115,13 @@ struct AudioOutput {
...
@@ -115,13 +115,13 @@ struct AudioOutput {
* output thread and read accesses outside of it may only be
* output thread and read accesses outside of it may only be
* performed while the lock is held.
* performed while the lock is held.
*/
*/
bool
open
;
bool
open
=
false
;
/**
/**
* Is the device paused? i.e. the output thread is in the
* Is the device paused? i.e. the output thread is in the
* ao_pause() loop.
* ao_pause() loop.
*/
*/
bool
pause
;
bool
pause
=
false
;
/**
/**
* When this flag is set, the output thread will not do any
* When this flag is set, the output thread will not do any
...
@@ -130,7 +130,7 @@ struct AudioOutput {
...
@@ -130,7 +130,7 @@ struct AudioOutput {
* This is used to synchronize the "clear" operation on the
* This is used to synchronize the "clear" operation on the
* shared music pipe during the CANCEL command.
* shared music pipe during the CANCEL command.
*/
*/
bool
allow_play
;
bool
allow_play
=
true
;
/**
/**
* True while the OutputThread is inside ao_play(). This
* True while the OutputThread is inside ao_play(). This
...
@@ -138,14 +138,14 @@ struct AudioOutput {
...
@@ -138,14 +138,14 @@ struct AudioOutput {
* OutputThread when new chunks are added to the MusicPipe,
* OutputThread when new chunks are added to the MusicPipe,
* because the OutputThread is already watching that.
* because the OutputThread is already watching that.
*/
*/
bool
in_playback_loop
;
bool
in_playback_loop
=
false
;
/**
/**
* Has the OutputThread been woken up to play more chunks?
* Has the OutputThread been woken up to play more chunks?
* This is set by audio_output_play() and reset by ao_play()
* This is set by audio_output_play() and reset by ao_play()
* to reduce the number of duplicate wakeups.
* to reduce the number of duplicate wakeups.
*/
*/
bool
woken_for_play
;
bool
woken_for_play
=
false
;
/**
/**
* If not nullptr, the device has failed, and this timer is used
* If not nullptr, the device has failed, and this timer is used
...
@@ -187,13 +187,13 @@ struct AudioOutput {
...
@@ -187,13 +187,13 @@ struct AudioOutput {
* The filter object of this audio output. This is an
* The filter object of this audio output. This is an
* instance of chain_filter_plugin.
* instance of chain_filter_plugin.
*/
*/
Filter
*
filter
;
Filter
*
filter
=
nullptr
;
/**
/**
* The replay_gain_filter_plugin instance of this audio
* The replay_gain_filter_plugin instance of this audio
* output.
* output.
*/
*/
Filter
*
replay_gain_filter
;
Filter
*
replay_gain_filter
=
nullptr
;
/**
/**
* The serial number of the last replay gain info. 0 means no
* The serial number of the last replay gain info. 0 means no
...
@@ -206,7 +206,7 @@ struct AudioOutput {
...
@@ -206,7 +206,7 @@ struct AudioOutput {
* output, to be applied to the second chunk during
* output, to be applied to the second chunk during
* cross-fading.
* cross-fading.
*/
*/
Filter
*
other_replay_gain_filter
;
Filter
*
other_replay_gain_filter
=
nullptr
;
/**
/**
* The serial number of the last replay gain info by the
* The serial number of the last replay gain info by the
...
@@ -231,7 +231,7 @@ struct AudioOutput {
...
@@ -231,7 +231,7 @@ struct AudioOutput {
/**
/**
* The next command to be performed by the output thread.
* The next command to be performed by the output thread.
*/
*/
Command
command
;
Command
command
=
Command
::
NONE
;
/**
/**
* The music pipe which provides music chunks to be played.
* The music pipe which provides music chunks to be played.
...
...
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