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

Merge branch 'extend-robustness-of-cdda-playback' of https://github.com/lazypingu/MPD

Browse Source
This commit is contained in:
Max Kellermann 2024-03-15 18:39:45 +01:00
commit cc291e8c98
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -214,11 +214,6 @@ input_cdio_open(const char *uri,
} }
cdio_cddap_verbose_set(drv, CDDA_MESSAGE_FORGETIT, CDDA_MESSAGE_FORGETIT); cdio_cddap_verbose_set(drv, CDDA_MESSAGE_FORGETIT, CDDA_MESSAGE_FORGETIT);
if (speed > 0) {
FmtDebug(cdio_domain, "Attempting to set CD speed to {}x",
speed);
cdio_cddap_speed_set(drv,speed);
}
if (0 != cdio_cddap_open(drv)) { if (0 != cdio_cddap_open(drv)) {
cdio_cddap_close_no_free_cdio(drv); cdio_cddap_close_no_free_cdio(drv);
@ -226,6 +221,15 @@ input_cdio_open(const char *uri,
throw std::runtime_error("Unable to open disc."); throw std::runtime_error("Unable to open disc.");
} }
if (speed > 0) {
FmtDebug(cdio_domain, "Attempting to set CD speed to {}x",
speed);
/* Negative value indicate error (e.g. -405: not supported) */
if (cdio_cddap_speed_set(drv,speed) < 0)
FmtDebug(cdio_domain, "Failed to set CD speed to {}x",
speed);
}
bool reverse_endian; bool reverse_endian;
const int be = data_bigendianp(drv); const int be = data_bigendianp(drv);
switch (be) { switch (be) {
@ -253,13 +257,23 @@ input_cdio_open(const char *uri,
lsn_t lsn_from, lsn_to; lsn_t lsn_from, lsn_to;
if (parsed_uri.track >= 0) { if (parsed_uri.track >= 0) {
lsn_from = cdio_get_track_lsn(cdio, parsed_uri.track); lsn_from = cdio_cddap_track_firstsector(drv, parsed_uri.track);
lsn_to = cdio_get_track_last_lsn(cdio, parsed_uri.track); lsn_to = cdio_cddap_track_lastsector(drv, parsed_uri.track);
} else { } else {
lsn_from = 0; lsn_from = cdio_cddap_disc_firstsector(drv);
lsn_to = cdio_get_disc_last_lsn(cdio); lsn_to = cdio_cddap_disc_lastsector(drv);
} }
/* LSNs < 0 indicate errors (e.g. -401: Invaid track, -402: no pregap) */
if(lsn_from < 0 || lsn_to < 0)
throw FmtRuntimeError("Error {} on track {}",
lsn_from < 0 ? lsn_from : lsn_to, parsed_uri.track);
/* Only check for audio track if not pregap or whole CD */
if (!cdio_cddap_track_audiop(drv, parsed_uri.track) && parsed_uri.track > 0)
throw FmtRuntimeError("No audio track: {}",
parsed_uri.track);
return std::make_unique<CdioParanoiaInputStream>(uri, mutex, return std::make_unique<CdioParanoiaInputStream>(uri, mutex,
drv, cdio, drv, cdio,
reverse_endian, reverse_endian,