[vlc-commits] bluray: Fix BD_EVENT_UO_MASK_CHANGED case

Ron Wright git at videolan.org
Sat Dec 19 19:32:26 CET 2015


vlc | branch: master | Ron Wright <logiconcepts819 at gmail.com> | Fri Dec 18 17:47:14 2015 -0600| [c95734c9b27c762de603c22295d3c8a79b266428] | committer: Jean-Baptiste Kempf

bluray: Fix BD_EVENT_UO_MASK_CHANGED case

Building VLC with a libbluray version older than 0.8.1 results in a build
failure because the BD_EVENT_UO_MASK_CHANGED enum does not exist in those
older versions. This problem manifests itself in Ubuntu 14.04.

  CC       access/liblibbluray_plugin_la-bluray.lo
access/bluray.c: In function ‘blurayHandleEvent’:
access/bluray.c:1985:10: error: ‘BD_EVENT_UO_MASK_CHANGED’ undeclared (first use in this function)
     case BD_EVENT_UO_MASK_CHANGED:
          ^
access/bluray.c:1985:10: note: each undeclared identifier is reported only once for each function it appears in
make[4]: *** [access/liblibbluray_plugin_la-bluray.lo] Error 1

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c95734c9b27c762de603c22295d3c8a79b266428
---

 modules/access/bluray.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/access/bluray.c b/modules/access/bluray.c
index 2ae7ad6..60b7b6c 100644
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -1982,9 +1982,11 @@ static void blurayHandleEvent(demux_t *p_demux, const BD_EVENT *e)
     case BD_EVENT_PLAYMARK:
     case BD_EVENT_ANGLE:
         break;
+#if BLURAY_VERSION >= BLURAY_VERSION_CODE(0,8,1)
     case BD_EVENT_UO_MASK_CHANGED:
         /* This event could be used to grey out unselectable items in title menu */
         break;
+#endif
     case BD_EVENT_MENU:
         p_sys->b_menu_open = e->param;
         break;



More information about the vlc-commits mailing list