Mercurial > mplayer.hg
changeset 34038:422eb76aee70
stream_bluray: switch to new libbluray API
The last libbluray API change is
commit 17896a40e6ddbe12473db77549ff0207ef748a64
Date: Mon Jun 13 20:36:16 2011 +0300
previous libbluray versions are no longer supported.
| author | diego |
|---|---|
| date | Fri, 23 Sep 2011 14:26:20 +0000 |
| parents | ce4eacdd7f5a |
| children | 4282458d64bc |
| files | configure stream/stream_bluray.c |
| diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Fri Sep 23 07:36:15 2011 +0000 +++ b/configure Fri Sep 23 14:26:20 2011 +0000 @@ -5738,7 +5738,7 @@ 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'
--- a/stream/stream_bluray.c Fri Sep 23 07:36:15 2011 +0000 +++ b/stream/stream_bluray.c Fri Sep 23 14:26:20 2011 +0000 @@ -116,7 +116,7 @@ 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 @@ 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 @@ 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 @@ 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; @@ -236,7 +236,7 @@ } /* 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, MSGTR_BlurayNoTitles); @@ -250,7 +250,7 @@ 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; @@ -284,7 +284,7 @@ "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;