[libbluray-devel] Move common control classes
hpi1
git at videolan.org
Sat Apr 30 15:04:48 CEST 2016
libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Sat Apr 30 16:02:51 2016 +0300| [82c69beb53722ff05309120ff2a46109eba1bb7e] | committer: hpi1
Move common control classes
> http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=82c69beb53722ff05309120ff2a46109eba1bb7e
---
.../bdj/java/org/videolan/media/content/audio/Handler.java | 6 +++---
.../media/content/{playlist => control}/GainControlImpl.java | 2 +-
.../{playlist => control}/MediaTimePositionControlImpl.java | 2 +-
.../content/{playlist => control}/OverallGainControlImpl.java | 2 +-
.../media/content/{playlist => control}/PanningControlImpl.java | 2 +-
.../content/{playlist => control}/PrimaryGainControlImpl.java | 4 ++--
.../content/{playlist => control}/SecondaryGainControlImpl.java | 4 ++--
.../bdj/java/org/videolan/media/content/playlist/Handler.java | 6 ++++++
.../bdj/java/org/videolan/media/content/sound/Handler.java | 6 +++---
9 files changed, 20 insertions(+), 14 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 ba67b76..9c72523 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,9 +26,9 @@ 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;
+import org.videolan.media.content.control.MediaTimePositionControlImpl;
+import org.videolan.media.content.control.OverallGainControlImpl;
+import org.videolan.media.content.control.PanningControlImpl;
import org.videolan.media.content.BDHandler;
diff --git a/src/libbluray/bdj/java/org/videolan/media/content/playlist/GainControlImpl.java b/src/libbluray/bdj/java/org/videolan/media/content/control/GainControlImpl.java
similarity index 98%
rename from src/libbluray/bdj/java/org/videolan/media/content/playlist/GainControlImpl.java
rename to src/libbluray/bdj/java/org/videolan/media/content/control/GainControlImpl.java
index e52587a..3593e1a 100644
--- a/src/libbluray/bdj/java/org/videolan/media/content/playlist/GainControlImpl.java
+++ b/src/libbluray/bdj/java/org/videolan/media/content/control/GainControlImpl.java
@@ -17,7 +17,7 @@
* <http://www.gnu.org/licenses/>.
*/
-package org.videolan.media.content.playlist;
+package org.videolan.media.content.control;
import java.awt.Component;
import javax.media.GainControl;
diff --git a/src/libbluray/bdj/java/org/videolan/media/content/playlist/MediaTimePositionControlImpl.java b/src/libbluray/bdj/java/org/videolan/media/content/control/MediaTimePositionControlImpl.java
similarity index 96%
rename from src/libbluray/bdj/java/org/videolan/media/content/playlist/MediaTimePositionControlImpl.java
rename to src/libbluray/bdj/java/org/videolan/media/content/control/MediaTimePositionControlImpl.java
index fc5c965..6472824 100644
--- a/src/libbluray/bdj/java/org/videolan/media/content/playlist/MediaTimePositionControlImpl.java
+++ b/src/libbluray/bdj/java/org/videolan/media/content/control/MediaTimePositionControlImpl.java
@@ -17,7 +17,7 @@
* <http://www.gnu.org/licenses/>.
*/
-package org.videolan.media.content.playlist;
+package org.videolan.media.content.control;
import java.awt.Component;
diff --git a/src/libbluray/bdj/java/org/videolan/media/content/playlist/OverallGainControlImpl.java b/src/libbluray/bdj/java/org/videolan/media/content/control/OverallGainControlImpl.java
similarity index 96%
rename from src/libbluray/bdj/java/org/videolan/media/content/playlist/OverallGainControlImpl.java
rename to src/libbluray/bdj/java/org/videolan/media/content/control/OverallGainControlImpl.java
index daa27c6..6e0829a 100644
--- a/src/libbluray/bdj/java/org/videolan/media/content/playlist/OverallGainControlImpl.java
+++ b/src/libbluray/bdj/java/org/videolan/media/content/control/OverallGainControlImpl.java
@@ -18,7 +18,7 @@
* <http://www.gnu.org/licenses/>.
*/
-package org.videolan.media.content.playlist;
+package org.videolan.media.content.control;
import java.awt.Component;
import org.bluray.media.OverallGainControl;
diff --git a/src/libbluray/bdj/java/org/videolan/media/content/playlist/PanningControlImpl.java b/src/libbluray/bdj/java/org/videolan/media/content/control/PanningControlImpl.java
similarity index 98%
rename from src/libbluray/bdj/java/org/videolan/media/content/playlist/PanningControlImpl.java
rename to src/libbluray/bdj/java/org/videolan/media/content/control/PanningControlImpl.java
index 973da50..9a6ee70 100644
--- a/src/libbluray/bdj/java/org/videolan/media/content/playlist/PanningControlImpl.java
+++ b/src/libbluray/bdj/java/org/videolan/media/content/control/PanningControlImpl.java
@@ -18,7 +18,7 @@
* <http://www.gnu.org/licenses/>.
*/
-package org.videolan.media.content.playlist;
+package org.videolan.media.content.control;
import java.awt.Component;
diff --git a/src/libbluray/bdj/java/org/videolan/media/content/playlist/PrimaryGainControlImpl.java b/src/libbluray/bdj/java/org/videolan/media/content/control/PrimaryGainControlImpl.java
similarity index 92%
rename from src/libbluray/bdj/java/org/videolan/media/content/playlist/PrimaryGainControlImpl.java
rename to src/libbluray/bdj/java/org/videolan/media/content/control/PrimaryGainControlImpl.java
index 8db96ee..2c1e651 100644
--- a/src/libbluray/bdj/java/org/videolan/media/content/playlist/PrimaryGainControlImpl.java
+++ b/src/libbluray/bdj/java/org/videolan/media/content/control/PrimaryGainControlImpl.java
@@ -18,7 +18,7 @@
* <http://www.gnu.org/licenses/>.
*/
-package org.videolan.media.content.playlist;
+package org.videolan.media.content.control;
import java.awt.Component;
import org.bluray.media.PrimaryGainControl;
@@ -26,7 +26,7 @@ import org.bluray.media.PrimaryGainControl;
import org.videolan.media.content.BDHandler;
public class PrimaryGainControlImpl extends GainControlImpl implements PrimaryGainControl {
- PrimaryGainControlImpl(BDHandler player) {
+ public PrimaryGainControlImpl(BDHandler player) {
this.player = player;
}
diff --git a/src/libbluray/bdj/java/org/videolan/media/content/playlist/SecondaryGainControlImpl.java b/src/libbluray/bdj/java/org/videolan/media/content/control/SecondaryGainControlImpl.java
similarity index 92%
rename from src/libbluray/bdj/java/org/videolan/media/content/playlist/SecondaryGainControlImpl.java
rename to src/libbluray/bdj/java/org/videolan/media/content/control/SecondaryGainControlImpl.java
index f6f1ab0..6cf7d48 100644
--- a/src/libbluray/bdj/java/org/videolan/media/content/playlist/SecondaryGainControlImpl.java
+++ b/src/libbluray/bdj/java/org/videolan/media/content/control/SecondaryGainControlImpl.java
@@ -18,7 +18,7 @@
* <http://www.gnu.org/licenses/>.
*/
-package org.videolan.media.content.playlist;
+package org.videolan.media.content.control;
import java.awt.Component;
import org.bluray.media.SecondaryGainControl;
@@ -26,7 +26,7 @@ import org.bluray.media.SecondaryGainControl;
import org.videolan.media.content.BDHandler;
public class SecondaryGainControlImpl extends GainControlImpl implements SecondaryGainControl {
- SecondaryGainControlImpl(BDHandler player) {
+ public SecondaryGainControlImpl(BDHandler player) {
this.player = player;
}
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 0e374de..dd5f07c 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
@@ -45,6 +45,12 @@ import org.videolan.PlaylistInfo;
import org.videolan.TIClip;
import org.videolan.media.content.BDHandler;
+import org.videolan.media.content.control.MediaTimePositionControlImpl;
+import org.videolan.media.content.control.OverallGainControlImpl;
+import org.videolan.media.content.control.PanningControlImpl;
+import org.videolan.media.content.control.PrimaryGainControlImpl;
+import org.videolan.media.content.control.SecondaryGainControlImpl;
+
public class Handler extends BDHandler {
public Handler() {
controls = new Control[18];
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 ee420b6..8768240 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,9 +37,9 @@ import javax.media.protocol.DataSource;
import org.bluray.net.BDLocator;
-import org.videolan.media.content.playlist.MediaTimePositionControlImpl;
-import org.videolan.media.content.playlist.OverallGainControlImpl;
-import org.videolan.media.content.playlist.PanningControlImpl;
+import org.videolan.media.content.control.MediaTimePositionControlImpl;
+import org.videolan.media.content.control.OverallGainControlImpl;
+import org.videolan.media.content.control.PanningControlImpl;
import org.videolan.media.content.BDHandler;
More information about the libbluray-devel
mailing list