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

Merge branch 'v0.18.x'

Browse Source
This commit is contained in:
Max Kellermann
2014-07-11 21:33:50 +02:00
parent 681643ea9e ecb67a1ed1
commit 828cd6fd0b
12 changed files with 148 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/decoder/plugins/AudiofileDecoderPlugin.cxx
View File

@@ -55,7 +55,7 @@ struct AudioFileInputStream {
size_t Read(void *buffer, size_t size) {
/* libaudiofile does not like partial reads at all,
and wil abort playback; therefore always force full
and will abort playback; therefore always force full
reads */
return decoder_read_full(decoder, is, buffer, size)
? size
@@ -118,9 +118,11 @@ audiofile_file_seek(AFvirtualfile *vfile, AFfileoffset _offset,
if (is_relative)
offset += is.GetOffset();
if (is.LockSeek(offset, IgnoreError())) {
Error error;
if (is.LockSeek(offset, error)) {
return is.GetOffset();
} else {
LogError(error, "Seek failed");
return -1;
}
}

55
src/decoder/plugins/SndfileDecoderPlugin.cxx
View File

@@ -32,10 +32,24 @@
static constexpr Domain sndfile_domain("sndfile");
struct SndfileInputStream {
Decoder *const decoder;
InputStream &is;
size_t Read(void *buffer, size_t size) {
/* libsndfile chokes on partial reads; therefore
always force full reads */
return decoder_read_full(decoder, is, buffer, size)
? size
: 0;
}
};
static sf_count_t
sndfile_vio_get_filelen(void *user_data)
{
const InputStream &is = *(const InputStream *)user_data;
SndfileInputStream &sis = *(SndfileInputStream *)user_data;
const InputStream &is = sis.is;
return is.GetSize();
}
@@ -43,7 +57,8 @@ sndfile_vio_get_filelen(void *user_data)
static sf_count_t
sndfile_vio_seek(sf_count_t _offset, int whence, void *user_data)
{
InputStream &is = *(InputStream *)user_data;
SndfileInputStream &sis = *(SndfileInputStream *)user_data;
InputStream &is = sis.is;
InputStream::offset_type offset = _offset;
switch (whence) {
@@ -65,8 +80,11 @@ sndfile_vio_seek(sf_count_t _offset, int whence, void *user_data)
return -1;
}
if (!is.LockSeek(offset, IgnoreError()))
Error error;
if (!is.LockSeek(offset, error)) {
LogError(error, "Seek failed");
return -1;
}
return is.GetOffset();
}
@@ -74,30 +92,9 @@ sndfile_vio_seek(sf_count_t _offset, int whence, void *user_data)
static sf_count_t
sndfile_vio_read(void *ptr, sf_count_t count, void *user_data)
{
InputStream &is = *(InputStream *)user_data;
SndfileInputStream &sis = *(SndfileInputStream *)user_data;
sf_count_t total_bytes = 0;
Error error;
/* this loop is necessary because libsndfile chokes on partial
reads */
do {
size_t nbytes = is.LockRead((char *)ptr + total_bytes,
count - total_bytes, error);
if (nbytes == 0) {
if (error.IsDefined()) {
LogError(error);
return -1;
}
break;
}
total_bytes += nbytes;
} while (total_bytes < count);
return total_bytes;
return sis.Read(ptr, count);
}
static sf_count_t
@@ -112,7 +109,8 @@ sndfile_vio_write(gcc_unused const void *ptr,
static sf_count_t
sndfile_vio_tell(void *user_data)
{
const InputStream &is = *(const InputStream *)user_data;
SndfileInputStream &sis = *(SndfileInputStream *)user_data;
const InputStream &is = sis.is;
return is.GetOffset();
}
@@ -158,7 +156,8 @@ sndfile_stream_decode(Decoder &decoder, InputStream &is)
info.format = 0;
sf = sf_open_virtual(&vio, SFM_READ, &info, &is);
SndfileInputStream sis{&decoder, is};
sf = sf_open_virtual(&vio, SFM_READ, &info, &sis);
if (sf == nullptr) {
LogWarning(sndfile_domain, "sf_open_virtual() failed");
return;