libbluray | branch: master | hpi1 <h...@anonymous.org> | Sat Apr 30 16:11:02 2016 +0300| [9e5035bbfe580b1c06d1b28094813af8193e3aad] | committer: hpi1
Remove unused data from base classes > http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=9e5035bbfe580b1c06d1b28094813af8193e3aad --- .../content/playlist/BackgroundVideoPresentationControlImpl.java | 5 ++++- .../java/org/videolan/media/content/playlist/PiPControlImpl.java | 4 +++- .../videolan/media/content/playlist/PrimaryAudioControlImpl.java | 4 +++- .../media/content/playlist/SecondaryAudioControlImpl.java | 4 +++- .../java/org/videolan/media/content/playlist/StreamControl.java | 5 +---- .../videolan/media/content/playlist/SubtitlingControlImpl.java | 4 ++-- .../java/org/videolan/media/content/playlist/VideoControl.java | 3 +-- 7 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/libbluray/bdj/java/org/videolan/media/content/playlist/BackgroundVideoPresentationControlImpl.java b/src/libbluray/bdj/java/org/videolan/media/content/playlist/BackgroundVideoPresentationControlImpl.java index 21f6de5..ae6464c 100644 --- a/src/libbluray/bdj/java/org/videolan/media/content/playlist/BackgroundVideoPresentationControlImpl.java +++ b/src/libbluray/bdj/java/org/videolan/media/content/playlist/BackgroundVideoPresentationControlImpl.java @@ -35,7 +35,8 @@ import org.videolan.TIClip; public class BackgroundVideoPresentationControlImpl extends VideoControl implements BackgroundVideoPresentationControl, AWTVideoSizeControl { protected BackgroundVideoPresentationControlImpl(Handler player) { - super(player, 0); + super(0); + this.player = player; } protected StreamInfo[] getStreams() { @@ -137,4 +138,6 @@ public class BackgroundVideoPresentationControlImpl extends VideoControl Rectangle dr = size.getDestination(); return new AWTVideoSize(sr, dr); } + + private Handler player; } diff --git a/src/libbluray/bdj/java/org/videolan/media/content/playlist/PiPControlImpl.java b/src/libbluray/bdj/java/org/videolan/media/content/playlist/PiPControlImpl.java index 91c0e54..0792ab6 100644 --- a/src/libbluray/bdj/java/org/videolan/media/content/playlist/PiPControlImpl.java +++ b/src/libbluray/bdj/java/org/videolan/media/content/playlist/PiPControlImpl.java @@ -37,7 +37,8 @@ import org.videolan.TIClip; public class PiPControlImpl extends VideoControl implements PiPControl, AsynchronousPiPControl { protected PiPControlImpl(Handler player) { - super(player, 1); + super(1); + this.player = player; } protected StreamInfo[] getStreams() { @@ -117,5 +118,6 @@ public class PiPControlImpl extends VideoControl implements PiPControl, Asynchro return null; } + private Handler player; private BDJListeners listeners = new BDJListeners(); } diff --git a/src/libbluray/bdj/java/org/videolan/media/content/playlist/PrimaryAudioControlImpl.java b/src/libbluray/bdj/java/org/videolan/media/content/playlist/PrimaryAudioControlImpl.java index 8091387..17ebdf5 100644 --- a/src/libbluray/bdj/java/org/videolan/media/content/playlist/PrimaryAudioControlImpl.java +++ b/src/libbluray/bdj/java/org/videolan/media/content/playlist/PrimaryAudioControlImpl.java @@ -26,7 +26,7 @@ import org.videolan.TIClip; public class PrimaryAudioControlImpl extends StreamControl implements PrimaryAudioControl { protected PrimaryAudioControlImpl(Handler player) { - super(player); + this.player = player; } protected StreamInfo[] getStreams() { @@ -47,4 +47,6 @@ public class PrimaryAudioControlImpl extends StreamControl implements PrimaryAud protected void setStreamNumber(int num) { Libbluray.writePSR(Libbluray.PSR_PRIMARY_AUDIO_ID, num); } + + private Handler player; } diff --git a/src/libbluray/bdj/java/org/videolan/media/content/playlist/SecondaryAudioControlImpl.java b/src/libbluray/bdj/java/org/videolan/media/content/playlist/SecondaryAudioControlImpl.java index ea2cd5e..548eef9 100644 --- a/src/libbluray/bdj/java/org/videolan/media/content/playlist/SecondaryAudioControlImpl.java +++ b/src/libbluray/bdj/java/org/videolan/media/content/playlist/SecondaryAudioControlImpl.java @@ -26,7 +26,7 @@ import org.videolan.TIClip; public class SecondaryAudioControlImpl extends StreamControl implements SecondaryAudioControl { protected SecondaryAudioControlImpl(Handler player) { - super(player); + this.player = player; } protected StreamInfo[] getStreams() { @@ -47,4 +47,6 @@ public class SecondaryAudioControlImpl extends StreamControl implements Secondar protected void setStreamNumber(int num) { Libbluray.writePSR(Libbluray.PSR_SECONDARY_AUDIO_VIDEO, num, 0x000000ff); } + + private Handler player; } diff --git a/src/libbluray/bdj/java/org/videolan/media/content/playlist/StreamControl.java b/src/libbluray/bdj/java/org/videolan/media/content/playlist/StreamControl.java index be0cd06..d2b8356 100644 --- a/src/libbluray/bdj/java/org/videolan/media/content/playlist/StreamControl.java +++ b/src/libbluray/bdj/java/org/videolan/media/content/playlist/StreamControl.java @@ -29,8 +29,7 @@ import org.davic.media.NotAuthorizedException; import org.videolan.StreamInfo; public abstract class StreamControl implements Control { - protected StreamControl(Handler player) { - this.player = player; + protected StreamControl() { } protected abstract StreamInfo[] getStreams(); @@ -125,6 +124,4 @@ public abstract class StreamControl implements Control { } throw new LanguageNotAvailableException(); } - - protected Handler player; } diff --git a/src/libbluray/bdj/java/org/videolan/media/content/playlist/SubtitlingControlImpl.java b/src/libbluray/bdj/java/org/videolan/media/content/playlist/SubtitlingControlImpl.java index 3d5f1d5..b82e084 100644 --- a/src/libbluray/bdj/java/org/videolan/media/content/playlist/SubtitlingControlImpl.java +++ b/src/libbluray/bdj/java/org/videolan/media/content/playlist/SubtitlingControlImpl.java @@ -38,7 +38,7 @@ import org.videolan.TIClip; public class SubtitlingControlImpl extends StreamControl implements SubtitlingControl { protected SubtitlingControlImpl(Handler player) { - super(player); + this.player = player; } protected StreamInfo[] getStreams() { @@ -137,6 +137,6 @@ public class SubtitlingControlImpl extends StreamControl implements SubtitlingCo } } - + private Handler player; private BDJListeners listeners = new BDJListeners(); } diff --git a/src/libbluray/bdj/java/org/videolan/media/content/playlist/VideoControl.java b/src/libbluray/bdj/java/org/videolan/media/content/playlist/VideoControl.java index eafa781..5e46b65 100644 --- a/src/libbluray/bdj/java/org/videolan/media/content/playlist/VideoControl.java +++ b/src/libbluray/bdj/java/org/videolan/media/content/playlist/VideoControl.java @@ -29,8 +29,7 @@ import org.havi.ui.HVideoConfiguration; import org.videolan.StreamInfo; public abstract class VideoControl extends StreamControl implements VideoPresentationControl { - protected VideoControl(Handler player, int plane) { - super(player); + protected VideoControl(int plane) { this.plane = plane; } _______________________________________________ libbluray-devel mailing list libbluray-devel@videolan.org https://mailman.videolan.org/listinfo/libbluray-devel
