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

MusicChunk: return WritableBuffer

Browse Source
This commit is contained in:
Max Kellermann
2013-10-28 17:10:12 +01:00
parent 5ee5a89a7f
commit de1261ba28
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/MusicChunk.cxx
View File

@@ -39,10 +39,9 @@ music_chunk::CheckFormat(const AudioFormat other_format) const
}
#endif
void *
WritableBuffer<void>
music_chunk::Write(const AudioFormat af,
float data_time, uint16_t _bit_rate,
size_t *max_length_r)
float data_time, uint16_t _bit_rate)
{
assert(CheckFormat(af));
assert(length == 0 || audio_format.IsValid());
@@ -58,14 +57,13 @@ music_chunk::Write(const AudioFormat af,
const size_t frame_size = af.GetFrameSize();
size_t num_frames = (sizeof(data) - length) / frame_size;
if (num_frames == 0)
return nullptr;
return WritableBuffer<void>::Null();
#ifndef NDEBUG
audio_format = af;
#endif
*max_length_r = num_frames * frame_size;
return data + length;
return { data + length, num_frames * frame_size };
}
bool