[libbluray-devel] Moved TITLE_FIRST_PLAY and TITLE_TOP_MENU defines to bluray.h

[hpi1]

libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Tue Jan 25 16:07:16 2011 +0200| [bbf11e43bd82eabce8a4f8aa3ec09bccef18de2e] | committer: hpi1

Moved TITLE_FIRST_PLAY and TITLE_TOP_MENU defines to bluray.h
(those can be used with BD_EVENT_TITLE and bd_play_title())

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

 src/libbluray/bluray.c |   11 ++++-------
 src/libbluray/bluray.h |    2 ++
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/libbluray/bluray.c b/src/libbluray/bluray.c
index 6cb7d91..138ab01 100644
--- a/src/libbluray/bluray.c
+++ b/src/libbluray/bluray.c
@@ -1731,13 +1731,10 @@ static int _play_hdmv(BLURAY *bd, unsigned id_ref)
     return 1;
 }
 
-#define TITLE_FIRST_PLAY 0xffff   /* 10.4.3.2 (E) */
-#define TITLE_TOP_MENU   0x0000   /* 5.2.3.3 */
-
 int bd_play_title(BLURAY *bd, unsigned title)
 {
     /* first play object ? */
-    if (title == TITLE_FIRST_PLAY) {
+    if (title == BLURAY_TITLE_FIRST_PLAY) {
         INDX_PLAY_ITEM *p = &bd->index->first_play;
 
         bd_psr_write(bd->regs, PSR_TITLE_NUMBER, 0xffff); /* 5.2.3.3 */
@@ -1765,7 +1762,7 @@ int bd_play_title(BLURAY *bd, unsigned title)
     }
 
     /* top menu ? */
-    if (title == TITLE_TOP_MENU) {
+    if (title == BLURAY_TITLE_TOP_MENU) {
         INDX_PLAY_ITEM *p = &bd->index->top_menu;
 
         bd_psr_write(bd->regs, PSR_TITLE_NUMBER, 0); /* 5.2.3.3 */
@@ -1817,7 +1814,7 @@ int bd_play(BLURAY *bd)
     bd_psr_register_cb(bd->regs, _process_psr_event, bd);
     _queue_initial_psr_events(bd);
 
-    return bd_play_title(bd, TITLE_FIRST_PLAY);
+    return bd_play_title(bd, BLURAY_TITLE_FIRST_PLAY);
 }
 
 int bd_menu_call(BLURAY *bd, int64_t pts)
@@ -1831,7 +1828,7 @@ int bd_menu_call(BLURAY *bd, int64_t pts)
         return 0;
     }
 
-    return bd_play_title(bd, TITLE_TOP_MENU);
+    return bd_play_title(bd, BLURAY_TITLE_TOP_MENU);
 }
 
 static void _run_gc(BLURAY *bd, gc_ctrl_e msg, uint32_t param)
diff --git a/src/libbluray/bluray.h b/src/libbluray/bluray.h
index 1a4f36e..2d58a4c 100644
--- a/src/libbluray/bluray.h
+++ b/src/libbluray/bluray.h
@@ -489,6 +489,8 @@ typedef struct {
     uint32_t   param;
 } BD_EVENT;
 
+#define BLURAY_TITLE_FIRST_PLAY  0xffff
+#define BLURAY_TITLE_TOP_MENU    0
 /**
  *
  *  Get event from libbluray event queue.