RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

stream_bluray: remove the broken -bluray-chapter option 

Remove the broken -bluray-chapter option.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@36175 b3059339-0415-0410-9bf9-f77b7e298cf2

Conflicts:
	DOCS/man/en/mplayer.1
	cfg-common.h
This commit is contained in:
reimar 2013-04-26 19:50:19 +00:00 committed by wm4
parent 2f004875d3
commit daee1a04e7
4 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DOCS/man/en/options.rst
View File

@ -296,11 +296,6 @@
Some Blu-ray discs contain scenes that can be viewed from multiple angles.
Here you can tell mpv which angles to use (default: 1).
--bluray-chapter=<ID>
(Blu-ray only)
Tells mpv which Blu-ray chapter to start the current title from
(default: 1).
--bluray-device=<path>
(Blu-ray only)
Specify the Blu-ray disc location. Must be a directory with Blu-ray

1
core/cfg-mplayer.h
View File

@ -321,7 +321,6 @@ const m_option_t common_opts[] = {
#ifdef CONFIG_LIBBLURAY
{"bluray-device", &bluray_device, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"bluray-angle", &bluray_angle, CONF_TYPE_INT, CONF_RANGE, 0, 999, NULL},
{"bluray-chapter", &bluray_chapter, CONF_TYPE_INT, CONF_RANGE, 0, 999, NULL},
#endif /* CONFIG_LIBBLURAY */
#ifdef CONFIG_NETWORKING

3
stream/stream.h
View File

@ -408,11 +408,10 @@ int stream_read_internal(stream_t *s, void *buf, int len);
/// Internal seek function bypassing the stream buffer
int stream_seek_internal(stream_t *s, int64_t newpos);
extern int bluray_angle;
extern int bluray_chapter;
extern int dvd_title;
extern int dvd_angle;
extern int bluray_angle;
extern char *bluray_device;
typedef struct {

15
stream/stream_bluray.c
View File

@ -50,7 +50,6 @@
char *bluray_device = NULL;
int bluray_angle = 0;
int bluray_chapter = 0;
struct bluray_priv_s {
BLURAY *bd;
@ -246,9 +245,8 @@ static int bluray_stream_open(stream_t *s, int mode,
int title, title_guess, title_count;
uint64_t title_size;
unsigned int chapter = 0, angle = 0;
unsigned int angle = 0;
uint64_t max_duration = 0;
int64_t chapter_pos = 0;
char *device = NULL;
int i;
@ -327,16 +325,6 @@ static int bluray_stream_open(stream_t *s, int mode,
if (!info)
goto err_no_info;
/* Select chapter */
chapter = bluray_chapter ? bluray_chapter : BLURAY_DEFAULT_CHAPTER;
chapter = FFMIN(chapter, info->chapter_count);
if (chapter)
chapter_pos = bd_chapter_pos(bd, chapter);
mp_msg(MSGT_IDENTIFY, MSGL_INFO,
"ID_BLURAY_CURRENT_CHAPTER=%d\n", chapter + 1);
/* Select angle */
angle = bluray_angle ? bluray_angle : BLURAY_DEFAULT_ANGLE;
angle = FFMIN(angle, info->angle_count);
@ -359,7 +347,6 @@ err_no_info:
b->current_angle = angle;
b->current_title = title;
s->start_pos = chapter_pos;
s->end_pos = title_size;
s->sector_size = BLURAY_SECTOR_SIZE;
s->flags = mode | MP_STREAM_SEEK;