[libbluray-devel] Hardcoded BD_EVENT_* enum values

hpi1 git at videolan.org
Sun Feb 3 00:06:57 CET 2013


libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Sun Feb  3 00:37:34 2013 +0200| [408b65e6f3c967e41caf24bc96b3db399c110327] | committer: hpi1

Hardcoded BD_EVENT_* enum values

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

 src/libbluray/bluray.h |   95 ++++++++++++++++++++++++++++++------------------
 1 file changed, 59 insertions(+), 36 deletions(-)

diff --git a/src/libbluray/bluray.h b/src/libbluray/bluray.h
index ea51b4b..9dbb0a0 100644
--- a/src/libbluray/bluray.h
+++ b/src/libbluray/bluray.h
@@ -526,53 +526,76 @@ void bd_stop_bdj(BLURAY *bd); // shutdown BD-J and clean up resources
  */
 
 typedef enum {
-    BD_EVENT_NONE = 0,
-    BD_EVENT_ERROR,       /* Fatal error. Playback can't be continued. */
-    BD_EVENT_READ_ERROR,  /* Reading of .m2ts aligned unit failed. Next call to read will try next block. */
-    BD_EVENT_ENCRYPTED,   /* .m2ts file is encrypted and can't be played */
-
-    /* current playback position */
-    BD_EVENT_ANGLE,     /* current angle, 1...N */
-    BD_EVENT_TITLE,     /* current title, 1...N (0 = top menu) */
-    BD_EVENT_PLAYLIST,  /* current playlist (xxxxx.mpls) */
-    BD_EVENT_PLAYITEM,  /* current play item, 0...N-1  */
-    BD_EVENT_CHAPTER,   /* current chapter, 1...N */
-    BD_EVENT_END_OF_TITLE,
-
-    /* stream selection */
-    BD_EVENT_AUDIO_STREAM,           /* 1..32,  0xff  = none */
-    BD_EVENT_IG_STREAM,              /* 1..32                */
-    BD_EVENT_PG_TEXTST_STREAM,       /* 1..255, 0xfff = none */
-    BD_EVENT_PIP_PG_TEXTST_STREAM,   /* 1..255, 0xfff = none */
-    BD_EVENT_SECONDARY_AUDIO_STREAM, /* 1..32,  0xff  = none */
-    BD_EVENT_SECONDARY_VIDEO_STREAM, /* 1..32,  0xff  = none */
-
-    BD_EVENT_PG_TEXTST,              /* 0 - disable, 1 - enable */
-    BD_EVENT_PIP_PG_TEXTST,          /* 0 - disable, 1 - enable */
-    BD_EVENT_SECONDARY_AUDIO,        /* 0 - disable, 1 - enable */
-    BD_EVENT_SECONDARY_VIDEO,        /* 0 - disable, 1 - enable */
-    BD_EVENT_SECONDARY_VIDEO_SIZE,   /* 0 - PIP, 0xf - fullscreen */
-
-    /* HDMV VM or JVM seeked the stream. Next read() will return data from new position. */
-    BD_EVENT_SEEK,
+
+    BD_EVENT_NONE       = 0,  /* no pending events */
+
+    /*
+     * errors
+     */
+
+    BD_EVENT_ERROR        = 1,  /* Fatal error. Playback can't be continued. */
+    BD_EVENT_READ_ERROR   = 2,  /* Reading of .m2ts aligned unit failed. Next call to read will try next block. */
+    BD_EVENT_ENCRYPTED    = 3,  /* .m2ts file is encrypted and can't be played */
+
+    /*
+     * current playback position
+     */
+
+    BD_EVENT_ANGLE        = 4,  /* current angle, 1...N */
+    BD_EVENT_TITLE        = 5,  /* current title, 1...N (0 = top menu) */
+    BD_EVENT_PLAYLIST     = 6,  /* current playlist (xxxxx.mpls) */
+    BD_EVENT_PLAYITEM     = 7,  /* current play item, 0...N-1  */
+    BD_EVENT_CHAPTER      = 8,  /* current chapter, 1...N */
+    BD_EVENT_END_OF_TITLE = 9,
+
+    /*
+     * stream selection
+     */
+
+    BD_EVENT_AUDIO_STREAM           = 10,  /* 1..32,  0xff  = none */
+    BD_EVENT_IG_STREAM              = 11,  /* 1..32                */
+    BD_EVENT_PG_TEXTST_STREAM       = 12,  /* 1..255, 0xfff = none */
+    BD_EVENT_PIP_PG_TEXTST_STREAM   = 13,  /* 1..255, 0xfff = none */
+    BD_EVENT_SECONDARY_AUDIO_STREAM = 14,  /* 1..32,  0xff  = none */
+    BD_EVENT_SECONDARY_VIDEO_STREAM = 15,  /* 1..32,  0xff  = none */
+
+    BD_EVENT_PG_TEXTST              = 16,  /* 0 - disable, 1 - enable */
+    BD_EVENT_PIP_PG_TEXTST          = 17,  /* 0 - disable, 1 - enable */
+    BD_EVENT_SECONDARY_AUDIO        = 18,  /* 0 - disable, 1 - enable */
+    BD_EVENT_SECONDARY_VIDEO        = 19,  /* 0 - disable, 1 - enable */
+    BD_EVENT_SECONDARY_VIDEO_SIZE   = 20,  /* 0 - PIP, 0xf - fullscreen */
+
+    /*
+     * playback control
+     */
+
+    /* HDMV VM or JVM seeked the stream. Next read() will return data from new position. Flush all buffers. */
+    BD_EVENT_SEEK                   = 21,
 
     /* still playback (pause) */
-    BD_EVENT_STILL,                  /* 0 - off, 1 - on */
+    BD_EVENT_STILL                  = 22,  /* 0 - off, 1 - on */
 
-    /* Still playback for n seconds (reached end of still mode play item) */
-    BD_EVENT_STILL_TIME,             /* 0 = infinite ; 1...300 = seconds */
+    /* Still playback for n seconds (reached end of still mode play item).
+     * Playback continues by calling bd_read_skip_still(). */
+    BD_EVENT_STILL_TIME             = 23,  /* 0 = infinite ; 1...300 = seconds */
 
     /* Play sound effect */
-    BD_EVENT_SOUND_EFFECT,           /* effect ID */
+    BD_EVENT_SOUND_EFFECT           = 24,  /* effect ID */
+
+    /*
+     * status
+     */
 
     /* Pop-Up menu available */
-    BD_EVENT_POPUP,                  /* 0 - no, 1 - yes */
+    BD_EVENT_POPUP                  = 25,  /* 0 - no, 1 - yes */
 
     /* Interactive menu visible */
-    BD_EVENT_MENU,                   /* 0 - no, 1 - yes */
+    BD_EVENT_MENU                   = 26,  /* 0 - no, 1 - yes */
 
     /* 3D */
-    BD_EVENT_STEREOSCOPIC_STATUS,    /* 0 - 2D, 1 - 3D */
+    BD_EVENT_STEREOSCOPIC_STATUS    = 27,  /* 0 - 2D, 1 - 3D */
+
+    /*BD_EVENT_LAST = 27, */
 
 } bd_event_e;
 



More information about the libbluray-devel mailing list