[libbluray-devel] commit: Removed internally handled events from public API (hpi1 )

[git at videolan.org]

libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Mon Nov 15 15:29:39 2010 +0200| [81944fc386431a94ae39e23ef98181cf08ceb2ad] | committer: hpi1 

Removed internally handled events from public API

> http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=81944fc386431a94ae39e23ef98181cf08ceb2ad
---

 src/examples/hdmv_test.c |   18 +-----------------
 src/libbluray/bluray.c   |   13 -------------
 src/libbluray/bluray.h   |    7 -------
 3 files changed, 1 insertions(+), 37 deletions(-)

diff --git a/src/examples/hdmv_test.c b/src/examples/hdmv_test.c
index 5f78bab..c0037e7 100644
--- a/src/examples/hdmv_test.c
+++ b/src/examples/hdmv_test.c
@@ -52,27 +52,11 @@ static void _print_event(BD_EVENT *ev)
             printf("EVENT_CHAPTER:\t%d\n", ev->param);
             break;
 
-        /* Interactive Graphics */
-
-        case BD_EVENT_MENU_PAGE_ID:
-            printf("EVENT_MENU_PAGE_ID:\t%d\n", ev->param);
-            break;
-        case BD_EVENT_SELECTED_BUTTON_ID:
-            printf("EVENT_SELECTED_BUTTON_ID:\t%d\n", ev->param);
-            break;
+        /* */
 
         case BD_EVENT_STILL:
             printf("EVENT_STILL:\t%d\n", ev->param);
             break;
-        case BD_EVENT_ENABLE_BUTTON:
-            printf("EVENT_ENABLE_BUTTON:\t%d\n", ev->param);
-            break;
-        case BD_EVENT_DISABLE_BUTTON:
-            printf("EVENT_DISABLE_BUTTON:\t%d\n", ev->param);
-            break;
-        case BD_EVENT_POPUP_OFF:
-            printf("EVENT_POPUP_OFF:\t%d\n", ev->param);
-            break;
 
         /* stream selection */
 
diff --git a/src/libbluray/bluray.c b/src/libbluray/bluray.c
index 5cc602a..32ac0e9 100644
--- a/src/libbluray/bluray.c
+++ b/src/libbluray/bluray.c
@@ -1519,16 +1519,6 @@ static void _process_psr_event(void *handle, BD_PSR_EVENT *ev)
         case PSR_PLAYITEM: _queue_event(bd, (BD_EVENT){BD_EVENT_PLAYITEM, ev->new_val}); break;
         case PSR_CHAPTER:  _queue_event(bd, (BD_EVENT){BD_EVENT_CHAPTER,  ev->new_val}); break;
 
-        /* Interactive Graphics */
-
-        case PSR_SELECTED_BUTTON_ID:
-            _queue_event(bd, (BD_EVENT){BD_EVENT_SELECTED_BUTTON_ID, ev->new_val});
-            break;
-
-        case PSR_MENU_PAGE_ID:
-            _queue_event(bd, (BD_EVENT){BD_EVENT_MENU_PAGE_ID, ev->new_val});
-            break;
-
         /* stream selection */
 
         case PSR_IG_STREAM_ID:
@@ -1744,12 +1734,10 @@ static void _process_hdmv_vm_event(BLURAY *bd, HDMV_EVENT *hev)
             break;
 
         case HDMV_EVENT_ENABLE_BUTTON:
-            _queue_event(bd, (BD_EVENT){BD_EVENT_ENABLE_BUTTON, hev->param});
             _run_gc(bd, GC_CTRL_ENABLE_BUTTON, hev->param);
             break;
 
         case HDMV_EVENT_DISABLE_BUTTON:
-            _queue_event(bd, (BD_EVENT){BD_EVENT_DISABLE_BUTTON, hev->param});
             _run_gc(bd, GC_CTRL_DISABLE_BUTTON, hev->param);
             break;
 
@@ -1758,7 +1746,6 @@ static void _process_hdmv_vm_event(BLURAY *bd, HDMV_EVENT *hev)
             break;
 
         case HDMV_EVENT_POPUP_OFF:
-            _queue_event(bd, (BD_EVENT){BD_EVENT_POPUP_OFF, 0});
             _run_gc(bd, GC_CTRL_POPUP, 0);
             break;
 
diff --git a/src/libbluray/bluray.h b/src/libbluray/bluray.h
index 54ce365..e7c2014 100644
--- a/src/libbluray/bluray.h
+++ b/src/libbluray/bluray.h
@@ -456,13 +456,6 @@ typedef enum {
     BD_EVENT_SECONDARY_VIDEO,        /* 0 - disable, 1 - enable */
     BD_EVENT_SECONDARY_VIDEO_SIZE,   /* 0 - PIP, 0xf - fullscreen */
 
-    /* Interactive Graphics */
-    BD_EVENT_MENU_PAGE_ID,           /* 0..0xfe */
-    BD_EVENT_SELECTED_BUTTON_ID,     /* 0..0x1fdf, 0xffff = invalid */
-    BD_EVENT_POPUP_OFF,
-    BD_EVENT_ENABLE_BUTTON,    /* param: button id */
-    BD_EVENT_DISABLE_BUTTON,   /* param: button id */
-
     /* still */
     BD_EVENT_STILL,         /* 0 - off, 1 - on */