libbluray | branch: master | hpi1 <[email protected]> | Wed Apr 13 12:47:34 2016 +0300| [5b6b75123e32c3f9608e74ea050d9a9c2d2fe9b3] | committer: hpi1
Cosmetics > http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=5b6b75123e32c3f9608e74ea050d9a9c2d2fe9b3 --- .../bdj/java/org/bluray/ti/CodingType.java | 6 ++--- .../bdj/java/org/bluray/ti/DiscEjectedEvent.java | 3 +-- .../bdj/java/org/bluray/ti/DiscInsertedEvent.java | 3 +-- .../bdj/java/org/bluray/ti/DiscStatusEvent.java | 3 +-- .../bdj/java/org/bluray/ti/PlayItemImpl.java | 15 ++++-------- .../bdj/java/org/bluray/ti/PlayListImpl.java | 21 ++++++----------- .../bdj/java/org/bluray/ti/TitleComponentImpl.java | 3 +-- .../bdj/java/org/bluray/ti/TitleType.java | 3 +-- .../bdj/java/org/bluray/vfs/VFSManager.java | 24 +++++++------------- 9 files changed, 27 insertions(+), 54 deletions(-) diff --git a/src/libbluray/bdj/java/org/bluray/ti/CodingType.java b/src/libbluray/bdj/java/org/bluray/ti/CodingType.java index 9fe9a8a..b6c72b5 100644 --- a/src/libbluray/bdj/java/org/bluray/ti/CodingType.java +++ b/src/libbluray/bdj/java/org/bluray/ti/CodingType.java @@ -20,13 +20,11 @@ package org.bluray.ti; public class CodingType { - protected CodingType(String name) - { + protected CodingType(String name) { this.name = name; } - public String toString() - { + public String toString() { return name; } diff --git a/src/libbluray/bdj/java/org/bluray/ti/DiscEjectedEvent.java b/src/libbluray/bdj/java/org/bluray/ti/DiscEjectedEvent.java index 833291c..4ef56f4 100644 --- a/src/libbluray/bdj/java/org/bluray/ti/DiscEjectedEvent.java +++ b/src/libbluray/bdj/java/org/bluray/ti/DiscEjectedEvent.java @@ -20,8 +20,7 @@ package org.bluray.ti; public class DiscEjectedEvent extends DiscStatusEvent { - public DiscEjectedEvent(Object source) - { + public DiscEjectedEvent(Object source) { super(source); } diff --git a/src/libbluray/bdj/java/org/bluray/ti/DiscInsertedEvent.java b/src/libbluray/bdj/java/org/bluray/ti/DiscInsertedEvent.java index 0fe4bee..c4a499c 100644 --- a/src/libbluray/bdj/java/org/bluray/ti/DiscInsertedEvent.java +++ b/src/libbluray/bdj/java/org/bluray/ti/DiscInsertedEvent.java @@ -20,8 +20,7 @@ package org.bluray.ti; public class DiscInsertedEvent extends DiscStatusEvent { - public DiscInsertedEvent(Object source) - { + public DiscInsertedEvent(Object source) { super(source); } diff --git a/src/libbluray/bdj/java/org/bluray/ti/DiscStatusEvent.java b/src/libbluray/bdj/java/org/bluray/ti/DiscStatusEvent.java index e19377e..476dc93 100644 --- a/src/libbluray/bdj/java/org/bluray/ti/DiscStatusEvent.java +++ b/src/libbluray/bdj/java/org/bluray/ti/DiscStatusEvent.java @@ -21,8 +21,7 @@ package org.bluray.ti; import java.util.EventObject; public class DiscStatusEvent extends EventObject { - public DiscStatusEvent(Object source) - { + public DiscStatusEvent(Object source) { super(source); } diff --git a/src/libbluray/bdj/java/org/bluray/ti/PlayItemImpl.java b/src/libbluray/bdj/java/org/bluray/ti/PlayItemImpl.java index 7ffbf67..3e64e1c 100644 --- a/src/libbluray/bdj/java/org/bluray/ti/PlayItemImpl.java +++ b/src/libbluray/bdj/java/org/bluray/ti/PlayItemImpl.java @@ -33,8 +33,7 @@ import org.videolan.StreamInfo; import org.videolan.TIClip; public class PlayItemImpl implements PlayItem { - protected PlayItemImpl(int playlistId, int playitemId, TIClip clip, Title service) - { + protected PlayItemImpl(int playlistId, int playitemId, TIClip clip, Title service) { this.playlistId = playlistId; this.playitemId = playitemId; this.clip = clip; @@ -49,8 +48,7 @@ public class PlayItemImpl implements PlayItem { return playlistId; } - public Locator getLocator() - { + public Locator getLocator() { int title = Libbluray.getCurrentTitle(); try { return new BDLocator("bd://" + title + ".PLAYLIST:" + playlistId + ".ITEM:" + playitemId); @@ -59,18 +57,15 @@ public class PlayItemImpl implements PlayItem { } } - public ServiceInformationType getServiceInformationType() - { + public ServiceInformationType getServiceInformationType() { return TitleInformationType.BD_ROM; } - public Date getUpdateTime() - { + public Date getUpdateTime() { return null; } - public ServiceComponent[] getComponents() - { + public ServiceComponent[] getComponents() { StreamInfo[] video = clip.getVideoStreams(); StreamInfo[] audio = clip.getVideoStreams(); StreamInfo[] pg = clip.getVideoStreams(); diff --git a/src/libbluray/bdj/java/org/bluray/ti/PlayListImpl.java b/src/libbluray/bdj/java/org/bluray/ti/PlayListImpl.java index 088c7c8..8a4359d 100644 --- a/src/libbluray/bdj/java/org/bluray/ti/PlayListImpl.java +++ b/src/libbluray/bdj/java/org/bluray/ti/PlayListImpl.java @@ -31,26 +31,22 @@ import org.videolan.TIClip; import org.videolan.PlaylistInfo; public class PlayListImpl implements PlayList { - protected PlayListImpl(String filename, Title service) - { + protected PlayListImpl(String filename, Title service) { this.filename = filename; this.id = Integer.parseInt(filename); this.playlist = Libbluray.getPlaylistInfo(id); this.service = service; } - public String getFileName() - { + public String getFileName() { return filename; } - public int getId() - { + public int getId() { return id; } - public PlayItem[] getPlayItems() - { + public PlayItem[] getPlayItems() { TIClip[] clips = playlist.getClips(); PlayItem[] items = new PlayItem[clips.length]; @@ -61,8 +57,7 @@ public class PlayListImpl implements PlayList { return items; } - public Locator getLocator() - { + public Locator getLocator() { int title = Libbluray.getCurrentTitle(); try { @@ -72,13 +67,11 @@ public class PlayListImpl implements PlayList { } } - public ServiceInformationType getServiceInformationType() - { + public ServiceInformationType getServiceInformationType() { return TitleInformationType.BD_ROM; } - public Date getUpdateTime() - { + public Date getUpdateTime() { return null; } diff --git a/src/libbluray/bdj/java/org/bluray/ti/TitleComponentImpl.java b/src/libbluray/bdj/java/org/bluray/ti/TitleComponentImpl.java index 656a3cd..6b28f98 100644 --- a/src/libbluray/bdj/java/org/bluray/ti/TitleComponentImpl.java +++ b/src/libbluray/bdj/java/org/bluray/ti/TitleComponentImpl.java @@ -32,8 +32,7 @@ import org.videolan.StreamInfo; public class TitleComponentImpl implements TitleComponent { protected TitleComponentImpl(int stream_number, StreamInfo stream, StreamType type, boolean primary, - int playlistId, int playitemId, Title service) - { + int playlistId, int playitemId, Title service) { this.stream_number = stream_number; this.stream = stream; this.type = type; diff --git a/src/libbluray/bdj/java/org/bluray/ti/TitleType.java b/src/libbluray/bdj/java/org/bluray/ti/TitleType.java index 2d6dfd8..116ee16 100644 --- a/src/libbluray/bdj/java/org/bluray/ti/TitleType.java +++ b/src/libbluray/bdj/java/org/bluray/ti/TitleType.java @@ -22,8 +22,7 @@ package org.bluray.ti; import javax.tv.service.ServiceType; public class TitleType extends ServiceType { - protected TitleType(String name) - { + protected TitleType(String name) { super(name); } diff --git a/src/libbluray/bdj/java/org/bluray/vfs/VFSManager.java b/src/libbluray/bdj/java/org/bluray/vfs/VFSManager.java index 66ac4e8..4255488 100644 --- a/src/libbluray/bdj/java/org/bluray/vfs/VFSManager.java +++ b/src/libbluray/bdj/java/org/bluray/vfs/VFSManager.java @@ -29,8 +29,7 @@ public class VFSManager { private static VFSManager instance = null; public static VFSManager getInstance() throws SecurityException, - UnsupportedOperationException - { + UnsupportedOperationException { if (instance == null) { instance = new VFSManager(); } @@ -38,43 +37,36 @@ public class VFSManager { return instance; } - protected VFSManager() - { + protected VFSManager() { state = STABLE; } - public boolean disableClip(String streamfile) - { + public boolean disableClip(String streamfile) { logger.unimplemented("disableClip"); return true; } - public boolean enableClip(String streamfile) - { + public boolean enableClip(String streamfile) { logger.unimplemented("enableClip"); return true; } - public String[] getDisabledClipIDs() - { + public String[] getDisabledClipIDs() { logger.unimplemented("getDisabledClipIDs"); return new String[]{}; } - public int getState() - { + public int getState() { return state; } - public boolean isEnabledClip(String clipID) - { + public boolean isEnabledClip(String clipID) { logger.unimplemented("isEnabledClip"); return true; } public void requestUpdating(String manifestfile, String signaturefile, - boolean initBackupRegs) throws PreparingFailedException - { + boolean initBackupRegs) throws PreparingFailedException { state = PREPARING; BUMFAsset[] assets = BUMFParser.parse(manifestfile); _______________________________________________ libbluray-devel mailing list [email protected] https://mailman.videolan.org/listinfo/libbluray-devel
