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

input/cdio: remove unused attribute "trackno"

Browse Source
This commit is contained in:
Max Kellermann 2014-05-12 18:41:45 +02:00
parent 3cd24c0a51
commit dd383037fd
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,16 +58,12 @@ struct CdioParanoiaInputStream final : public InputStream {
lsn_t lsn_from, lsn_to; lsn_t lsn_from, lsn_to;
int lsn_relofs; int lsn_relofs;
int trackno;
char buffer[CDIO_CD_FRAMESIZE_RAW]; char buffer[CDIO_CD_FRAMESIZE_RAW];
int buffer_lsn; int buffer_lsn;
CdioParanoiaInputStream(const char *_uri, Mutex &_mutex, Cond &_cond, CdioParanoiaInputStream(const char *_uri, Mutex &_mutex, Cond &_cond)
int _trackno)
:InputStream(_uri, _mutex, _cond), :InputStream(_uri, _mutex, _cond),
drv(nullptr), cdio(nullptr), para(nullptr), drv(nullptr), cdio(nullptr), para(nullptr)
trackno(_trackno)
{ {
} }
@ -184,8 +180,7 @@ input_cdio_open(const char *uri,
return nullptr; return nullptr;
CdioParanoiaInputStream *i = CdioParanoiaInputStream *i =
new CdioParanoiaInputStream(uri, mutex, cond, new CdioParanoiaInputStream(uri, mutex, cond);
parsed_uri.track);
/* get list of CD's supporting CD-DA */ /* get list of CD's supporting CD-DA */
const AllocatedPath device = parsed_uri.device[0] != 0 const AllocatedPath device = parsed_uri.device[0] != 0
@ -243,9 +238,9 @@ input_cdio_open(const char *uri,
i->lsn_relofs = 0; i->lsn_relofs = 0;
if (i->trackno >= 0) { if (parsed_uri.track >= 0) {
i->lsn_from = cdio_get_track_lsn(i->cdio, i->trackno); i->lsn_from = cdio_get_track_lsn(i->cdio, parsed_uri.track);
i->lsn_to = cdio_get_track_last_lsn(i->cdio, i->trackno); i->lsn_to = cdio_get_track_last_lsn(i->cdio, parsed_uri.track);
} else { } else {
i->lsn_from = 0; i->lsn_from = 0;
i->lsn_to = cdio_get_disc_last_lsn(i->cdio); i->lsn_to = cdio_get_disc_last_lsn(i->cdio);