[xine-cvs] HG: xine-lib-1.2: input_bluray: handle BD_EVENT_MENU

[Petri H. <phi...@us...>]

# HG changeset patch
# User Petri Hintukainen <phi...@us...>
# Date 1379922999 -10800
# Node ID 7a4775fef81e89804fa9f7c496dc1026f3eadc11
# Branch  default
# Parent  6d4a71dea1dfecd14493e0c2567606e68657eaf4
input_bluray: handle BD_EVENT_MENU

diff --git a/src/input/input_bluray.c b/src/input/input_bluray.c
--- a/src/input/input_bluray.c
+++ b/src/input/input_bluray.c
@@ -194,10 +194,13 @@
   if (plane < 2 && this->osd[plane]) {
     xine_osd_free(this->osd[plane]);
     this->osd[plane] = NULL;
+
+#if BLURAY_VERSION < BLURAY_VERSION_CODE(0, 2, 2)
     if (plane == 1) {
       send_num_buttons(this, 0);
       this->menu_open = 0;
     }
+#endif
   }
 }
 
@@ -292,10 +295,12 @@
     case BD_OVERLAY_FLUSH:
       xine_osd_show(osd, 0);
 
+#if BLURAY_VERSION < BLURAY_VERSION_CODE(0, 2, 2)
       if (ov->plane == 1) {
         this->menu_open = 1;
         send_num_buttons(this, 1);
       }
+#endif
       return;
 
     default:
@@ -640,6 +645,17 @@
         }
         break;
 
+#if BLURAY_VERSION >= BLURAY_VERSION_CODE(0, 2, 2)
+      case BD_EVENT_POPUP:
+        lprintf("BD_EVENT_POPUP %d\n", ev.param);
+        break;
+
+      case BD_EVENT_MENU:
+        this->menu_open = !!ev.param;
+        send_num_buttons(this, ev.param);
+        break;
+#endif
+
       default:
         lprintf("unhandled libbluray event %d [param %d]\n", ev.event, ev.param);
         break;