diff options
author | Rico Tzschichholz <ricotz@ubuntu.com> | 2011-07-10 11:21:35 +0300 |
---|---|---|
committer | Uoti Urpala <uau@mplayer2.org> | 2011-07-10 11:30:06 +0300 |
commit | 10efda3b37d9d8f08f097ce335b2f5b1c25dac72 (patch) | |
tree | 8c93b42a7d8fc0a5eba8f1cda23e051a093569e4 | |
parent | 5846a5e8e07c498e25a738335b324231f7db9a3c (diff) | |
download | mpv-10efda3b37d9d8f08f097ce335b2f5b1c25dac72.tar.bz2 mpv-10efda3b37d9d8f08f097ce335b2f5b1c25dac72.tar.xz |
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.
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | stream/stream_bluray.c | 14 |
2 files changed, 8 insertions, 8 deletions
@@ -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' diff --git a/stream/stream_bluray.c b/stream/stream_bluray.c index 33734d9575..7563a9eb77 100644 --- a/stream/stream_bluray.c +++ b/stream/stream_bluray.c @@ -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; |