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

stream_bluray: switch to new libbluray API 

Switch to new libbluray API with three parameters to
bd_get_title_info(). libbluray versions using the old API are no
longer supported.
This commit is contained in:
Rico Tzschichholz 2011-07-10 11:21:35 +03:00 committed by Uoti Urpala
parent 5846a5e8e0
commit 10efda3b37
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -5203,7 +5203,7 @@ echores "$_vcd"
echocheck "Blu-ray support"
if test "$_bluray" = auto ; then
_bluray=no
statement_check libbluray/bluray.h 'bd_get_title_info(0, 0)' -lbluray && _bluray=yes
statement_check libbluray/bluray.h 'bd_get_title_info(0, 0, 0)' -lbluray && _bluray=yes
fi
if test "$_bluray" = yes ; then
def_bluray='#define CONFIG_LIBBLURAY 1'

14
stream/stream_bluray.c
View File

@ -116,7 +116,7 @@ static int bluray_stream_control(stream_t *s, int cmd, void *arg)
case STREAM_CTRL_GET_NUM_CHAPTERS: {
BLURAY_TITLE_INFO *ti;
ti = bd_get_title_info(b->bd, b->current_title);
ti = bd_get_title_info(b->bd, b->current_title, b->current_angle);
if (!ti)
return STREAM_UNSUPPORTED;
@ -137,7 +137,7 @@ static int bluray_stream_control(stream_t *s, int cmd, void *arg)
int64_t pos;
int r;
ti = bd_get_title_info(b->bd, b->current_title);
ti = bd_get_title_info(b->bd, b->current_title, b->current_angle);
if (!ti)
return STREAM_UNSUPPORTED;
@ -156,7 +156,7 @@ static int bluray_stream_control(stream_t *s, int cmd, void *arg)
case STREAM_CTRL_GET_NUM_ANGLES: {
BLURAY_TITLE_INFO *ti;
ti = bd_get_title_info(b->bd, b->current_title);
ti = bd_get_title_info(b->bd, b->current_title, b->current_angle);
if (!ti)
return STREAM_UNSUPPORTED;
@ -175,7 +175,7 @@ static int bluray_stream_control(stream_t *s, int cmd, void *arg)
BLURAY_TITLE_INFO *ti;
int angle = *((int *) arg);
ti = bd_get_title_info(b->bd, b->current_title);
ti = bd_get_title_info(b->bd, b->current_title, b->current_angle);
if (!ti)
return STREAM_UNSUPPORTED;
@ -238,7 +238,7 @@ static int bluray_stream_open(stream_t *s, int mode,
}
/* check for available titles on disc */
title_count = bd_get_titles(bd, TITLES_RELEVANT);
title_count = bd_get_titles(bd, TITLES_RELEVANT, angle);
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_BLURAY_TITLES=%d\n", title_count);
if (!title_count) {
mp_msg(MSGT_OPEN, MSGL_ERR,
@ -253,7 +253,7 @@ static int bluray_stream_open(stream_t *s, int mode,
BLURAY_TITLE_INFO *ti;
int sec, msec;
ti = bd_get_title_info(bd, i);
ti = bd_get_title_info(bd, i, angle);
if (!ti)
continue;
@ -287,7 +287,7 @@ static int bluray_stream_open(stream_t *s, int mode,
"ID_BLURAY_CURRENT_TITLE=%d\n", title + 1);
/* Get current title information */
info = bd_get_title_info(bd, title);
info = bd_get_title_info(bd, title, angle);
if (!info)
goto err_no_info;