Bug 1063: Uri adoption

- ShaderCode:
  - Using Uri
  - Also encode the rel. 'includeFile' (was missing earlier)

- GLMediaPlayer
  - Exposes Uri in API, removed URI

1 files changed, 3 insertions, 3 deletions

diff --git a/src/jogl/classes/jogamp/opengl/util/av/impl/OMXGLMediaPlayer.java b/src/jogl/classes/jogamp/opengl/util/av/impl/OMXGLMediaPlayer.java
index 0eeb54bf6..5baf9e543 100644
--- a/src/jogl/classes/jogamp/opengl/util/av/impl/OMXGLMediaPlayer.java
+++ b/src/jogl/classes/jogamp/opengl/util/av/impl/OMXGLMediaPlayer.java
@@ -100,10 +100,10 @@ public class OMXGLMediaPlayer extends EGLMediaPlayerImpl {
         if(0==moviePtr) {
             throw new GLException("OMX native instance null");
         }
-        if(!getURI().getScheme().equals("file")) {
-            throw new IOException("Only file schemes are allowed: "+getURI());
+        if( !getUri().isFileScheme() ) {
+            throw new IOException("Only file schemes are allowed: "+getUri());
         }
-        final String path=getURI().getPath();
+        final String path=getUri().path.decode();
         if(DEBUG) {
             System.out.println("initGLStream: clean path "+path);
         }