Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

stream_cdda: move cdrom-device to cdda_params

Browse Source 
There is zero reason for this to be an MPOpt. Because of how the
OPT_SUBSTRACT works, the option gets renamed to cdda-device instead, but
probably not a big deal since the old alias is still in place.
This commit is contained in:
Dudemanguy
2023-09-19 16:14:24 -05:00
parent b2edd4312d
commit 6ea9ec9931
5 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
stream/stream_cdda.c
View File

@@ -61,6 +61,7 @@ typedef struct cdda_params {
size_t data_pos;
// options
char *cdda_device;
int speed;
int paranoia_mode;
int sector_size;
@@ -76,6 +77,7 @@ typedef struct cdda_params {
#define OPT_BASE_STRUCT struct cdda_params
const struct m_sub_options stream_cdda_conf = {
.opts = (const m_option_t[]) {
{"device", OPT_STRING(cdda_device), .flags = M_OPT_FILE},
{"speed", OPT_INT(speed), M_RANGE(1, 100)},
{"paranoia", OPT_INT(paranoia_mode), M_RANGE(0, 2)},
{"sector-size", OPT_INT(sector_size), M_RANGE(1, 100)},
@@ -286,15 +288,10 @@ static int open_cdda(stream_t *st)
cdrom_drive_t *cdd = NULL;
int last_track;
char *global_device;
mp_read_option_raw(st->global, "cdrom-device", &m_option_type_string,
&global_device);
talloc_steal(st, global_device);
if (st->path[0]) {
p->device = st->path;
} else if (global_device && global_device[0]) {
p->device = global_device;
} else if (p->cdda_device && p->cdda_device[0]) {
p->device = p->cdda_device;
} else {
p->device = DEFAULT_CDROM_DEVICE;
}