Move cddap_speed_set below cddap_open to make sure that the drive was initialized and opened before attemting to set the speed
This commit is contained in:
parent
9eb26ab90c
commit
1a7278f1d3
|
@ -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,12 @@ 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);
|
||||||
|
cdio_cddap_speed_set(drv,speed);
|
||||||
|
}
|
||||||
|
|
||||||
bool reverse_endian;
|
bool reverse_endian;
|
||||||
const int be = data_bigendianp(drv);
|
const int be = data_bigendianp(drv);
|
||||||
switch (be) {
|
switch (be) {
|
||||||
|
|
Loading…
Reference in New Issue