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

decoder/sndfile: make variables more local

Browse Source
This commit is contained in:
Max Kellermann
2014-07-11 21:51:07 +02:00
parent 3e19298c9e
commit eaa9a1e33b
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -155,16 +155,12 @@ time_to_frame(float t, const AudioFormat *audio_format)
static void static void
sndfile_stream_decode(Decoder &decoder, InputStream &is) sndfile_stream_decode(Decoder &decoder, InputStream &is)
{ {
SNDFILE *sf;
SF_INFO info; SF_INFO info;
size_t frame_size;
sf_count_t read_frames, num_frames;
int buffer[4096];
info.format = 0; info.format = 0;
SndfileInputStream sis{&decoder, is}; SndfileInputStream sis{&decoder, is};
sf = sf_open_virtual(&vio, SFM_READ, &info, &sis); SNDFILE *const sf = sf_open_virtual(&vio, SFM_READ, &info, &sis);
if (sf == nullptr) { if (sf == nullptr) {
LogWarning(sndfile_domain, "sf_open_virtual() failed"); LogWarning(sndfile_domain, "sf_open_virtual() failed");
return; return;
@@ -185,12 +181,14 @@ sndfile_stream_decode(Decoder &decoder, InputStream &is)
decoder_initialized(decoder, audio_format, info.seekable, decoder_initialized(decoder, audio_format, info.seekable,
frame_to_time(info.frames, &audio_format)); frame_to_time(info.frames, &audio_format));
frame_size = audio_format.GetFrameSize(); int buffer[4096];
read_frames = sizeof(buffer) / frame_size;
const size_t frame_size = audio_format.GetFrameSize();
const sf_count_t read_frames = sizeof(buffer) / frame_size;
DecoderCommand cmd; DecoderCommand cmd;
do { do {
num_frames = sf_readf_int(sf, buffer, read_frames); sf_count_t num_frames = sf_readf_int(sf, buffer, read_frames);
if (num_frames <= 0) if (num_frames <= 0)
break; break;
@@ -239,12 +237,11 @@ static bool
sndfile_scan_file(Path path_fs, sndfile_scan_file(Path path_fs,
const struct tag_handler *handler, void *handler_ctx) const struct tag_handler *handler, void *handler_ctx)
{ {
SNDFILE *sf;
SF_INFO info; SF_INFO info;
info.format = 0; info.format = 0;
sf = sf_open(path_fs.c_str(), SFM_READ, &info); SNDFILE *const sf = sf_open(path_fs.c_str(), SFM_READ, &info);
if (sf == nullptr) if (sf == nullptr)
return false; return false;