oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

MusicChunk: use C++11 initializers

Browse Source
This commit is contained in:
Max Kellermann 2016-11-23 17:56:36 +01:00
parent 4dd1309c3f
commit ad2c7304ea
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/MusicChunk.hxx
View File

@ -48,7 +48,7 @@ struct MusicChunk {
* An optional chunk which should be mixed into this chunk. * An optional chunk which should be mixed into this chunk.
* This is used for cross-fading. * This is used for cross-fading.
*/ */
MusicChunk *other; MusicChunk *other = nullptr;
/** /**
* The current mix ratio for cross-fading: 1.0 means play 100% * The current mix ratio for cross-fading: 1.0 means play 100%
@ -57,7 +57,7 @@ struct MusicChunk {
float mix_ratio; float mix_ratio;
/** number of bytes stored in this chunk */ /** number of bytes stored in this chunk */
uint16_t length; uint16_t length = 0;
/** current bit rate of the source file */ /** current bit rate of the source file */
uint16_t bit_rate; uint16_t bit_rate;
@ -71,7 +71,7 @@ struct MusicChunk {
* object is owned by this chunk, and must be freed when this * object is owned by this chunk, and must be freed when this
* chunk is deinitialized. * chunk is deinitialized.
*/ */
Tag *tag; Tag *tag = nullptr;
/** /**
* Replay gain information associated with this chunk. * Replay gain information associated with this chunk.
@ -84,7 +84,7 @@ struct MusicChunk {
* changed since the last chunk. The magic value 0 indicates * changed since the last chunk. The magic value 0 indicates
* that there is no replay gain info available. * that there is no replay gain info available.
*/ */
unsigned replay_gain_serial; unsigned replay_gain_serial = 0;
/** the data (probably PCM) */ /** the data (probably PCM) */
uint8_t data[CHUNK_SIZE]; uint8_t data[CHUNK_SIZE];
@ -93,11 +93,7 @@ struct MusicChunk {
AudioFormat audio_format; AudioFormat audio_format;
#endif #endif
MusicChunk() MusicChunk() = default;
:other(nullptr),
length(0),
tag(nullptr),
replay_gain_serial(0) {}
~MusicChunk(); ~MusicChunk();