Commit 54aff331 authored by Max Kellermann's avatar Max Kellermann

player/Thread: reorder attributes to reduce padding

parent 499e053d
...@@ -53,6 +53,18 @@ class Player { ...@@ -53,6 +53,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?
*/ */
bool buffering = true; bool buffering = true;
...@@ -88,11 +100,6 @@ class Player { ...@@ -88,11 +100,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?
*/ */
enum class CrossFadeState : uint8_t { enum class CrossFadeState : uint8_t {
...@@ -127,13 +134,6 @@ class Player { ...@@ -127,13 +134,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.
*/ */
AudioFormat play_audio_format = AudioFormat::Undefined(); AudioFormat play_audio_format = AudioFormat::Undefined();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment