libbluray | branch: master | hpi1 <[email protected]> | Mon Apr 6 17:34:47 2015 +0300| [7eb4deb930de6d7e5f2791f8eb6b77618ac6042a] | committer: hpi1
Remove old event > http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=7eb4deb930de6d7e5f2791f8eb6b77618ac6042a --- src/libbluray/bdj/bdj.c | 1 - src/libbluray/bdj/bdj.h | 1 - src/libbluray/bdj/java/org/videolan/Libbluray.java | 28 +++++++++----------- .../java/org/videolan/media/content/BDHandler.java | 4 --- 4 files changed, 13 insertions(+), 21 deletions(-) diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c index 671d355..4e03cef 100644 --- a/src/libbluray/bdj/bdj.c +++ b/src/libbluray/bdj/bdj.c @@ -617,7 +617,6 @@ int bdj_process_event(BDJAVA *bdjava, unsigned ev, unsigned param) "PLAYITEM", "ANGLE", "SUBTITLE", - "PIP", "END_OF_PLAYLIST", "PTS", "VK_KEY", diff --git a/src/libbluray/bdj/bdj.h b/src/libbluray/bdj/bdj.h index c998ceb..60fe180 100644 --- a/src/libbluray/bdj/bdj.h +++ b/src/libbluray/bdj/bdj.h @@ -28,7 +28,6 @@ typedef enum { BDJ_EVENT_PLAYITEM, BDJ_EVENT_ANGLE, BDJ_EVENT_SUBTITLE, - BDJ_EVENT_PIP, BDJ_EVENT_END_OF_PLAYLIST, BDJ_EVENT_PTS, BDJ_EVENT_VK_KEY, diff --git a/src/libbluray/bdj/java/org/videolan/Libbluray.java b/src/libbluray/bdj/java/org/videolan/Libbluray.java index 261d84b..add4acb 100644 --- a/src/libbluray/bdj/java/org/videolan/Libbluray.java +++ b/src/libbluray/bdj/java/org/videolan/Libbluray.java @@ -483,7 +483,6 @@ public class Libbluray { case BDJ_EVENT_PLAYLIST: case BDJ_EVENT_ANGLE: case BDJ_EVENT_SUBTITLE: - case BDJ_EVENT_PIP: case BDJ_EVENT_AUDIO_STREAM: case BDJ_EVENT_SECONDARY_STREAM: case BDJ_EVENT_END_OF_PLAYLIST: @@ -548,20 +547,19 @@ public class Libbluray { public static final int BDJ_EVENT_PLAYITEM = 2; public static final int BDJ_EVENT_ANGLE = 3; public static final int BDJ_EVENT_SUBTITLE = 4; - public static final int BDJ_EVENT_PIP = 5; - public static final int BDJ_EVENT_END_OF_PLAYLIST = 6; - public static final int BDJ_EVENT_PTS = 7; - private static final int BDJ_EVENT_VK_KEY = 8; - public static final int BDJ_EVENT_MARK = 9; - private static final int BDJ_EVENT_PSR102 = 10; - public static final int BDJ_EVENT_PLAYLIST = 11; - - private static final int BDJ_EVENT_START = 12; - private static final int BDJ_EVENT_STOP = 13; - - public static final int BDJ_EVENT_RATE = 14; - public static final int BDJ_EVENT_AUDIO_STREAM = 15; - public static final int BDJ_EVENT_SECONDARY_STREAM = 16; + public static final int BDJ_EVENT_END_OF_PLAYLIST = 5; + public static final int BDJ_EVENT_PTS = 6; + private static final int BDJ_EVENT_VK_KEY = 7; + public static final int BDJ_EVENT_MARK = 8; + private static final int BDJ_EVENT_PSR102 = 9; + public static final int BDJ_EVENT_PLAYLIST = 10; + + private static final int BDJ_EVENT_START = 11; + private static final int BDJ_EVENT_STOP = 12; + + public static final int BDJ_EVENT_RATE = 13; + public static final int BDJ_EVENT_AUDIO_STREAM = 14; + public static final int BDJ_EVENT_SECONDARY_STREAM = 15; /* TODO: use org/bluray/system/RegisterAccess instead */ public static final int PSR_IG_STREAM_ID = 0; diff --git a/src/libbluray/bdj/java/org/videolan/media/content/BDHandler.java b/src/libbluray/bdj/java/org/videolan/media/content/BDHandler.java index fdc37c6..10d6a98 100644 --- a/src/libbluray/bdj/java/org/videolan/media/content/BDHandler.java +++ b/src/libbluray/bdj/java/org/videolan/media/content/BDHandler.java @@ -380,7 +380,6 @@ public abstract class BDHandler implements Player, ServiceContentHandler { protected void doPlayItemReached(int playitem) {}; protected void doAngleChanged(int angle) {}; protected void doSubtitleChanged(int param) {}; - protected void doPiPChanged(int param) {}; protected void doAudioStreamChanged(int param) {}; protected void doSecondaryStreamChanged(int param) {}; @@ -637,9 +636,6 @@ public abstract class BDHandler implements Player, ServiceContentHandler { case Libbluray.BDJ_EVENT_SUBTITLE: player.doSubtitleChanged(param2); break; - case Libbluray.BDJ_EVENT_PIP: - player.doPiPChanged(param2); - break; case Libbluray.BDJ_EVENT_END_OF_PLAYLIST: player.doEndOfMediaReached(param2); break; _______________________________________________ libbluray-devel mailing list [email protected] https://mailman.videolan.org/listinfo/libbluray-devel
