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
3d16f221
Commit
3d16f221
authored
Dec 03, 2016
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
player/Control: use C++11 initializers
parent
6cc1ff5e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
15 deletions
+8
-15
Control.cxx
src/player/Control.cxx
+1
-8
Control.hxx
src/player/Control.hxx
+7
-7
No files found.
src/player/Control.cxx
View file @
3d16f221
...
...
@@ -32,14 +32,7 @@ PlayerControl::PlayerControl(PlayerListener &_listener,
unsigned
_buffered_before_play
)
:
listener
(
_listener
),
outputs
(
_outputs
),
buffer_chunks
(
_buffer_chunks
),
buffered_before_play
(
_buffered_before_play
),
command
(
PlayerCommand
::
NONE
),
state
(
PlayerState
::
STOP
),
error_type
(
PlayerError
::
NONE
),
tagged_song
(
nullptr
),
next_song
(
nullptr
),
total_play_time
(
0
),
border_pause
(
false
)
buffered_before_play
(
_buffered_before_play
)
{
}
...
...
src/player/Control.hxx
View file @
3d16f221
...
...
@@ -127,10 +127,10 @@ struct PlayerControl {
*/
Cond
client_cond
;
PlayerCommand
command
;
PlayerState
state
;
PlayerCommand
command
=
PlayerCommand
::
NONE
;
PlayerState
state
=
PlayerState
::
STOP
;
PlayerError
error_type
;
PlayerError
error_type
=
PlayerError
::
NONE
;
/**
* The error that occurred in the player thread. This
...
...
@@ -150,7 +150,7 @@ struct PlayerControl {
* Protected by #mutex. Set by the PlayerThread and consumed
* by the main thread.
*/
DetachedSong
*
tagged_song
;
DetachedSong
*
tagged_song
=
nullptr
;
uint16_t
bit_rate
;
AudioFormat
audio_format
;
...
...
@@ -163,7 +163,7 @@ struct PlayerControl {
* This is a duplicate, and must be freed when this attribute
* is cleared.
*/
DetachedSong
*
next_song
;
DetachedSong
*
next_song
=
nullptr
;
SongTime
seek_time
;
...
...
@@ -172,7 +172,7 @@ struct PlayerControl {
ReplayGainConfig
replay_gain_config
;
ReplayGainMode
replay_gain_mode
=
ReplayGainMode
::
OFF
;
double
total_play_time
;
double
total_play_time
=
0
;
/**
* If this flag is set, then the player will be auto-paused at
...
...
@@ -181,7 +181,7 @@ struct PlayerControl {
* This is a copy of the queue's "single" flag most of the
* time.
*/
bool
border_pause
;
bool
border_pause
=
false
;
PlayerControl
(
PlayerListener
&
_listener
,
MultipleOutputs
&
_outputs
,
...
...
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