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

decoder/wavpack: move wavpack_input_init into struct WavpackInput

Browse Source
This commit is contained in:
Max Kellermann 2014-05-22 10:53:11 +02:00
parent ba99696771
commit ec162f265f
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/decoder/plugins/WavpackDecoderPlugin.cxx
View File

@ -326,10 +326,13 @@ wavpack_scan_file(Path path_fs,
/* This struct is needed for per-stream last_byte storage. */ /* This struct is needed for per-stream last_byte storage. */
struct WavpackInput { struct WavpackInput {
Decoder *decoder; Decoder *const decoder;
InputStream *is; InputStream *const is;
/* Needed for push_back_byte() */ /* Needed for push_back_byte() */
int last_byte; int last_byte;
constexpr WavpackInput(Decoder &_decoder, InputStream &_is)
:decoder(&_decoder), is(&_is), last_byte(EOF) {}
}; };
/** /**
@ -429,15 +432,6 @@ static WavpackStreamReader mpd_is_reader = {
nullptr /* no need to write edited tags */ nullptr /* no need to write edited tags */
}; };
static void
wavpack_input_init(WavpackInput *isp, Decoder &decoder,
InputStream &is)
{
isp->decoder = &decoder;
isp->is = &is;
isp->last_byte = EOF;
}
static WavpackInput * static WavpackInput *
wavpack_open_wvc(Decoder &decoder, const char *uri) wavpack_open_wvc(Decoder &decoder, const char *uri)
{ {
@ -456,9 +450,7 @@ wavpack_open_wvc(Decoder &decoder, const char *uri)
if (is_wvc == nullptr) if (is_wvc == nullptr)
return nullptr; return nullptr;
WavpackInput *wpi = new WavpackInput(); return new WavpackInput(decoder, *is_wvc);
wavpack_input_init(wpi, decoder, *is_wvc);
return wpi;
} }
/* /*
@ -480,8 +472,7 @@ wavpack_streamdecode(Decoder &decoder, InputStream &is)
open_flags |= OPEN_STREAMING; open_flags |= OPEN_STREAMING;
} }
WavpackInput isp; WavpackInput isp(decoder, is);
wavpack_input_init(&isp, decoder, is);
char error[ERRORLEN]; char error[ERRORLEN];
WavpackContext *wpc = WavpackContext *wpc =