[libbluray-devel] Update enum values
hpi1
git at videolan.org
Tue Feb 21 22:26:53 CET 2017
libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Tue Feb 21 22:40:24 2017 +0200| [e40a206d003c3615f401b393519bd96c0175361e] | committer: hpi1
Update enum values
> http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=e40a206d003c3615f401b393519bd96c0175361e
---
src/libbluray/bluray.h | 52 ++++++++++++++++++++--------------------
src/libbluray/decoders/overlay.h | 22 ++++++++---------
2 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/src/libbluray/bluray.h b/src/libbluray/bluray.h
index 08e884d..e53a977 100644
--- a/src/libbluray/bluray.h
+++ b/src/libbluray/bluray.h
@@ -674,8 +674,8 @@ typedef enum {
BLURAY_PLAYER_SETTING_DECODE_PG = 0x100, /* Enable/disable PG (subtitle) decoder. Integer. Default: disabled. */
BLURAY_PLAYER_SETTING_PERSISTENT_STORAGE = 0x101, /* Enable/disable BD-J persistent storage. Integer. Default: enabled. */
- BLURAY_PLAYER_PERSISTENT_ROOT = 400, /* Root path to the BD_J persistent storage location. String. */
- BLURAY_PLAYER_CACHE_ROOT = 401, /* Root path to the BD_J cache storage location. String. */
+ BLURAY_PLAYER_PERSISTENT_ROOT = 0x200, /* Root path to the BD_J persistent storage location. String. */
+ BLURAY_PLAYER_CACHE_ROOT = 0x201, /* Root path to the BD_J cache storage location. String. */
} bd_player_setting;
/**
@@ -700,7 +700,7 @@ int bd_set_player_setting_str(BLURAY *bd, uint32_t idx, const char *value);
typedef enum {
- BD_EVENT_NONE = 0, /* no pending events */
+ BD_EVENT_NONE = 0, /* no pending events */
/*
* errors
@@ -719,48 +719,48 @@ typedef enum {
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_PLAYMARK = 30, /* playmark reached */
- BD_EVENT_END_OF_TITLE = 9,
+ BD_EVENT_PLAYMARK = 9, /* playmark reached */
+ BD_EVENT_END_OF_TITLE = 10,
/*
* 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_AUDIO_STREAM = 11, /* 1..32, 0xff = none */
+ BD_EVENT_IG_STREAM = 12, /* 1..32 */
+ BD_EVENT_PG_TEXTST_STREAM = 13, /* 1..255, 0xfff = none */
+ BD_EVENT_PIP_PG_TEXTST_STREAM = 14, /* 1..255, 0xfff = none */
+ BD_EVENT_SECONDARY_AUDIO_STREAM = 15, /* 1..32, 0xff = none */
+ BD_EVENT_SECONDARY_VIDEO_STREAM = 16, /* 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 */
+ BD_EVENT_PG_TEXTST = 17, /* 0 - disable, 1 - enable */
+ BD_EVENT_PIP_PG_TEXTST = 18, /* 0 - disable, 1 - enable */
+ BD_EVENT_SECONDARY_AUDIO = 19, /* 0 - disable, 1 - enable */
+ BD_EVENT_SECONDARY_VIDEO = 20, /* 0 - disable, 1 - enable */
+ BD_EVENT_SECONDARY_VIDEO_SIZE = 21, /* 0 - PIP, 0xf - fullscreen */
/*
* playback control
*/
/* HDMV VM or JVM stopped playlist playback. Flush all buffers. */
- BD_EVENT_PLAYLIST_STOP = 31,
+ BD_EVENT_PLAYLIST_STOP = 22,
/* discontinuity in the stream (non-seamless connection). Reset demuxer PES buffers. */
- BD_EVENT_DISCONTINUITY = 28, /* new timestamp (45 kHz) */
+ BD_EVENT_DISCONTINUITY = 23, /* new timestamp (45 kHz) */
/* HDMV VM or JVM seeked the stream. Next read() will return data from new position. Flush all buffers. */
- BD_EVENT_SEEK = 21, /* new media time (45 kHz) */
+ BD_EVENT_SEEK = 24, /* new media time (45 kHz) */
/* still playback (pause) */
- BD_EVENT_STILL = 22, /* 0 - off, 1 - on */
+ BD_EVENT_STILL = 25, /* 0 - off, 1 - on */
/* 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 */
+ BD_EVENT_STILL_TIME = 26, /* 0 = infinite ; 1...300 = seconds */
/* Play sound effect */
- BD_EVENT_SOUND_EFFECT = 24, /* effect ID */
+ BD_EVENT_SOUND_EFFECT = 27, /* effect ID */
/*
* status
@@ -768,16 +768,16 @@ typedef enum {
/* Nothing to do. Playlist is not playing, but title applet is running.
* Application should not call bd_read*() immediately again to avoid busy loop. */
- BD_EVENT_IDLE = 29,
+ BD_EVENT_IDLE = 28,
/* Pop-Up menu available */
- BD_EVENT_POPUP = 25, /* 0 - no, 1 - yes */
+ BD_EVENT_POPUP = 29, /* 0 - no, 1 - yes */
/* Interactive menu visible */
- BD_EVENT_MENU = 26, /* 0 - no, 1 - yes */
+ BD_EVENT_MENU = 30, /* 0 - no, 1 - yes */
/* 3D */
- BD_EVENT_STEREOSCOPIC_STATUS = 27, /* 0 - 2D, 1 - 3D */
+ BD_EVENT_STEREOSCOPIC_STATUS = 31, /* 0 - 2D, 1 - 3D */
/* BD-J key interest table changed */
BD_EVENT_KEY_INTEREST_TABLE = 32, /* bitmask, BLURAY_KIT_* */
diff --git a/src/libbluray/decoders/overlay.h b/src/libbluray/decoders/overlay.h
index 08c3071..36456de 100644
--- a/src/libbluray/decoders/overlay.h
+++ b/src/libbluray/decoders/overlay.h
@@ -35,18 +35,18 @@ typedef enum {
typedef enum {
/* following events are executed immediately */
- BD_OVERLAY_INIT = 0, /* init overlay plane. Size and position of plane in x,y,w,h */
- BD_OVERLAY_CLOSE = 5, /* close overlay plane */
+ BD_OVERLAY_INIT = 0, /* init overlay plane. Size and position of plane in x,y,w,h */
+ BD_OVERLAY_CLOSE = 1, /* close overlay plane */
/* following events can be processed immediately, but changes
* should not be flushed to display before next FLUSH event
*/
- BD_OVERLAY_CLEAR = 1, /* clear plane */
- BD_OVERLAY_DRAW = 2, /* draw bitmap (x,y,w,h,img,palette,crop) */
- BD_OVERLAY_WIPE = 3, /* clear area (x,y,w,h) */
- BD_OVERLAY_HIDE = 6, /* overlay is empty and can be hidden */
+ BD_OVERLAY_CLEAR = 2, /* clear plane */
+ BD_OVERLAY_DRAW = 3, /* draw bitmap (x,y,w,h,img,palette,crop) */
+ BD_OVERLAY_WIPE = 4, /* clear area (x,y,w,h) */
+ BD_OVERLAY_HIDE = 5, /* overlay is empty and can be hidden */
- BD_OVERLAY_FLUSH = 4, /* all changes have been done, flush overlay to display at given pts */
+ BD_OVERLAY_FLUSH = 6, /* all changes have been done, flush overlay to display at given pts */
} bd_overlay_cmd_e;
@@ -125,14 +125,14 @@ void bd_overlay_free(BD_OVERLAY **pov)
typedef enum {
/* following events are executed immediately */
- BD_ARGB_OVERLAY_INIT = 0, /* init overlay plane. Size and position of plane in x,y,w,h */
- BD_ARGB_OVERLAY_CLOSE = 5, /* close overlay */
+ BD_ARGB_OVERLAY_INIT = 0, /* init overlay plane. Size and position of plane in x,y,w,h */
+ BD_ARGB_OVERLAY_CLOSE = 1, /* close overlay */
/* following events can be processed immediately, but changes
* should not be flushed to display before next FLUSH event
*/
- BD_ARGB_OVERLAY_DRAW = 2, /* draw image */
- BD_ARGB_OVERLAY_FLUSH = 4, /* all changes have been done, flush overlay to display at given pts */
+ BD_ARGB_OVERLAY_DRAW = 3, /* draw image */
+ BD_ARGB_OVERLAY_FLUSH = 6, /* all changes have been done, flush overlay to display at given pts */
} bd_argb_overlay_cmd_e;
typedef struct bd_argb_overlay_s {
More information about the libbluray-devel
mailing list