player/Thread: reorder attributes to reduce padding

This commit is contained in:
Max Kellermann 2017-12-20 18:43:56 +01:00
parent 499e053d58
commit 54aff33118

View File

@ -52,6 +52,18 @@ class Player {
MusicPipe *pipe; MusicPipe *pipe;
/**
* the song currently being played
*/
std::unique_ptr<DetachedSong> song;
/**
* The tag of the "next" song during cross-fade. It is
* postponed, and sent to the output thread when the new song
* really begins.
*/
std::unique_ptr<Tag> cross_fade_tag;
/** /**
* are we waiting for buffered_before_play? * are we waiting for buffered_before_play?
*/ */
@ -87,11 +99,6 @@ class Player {
*/ */
bool output_open = false; bool output_open = false;
/**
* the song currently being played
*/
std::unique_ptr<DetachedSong> song;
/** /**
* Is cross-fading to the next song enabled? * Is cross-fading to the next song enabled?
*/ */
@ -126,13 +133,6 @@ class Player {
*/ */
unsigned cross_fade_chunks = 0; unsigned cross_fade_chunks = 0;
/**
* The tag of the "next" song during cross-fade. It is
* postponed, and sent to the output thread when the new song
* really begins.
*/
std::unique_ptr<Tag> cross_fade_tag;
/** /**
* The current audio format for the audio outputs. * The current audio format for the audio outputs.
*/ */