CHG: [droid] Refactor java interfaces

5 files changed, 28 insertions, 29 deletions

diff --git a/tools/android/packaging/Makefile.in b/tools/android/packaging/Makefile.in
index 5a794e1b07..92a8bc4b2e 100644
--- a/tools/android/packaging/Makefile.in
+++ b/tools/android/packaging/Makefile.in
@@ -152,7 +152,8 @@ libs: $(PREFIX)/lib/@APP_NAME_LC@/lib@APP_NAME_LC@.so
 xbmc/classes.dex: res
 	mkdir -p xbmc/java/$(APP_PACKAGE_DIR) xbmc/java/$(APP_PACKAGE_DIR)/interfaces xbmc/obj
 	@cp xbmc/src/org/xbmc/kodi/*.java xbmc/java/$(APP_PACKAGE_DIR)/
-	@javac -classpath $(SDKROOT)/platforms/$(SDK_PLATFORM)/android.jar:xbmc/obj -d xbmc/obj -sourcepath xbmc/src xbmc/gen/$(APP_PACKAGE_DIR)/*.java xbmc/java/$(APP_PACKAGE_DIR)/*.java $(JAVAC_EXTRA_ARGS)
+	@cp xbmc/src/org/xbmc/kodi/interfaces/*.java xbmc/java/$(APP_PACKAGE_DIR)/interfaces/
+	@javac -classpath $(SDKROOT)/platforms/$(SDK_PLATFORM)/android.jar:xbmc/obj -d xbmc/obj -sourcepath xbmc/src xbmc/gen/$(APP_PACKAGE_DIR)/*.java xbmc/java/$(APP_PACKAGE_DIR)/*.java xbmc/java/$(APP_PACKAGE_DIR)/interfaces/*.java $(JAVAC_EXTRA_ARGS)
 	@$(DX) --dex --output=xbmc/classes.dex xbmc/obj xbmc/lib
 
 package: libs python xbmc/classes.dex
diff --git a/tools/android/packaging/xbmc/src/org/xbmc/kodi/XBMCOnFrameAvailableListener.java.in b/tools/android/packaging/xbmc/src/org/xbmc/kodi/XBMCOnFrameAvailableListener.java.in
deleted file mode 100644
index c98686da17..0000000000
--- a/tools/android/packaging/xbmc/src/org/xbmc/kodi/XBMCOnFrameAvailableListener.java.in
+++ /dev/null
@@ -1,20 +0,0 @@
-package @APP_PACKAGE@;
-
-import android.graphics.SurfaceTexture;
-import android.graphics.SurfaceTexture.OnFrameAvailableListener;
-
-public class XBMCOnFrameAvailableListener implements OnFrameAvailableListener
-{
-  native void _onFrameAvailable(SurfaceTexture surfaceTexture);
-
-  private synchronized void signalNewFrame(SurfaceTexture surfaceTexture)
-  {
-    _onFrameAvailable(surfaceTexture);
-  }
-
-  @Override
-  public void onFrameAvailable(SurfaceTexture surfaceTexture)
-  {
-    signalNewFrame(surfaceTexture);
-  }
-}
diff --git a/tools/android/packaging/xbmc/src/org/xbmc/kodi/XBMCVideoView.java.in b/tools/android/packaging/xbmc/src/org/xbmc/kodi/XBMCVideoView.java.in
index 3a1f2d6a9e..2fddbc23c1 100644
--- a/tools/android/packaging/xbmc/src/org/xbmc/kodi/XBMCVideoView.java.in
+++ b/tools/android/packaging/xbmc/src/org/xbmc/kodi/XBMCVideoView.java.in
@@ -19,9 +19,9 @@ import java.util.concurrent.FutureTask;
 public class XBMCVideoView extends SurfaceView implements
     SurfaceHolder.Callback
 {
-  native void _OnSurfaceChanged(SurfaceHolder holder, int format, int width, int height);
-  native void _OnSurfaceCreated(SurfaceHolder holder);
-  native void _OnSurfaceDestroyed(SurfaceHolder holder);
+  native void _surfaceChanged(SurfaceHolder holder, int format, int width, int height);
+  native void _surfaceCreated(SurfaceHolder holder);
+  native void _surfaceDestroyed(SurfaceHolder holder);
 
   private static final String TAG = "XBMCVideoPlayView";
 
@@ -132,14 +132,17 @@ public class XBMCVideoView extends SurfaceView implements
   {
     Log.d(TAG, "Created");
     mIsCreated = true;
-    _OnSurfaceCreated(holder);
+    _surfaceCreated(holder);
   }
 
   @Override
   public void surfaceChanged(SurfaceHolder holder, int format, int width,
       int height)
   {
-    _OnSurfaceChanged(holder, format, width, height);
+    if (holder != getHolder())
+      return;
+
+    _surfaceChanged(holder, format, width, height);
 
     Log.d(TAG, "Changed, format:" + format + ", width:" + width
         + ", height:" + height);
@@ -150,6 +153,6 @@ public class XBMCVideoView extends SurfaceView implements
   {
     Log.d(TAG, "Destroyed");
     mIsCreated = false;
-    _OnSurfaceDestroyed(holder);
+    _surfaceDestroyed(holder);
   }
 }
diff --git a/tools/android/packaging/xbmc/src/org/xbmc/kodi/XBMCOnAudioFocusChangeListener.java.in b/tools/android/packaging/xbmc/src/org/xbmc/kodi/interfaces/XBMCAudioManagerOnAudioFocusChangeListener.java.in
index bb9f5149fd..3998f20f43 100644
--- a/tools/android/packaging/xbmc/src/org/xbmc/kodi/XBMCOnAudioFocusChangeListener.java.in
+++ b/tools/android/packaging/xbmc/src/org/xbmc/kodi/interfaces/XBMCAudioManagerOnAudioFocusChangeListener.java.in
@@ -1,9 +1,9 @@
-package @APP_PACKAGE@;
+package @APP_PACKAGE@.interfaces;
 
 import android.media.AudioManager.OnAudioFocusChangeListener;
 import android.util.Log;
 
-public class XBMCOnAudioFocusChangeListener implements OnAudioFocusChangeListener
+public class XBMCAudioManagerOnAudioFocusChangeListener implements OnAudioFocusChangeListener
 {
   native void _onAudioFocusChange(int focusChange);
 
diff --git a/tools/android/packaging/xbmc/src/org/xbmc/kodi/interfaces/XBMCSurfaceTextureOnFrameAvailableListener.java.in b/tools/android/packaging/xbmc/src/org/xbmc/kodi/interfaces/XBMCSurfaceTextureOnFrameAvailableListener.java.in
new file mode 100644
index 0000000000..9869733781
--- /dev/null
+++ b/tools/android/packaging/xbmc/src/org/xbmc/kodi/interfaces/XBMCSurfaceTextureOnFrameAvailableListener.java.in
@@ -0,0 +1,15 @@
+package @APP_PACKAGE@.interfaces;
+
+import android.graphics.SurfaceTexture;
+import android.graphics.SurfaceTexture.OnFrameAvailableListener;
+
+public class XBMCSurfaceTextureOnFrameAvailableListener implements OnFrameAvailableListener
+{
+  native void _onFrameAvailable(SurfaceTexture surfaceTexture);
+
+  @Override
+  public void onFrameAvailable(SurfaceTexture surfaceTexture)
+  {
+  _onFrameAvailable(surfaceTexture);
+  }
+}