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

input/CdioParanoia: eliminate redundant field "lsn_to"

Browse Source 
Use "size" instead.
This commit is contained in:
Max Kellermann 2022-07-08 12:41:18 +02:00
parent 1714cf3417
commit d62426f168
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/input/plugins/CdioParanoiaInputPlugin.cxx
View File

@ -50,7 +50,7 @@ class CdioParanoiaInputStream final : public InputStream {
CdIo_t *const cdio; CdIo_t *const cdio;
CdromParanoia para; CdromParanoia para;
const lsn_t lsn_from, lsn_to; const lsn_t lsn_from;
int lsn_relofs; int lsn_relofs;
char buffer[CDIO_CD_FRAMESIZE_RAW]; char buffer[CDIO_CD_FRAMESIZE_RAW];
@ -60,10 +60,10 @@ class CdioParanoiaInputStream final : public InputStream {
CdioParanoiaInputStream(const char *_uri, Mutex &_mutex, CdioParanoiaInputStream(const char *_uri, Mutex &_mutex,
cdrom_drive_t *_drv, CdIo_t *_cdio, cdrom_drive_t *_drv, CdIo_t *_cdio,
bool reverse_endian, bool reverse_endian,
lsn_t _lsn_from, lsn_t _lsn_to) lsn_t _lsn_from, lsn_t lsn_to)
:InputStream(_uri, _mutex), :InputStream(_uri, _mutex),
drv(_drv), cdio(_cdio), para(drv), drv(_drv), cdio(_cdio), para(drv),
lsn_from(_lsn_from), lsn_to(_lsn_to), lsn_from(_lsn_from),
lsn_relofs(0), lsn_relofs(0),
buffer_lsn(-1) buffer_lsn(-1)
{ {
@ -350,7 +350,7 @@ CdioParanoiaInputStream::Read(std::unique_lock<Mutex> &,
bool bool
CdioParanoiaInputStream::IsEOF() const noexcept CdioParanoiaInputStream::IsEOF() const noexcept
{ {
return lsn_from + lsn_relofs > lsn_to; return offset >= size;
} }
static constexpr const char *cdio_paranoia_prefixes[] = { static constexpr const char *cdio_paranoia_prefixes[] = {