libbluray | branch: master | hpi1 <[email protected]> | Sun Apr 17 22:02:46 2016 +0300| [80c12e492a9e9db1eac10a1352b4c6061dd3837d] | committer: hpi1
DVBMediaSelectControlImpl: use crrect locator for current selection > http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=80c12e492a9e9db1eac10a1352b4c6061dd3837d --- .../media/content/playlist/DVBMediaSelectControlImpl.java | 2 +- .../bdj/java/org/videolan/media/content/playlist/Handler.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/libbluray/bdj/java/org/videolan/media/content/playlist/DVBMediaSelectControlImpl.java b/src/libbluray/bdj/java/org/videolan/media/content/playlist/DVBMediaSelectControlImpl.java index 00a4705..4540984 100644 --- a/src/libbluray/bdj/java/org/videolan/media/content/playlist/DVBMediaSelectControlImpl.java +++ b/src/libbluray/bdj/java/org/videolan/media/content/playlist/DVBMediaSelectControlImpl.java @@ -158,7 +158,7 @@ public class DVBMediaSelectControlImpl implements DVBMediaSelectControl{ } public Locator[] getCurrentSelection() { - BDLocator locator = player.getLocator(); + BDLocator locator = player.getCurrentLocator(); if (locator == null) return new Locator[0]; String[] tags = locator.getComponentTags(); diff --git a/src/libbluray/bdj/java/org/videolan/media/content/playlist/Handler.java b/src/libbluray/bdj/java/org/videolan/media/content/playlist/Handler.java index f201d5c..ae81c61 100644 --- a/src/libbluray/bdj/java/org/videolan/media/content/playlist/Handler.java +++ b/src/libbluray/bdj/java/org/videolan/media/content/playlist/Handler.java @@ -323,7 +323,10 @@ public class Handler extends BDHandler { super.doSeekNotify(Libbluray.tellTime()); } - protected BDLocator getLocator() { + /* used by DVBMediaSelectControlImpl */ + protected BDLocator getCurrentLocator() { + if (currentLocator != null) + return currentLocator; return locator; } _______________________________________________ libbluray-devel mailing list [email protected] https://mailman.videolan.org/listinfo/libbluray-devel
