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
994c9a01
Commit
994c9a01
authored
Dec 20, 2017
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
player/Control: reorder attributes to reduce padding
parent
ad1d5e82
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
23 deletions
+25
-23
Control.hxx
src/player/Control.hxx
+25
-23
No files found.
src/player/Control.hxx
View file @
994c9a01
...
...
@@ -141,11 +141,6 @@ struct PlayerControl final : AudioOutputClient {
*/
Cond
client_cond
;
PlayerCommand
command
=
PlayerCommand
::
NONE
;
PlayerState
state
=
PlayerState
::
STOP
;
PlayerError
error_type
=
PlayerError
::
NONE
;
/**
* The error that occurred in the player thread. This
* attribute is only valid if #error_type is not
...
...
@@ -155,6 +150,14 @@ struct PlayerControl final : AudioOutputClient {
std
::
exception_ptr
error
;
/**
* The next queued song.
*
* This is a duplicate, and must be freed when this attribute
* is cleared.
*/
std
::
unique_ptr
<
DetachedSong
>
next_song
;
/**
* A copy of the current #DetachedSong after its tags have
* been updated by the decoder (for example, a radio stream
* that has sent a new tag after switching to the next song).
...
...
@@ -166,28 +169,13 @@ struct PlayerControl final : AudioOutputClient {
*/
std
::
unique_ptr
<
DetachedSong
>
tagged_song
;
uint16_t
bit_rate
;
AudioFormat
audio_format
;
SignedSongTime
total_time
;
SongTime
elapsed_time
;
/**
* The next queued song.
*
* This is a duplicate, and must be freed when this attribute
* is cleared.
*/
std
::
unique_ptr
<
DetachedSong
>
next_song
;
SongTime
seek_time
;
PlayerCommand
command
=
PlayerCommand
::
NONE
;
PlayerState
state
=
PlayerState
::
STOP
;
CrossFadeSettings
cross_fade
;
PlayerError
error_type
=
PlayerError
::
NONE
;
const
ReplayGainConfig
replay_gain_config
;
ReplayGainMode
replay_gain_mode
=
ReplayGainMode
::
OFF
;
double
total_play_time
=
0
;
/**
* If this flag is set, then the player will be auto-paused at
* the end of the song, before the next song starts to play.
...
...
@@ -197,6 +185,20 @@ struct PlayerControl final : AudioOutputClient {
*/
bool
border_pause
=
false
;
AudioFormat
audio_format
;
uint16_t
bit_rate
;
SignedSongTime
total_time
;
SongTime
elapsed_time
;
SongTime
seek_time
;
CrossFadeSettings
cross_fade
;
const
ReplayGainConfig
replay_gain_config
;
double
total_play_time
=
0
;
PlayerControl
(
PlayerListener
&
_listener
,
MultipleOutputs
&
_outputs
,
unsigned
buffer_chunks
,
...
...
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