mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 03:52:22 +02:00
Code

stream_cdda: add option to enable cdtext, and disable it by default

Browse Source 
Fixes #1615.
This commit is contained in:
wm4 2015-03-03 15:29:07 +01:00
parent 1ba24d2585
commit 9746e71efc
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DOCS/man/options.rst
View File

@ -1944,6 +1944,10 @@ Disc Devices
``--cdda-skip=<yes|no>`` ``--cdda-skip=<yes|no>``
(Never) accept imperfect data reconstruction. (Never) accept imperfect data reconstruction.
``--cdda-cdtext=<yes|no>``
Print CD text. This is disabled by default, because it ruins perfomance
with CD-ROM drives for unknown reasons.
``--dvd-speed=<speed>`` ``--dvd-speed=<speed>``
Try to limit DVD speed (default: 0, no change). DVD base speed is 1385 Try to limit DVD speed (default: 0, no change). DVD base speed is 1385
kB/s, so an 8x drive can read at speeds up to 11080 kB/s. Slower speeds kB/s, so an 8x drive can read at speeds up to 11080 kB/s. Slower speeds

8
stream/stream_cdda.c
View File

@ -64,6 +64,7 @@ typedef struct cdda_params {
int skip; int skip;
char *device; char *device;
int span[2]; int span[2];
int cdtext;
} cdda_priv; } cdda_priv;
#define OPT_BASE_STRUCT struct cdda_params #define OPT_BASE_STRUCT struct cdda_params
@ -86,6 +87,7 @@ const struct m_sub_options stream_cdda_conf = {
OPT_FLAG("skip", skip, 0), OPT_FLAG("skip", skip, 0),
OPT_STRING("device", device, 0), OPT_STRING("device", device, 0),
OPT_INTPAIR("span", span, 0), OPT_INTPAIR("span", span, 0),
OPT_FLAG("cdtext", cdtext, 0),
{0} {0}
}, },
.size = sizeof(struct cdda_params), .size = sizeof(struct cdda_params),
@ -117,9 +119,11 @@ static const char *const cdtext_name[] = {
#endif #endif
}; };
static bool print_cdtext(stream_t *s, int track) static void print_cdtext(stream_t *s, int track)
{ {
cdda_priv* p = (cdda_priv*)s->priv; cdda_priv* p = (cdda_priv*)s->priv;
if (!p->cdtext)
return;
#ifdef OLD_API #ifdef OLD_API
cdtext_t *text = cdio_get_cdtext(p->cd->p_cdio, track); cdtext_t *text = cdio_get_cdtext(p->cd->p_cdio, track);
#else #else
@ -141,9 +145,7 @@ static bool print_cdtext(stream_t *s, int track)
MP_INFO(s, " %s: '%s'\n", name, value); MP_INFO(s, " %s: '%s'\n", name, value);
} }
} }
return true;
} }
return false;
} }
static void print_track_info(stream_t *s, int track) static void print_track_info(stream_t *s, int track)