libbluray | branch: master | hpi1 <h...@anonymous.org> | Sat Apr 30 15:32:38 2016 +0300| [b140a4e7c4d5f963f4b5affaa4850bf1e5a11220] | committer: hpi1
Remove duplicate MediaTimePositionControl implementations > http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=b140a4e7c4d5f963f4b5affaa4850bf1e5a11220 --- .../org/videolan/media/content/audio/Handler.java | 2 +- .../audio/MediaTimePositionControlImpl.java | 47 -------------------- .../playlist/MediaTimePositionControlImpl.java | 6 ++- .../org/videolan/media/content/sound/Handler.java | 2 +- .../sound/MediaTimePositionControlImpl.java | 47 -------------------- 5 files changed, 6 insertions(+), 98 deletions(-) diff --git a/src/libbluray/bdj/java/org/videolan/media/content/audio/Handler.java b/src/libbluray/bdj/java/org/videolan/media/content/audio/Handler.java index 04ad80e..ba67b76 100644 --- a/src/libbluray/bdj/java/org/videolan/media/content/audio/Handler.java +++ b/src/libbluray/bdj/java/org/videolan/media/content/audio/Handler.java @@ -26,7 +26,7 @@ import javax.media.IncompatibleSourceException; import javax.media.Time; import javax.media.protocol.DataSource; - +import org.videolan.media.content.playlist.MediaTimePositionControlImpl; import org.videolan.media.content.playlist.OverallGainControlImpl; import org.videolan.media.content.playlist.PanningControlImpl; diff --git a/src/libbluray/bdj/java/org/videolan/media/content/audio/MediaTimePositionControlImpl.java b/src/libbluray/bdj/java/org/videolan/media/content/audio/MediaTimePositionControlImpl.java deleted file mode 100644 index f841ce6..0000000 --- a/src/libbluray/bdj/java/org/videolan/media/content/audio/MediaTimePositionControlImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * This file is part of libbluray - * Copyright (C) 2010 William Hahne - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - */ - -package org.videolan.media.content.audio; - -import java.awt.Component; - -import javax.media.Time; - -import org.davic.media.MediaTimePositionControl; - -public class MediaTimePositionControlImpl implements MediaTimePositionControl { - protected MediaTimePositionControlImpl(Handler player) { - this.player = player; - } - - public Component getControlComponent() { - return null; - } - - public Time setMediaTimePosition(Time mediaTime) { - player.setMediaTime(mediaTime); - return player.getMediaTime(); - } - - public Time getMediaTimePosition() { - return player.getMediaTime(); - } - - private Handler player; -} diff --git a/src/libbluray/bdj/java/org/videolan/media/content/playlist/MediaTimePositionControlImpl.java b/src/libbluray/bdj/java/org/videolan/media/content/playlist/MediaTimePositionControlImpl.java index f7e6d7a..fc5c965 100644 --- a/src/libbluray/bdj/java/org/videolan/media/content/playlist/MediaTimePositionControlImpl.java +++ b/src/libbluray/bdj/java/org/videolan/media/content/playlist/MediaTimePositionControlImpl.java @@ -25,8 +25,10 @@ import javax.media.Time; import org.davic.media.MediaTimePositionControl; +import org.videolan.media.content.BDHandler; + public class MediaTimePositionControlImpl implements MediaTimePositionControl { - protected MediaTimePositionControlImpl(Handler player) { + public MediaTimePositionControlImpl(BDHandler player) { this.player = player; } @@ -43,5 +45,5 @@ public class MediaTimePositionControlImpl implements MediaTimePositionControl { return player.getMediaTime(); } - private Handler player; + private BDHandler player; } diff --git a/src/libbluray/bdj/java/org/videolan/media/content/sound/Handler.java b/src/libbluray/bdj/java/org/videolan/media/content/sound/Handler.java index af04c42..ee420b6 100644 --- a/src/libbluray/bdj/java/org/videolan/media/content/sound/Handler.java +++ b/src/libbluray/bdj/java/org/videolan/media/content/sound/Handler.java @@ -37,7 +37,7 @@ import javax.media.protocol.DataSource; import org.bluray.net.BDLocator; -//import org.videolan.media.content.playlist.MediaTimePositionControlImpl; +import org.videolan.media.content.playlist.MediaTimePositionControlImpl; import org.videolan.media.content.playlist.OverallGainControlImpl; import org.videolan.media.content.playlist.PanningControlImpl; diff --git a/src/libbluray/bdj/java/org/videolan/media/content/sound/MediaTimePositionControlImpl.java b/src/libbluray/bdj/java/org/videolan/media/content/sound/MediaTimePositionControlImpl.java deleted file mode 100644 index b74791d..0000000 --- a/src/libbluray/bdj/java/org/videolan/media/content/sound/MediaTimePositionControlImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * This file is part of libbluray - * Copyright (C) 2010 William Hahne - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - */ - -package org.videolan.media.content.sound; - -import java.awt.Component; - -import javax.media.Time; - -import org.davic.media.MediaTimePositionControl; - -public class MediaTimePositionControlImpl implements MediaTimePositionControl { - protected MediaTimePositionControlImpl(Handler player) { - this.player = player; - } - - public Component getControlComponent() { - return null; - } - - public Time setMediaTimePosition(Time mediaTime) { - player.setMediaTime(mediaTime); - return player.getMediaTime(); - } - - public Time getMediaTimePosition() { - return player.getMediaTime(); - } - - private Handler player; -} _______________________________________________ libbluray-devel mailing list libbluray-devel@videolan.org https://mailman.videolan.org/listinfo/libbluray-devel
