FCL/sf/app/jrt: comparison javauis/mmapi_qt/baseline/javasrc/com/nokia/microedition/media/control/VideoControl.java

equal deleted inserted replaced

-:98ccebc37403
+:dc7c549001d5
 import javax.microedition.media.Player;
 import javax.microedition.media.MediaException;
 import javax.microedition.lcdui.Canvas;
 import javax.microedition.lcdui.Display;
 import javax.microedition.midlet.MIDlet;
+import javax.microedition.lcdui.Item;
 import com.nokia.microedition.media.NativeError;
 //import com.symbian.midp.runtime.MIDletExecutor;
 import com.nokia.mj.impl.media.PlayerPermission;
 import com.nokia.mj.impl.rt.support.ApplicationUtils;
 import com.nokia.mj.impl.rt.support.Finalizer;
 import com.nokia.mj.impl.utils.Logger;
 // MMAPI 3.x UI req.
 import com.nokia.microedition.media.*;
+import com.nokia.microedition.media.control.ItemDisplay;
 import org.eclipse.swt.*;
 import org.eclipse.swt.widgets.*;
 import javax.microedition.lcdui.*;
 import org.eclipse.ercp.swt.mobile.MobileShell;
 // Needed for getting native handle from lcdui components
 //com.symbian.midp.runtime.ToolkitInvoker iToolkitInvoker;
 private VideoItem iVideoItem;
 private Canvas iVideoCanvas;
+private Item iItem ;
-BaseDisplay display;
+BaseDisplay iDisplay;
 //    private MIDletInstance iMIDletInstance;
 // error code used asynchronous native calls
 private int iError;
 // used in asynchronous getSnapshot method
 private byte[] iImageData;
-private int iToolkitHandle = 0;
 // toolkit, stored as object as we don't have access to Toolkit class.
 private Object iToolkit;
 // for midlet foreground statelistening
 //ToolkitInvoker iTlkitInvoker;
 }
 };
 public VideoControl()
 {
 // iToolkitInvoker = com.symbian.midp.runtime.ToolkitInvoker.getToolkitInvoker();
 //       lcduiinvoker = new com.nokia.microedition.volumekeys.MMAPILCDUIInvokerImpl();
 //  eswtObserver = new MMAPIeSWTObserver();
 }
 private void doFinalize()
 {
 if (mFinalizer != null)
 public void setHandles(Player aPlayer, int aEventSource, int aControlHandle)
 {
 iPlayer = aPlayer;
 iEventSource = aEventSource;
 iControlHandle = aControlHandle;
-iToolkitHandle = 0;   // TODO: remove once implementation is done.
 int error = _construct(iControlHandle,
-aEventSource,
+aEventSource);
-iToolkitHandle);
 NativeError.check(error);
 }
 /**
 * from Interface VideoControl
 *
 */
 public void setDisplaySize(int aWidth, int aHeight) throws MediaException
 {
-// checkState();
+checkState();
 if (iStatus == NOT_INITIALIZED)
 {
 throw new IllegalStateException(
 "VideoControl.initDisplayMode() not called yet");
 }
 "Width and height must be positive");
 }
-			System.out.println("before display.setDisplaySize()");
+Logger.LOG(Logger.EJavaMMAPI,Logger.EInfo,"inside setDisplaySize()");
-				//canvasdisplay.setDisplaySize( aWidth, aHeight);
+//canvasdisplay.setDisplaySize( aWidth, aHeight);
-			display.setDisplaySize( aWidth, aHeight);
+iDisplay.setDisplaySize(aWidth, aHeight);
-			System.out.println("after display.setDisplaySize()");
 /*
 int ret = setDisplayProperty(aWidth, aHeight, SET_DISPLAY_SIZE);
 if (ret < 0)
 {
 throw new MediaException("setDisplaySize() failed, SymbianOS error: "
 * from Interface VideoControl
 *
 */
 public void setDisplayFullScreen(boolean aFullScreenMode) throws MediaException
 {
 // checkState();
 if (iStatus == NOT_INITIALIZED)
 {
 throw new IllegalStateException(
 "VideoControl.initDisplayMode() not called yet");
 }
 {
 throw new MediaException();
 }
 */
-		System.out.println("inside setDisplayFullScreen()");
+Logger.LOG(Logger.EJavaMMAPI,Logger.EInfo,"inside setDisplayFullScreen()");
-			//canvasdisplay.setDisplayFullScreen( aFullScreenMode);
+//canvasdisplay.setDisplayFullScreen( aFullScreenMode);
-		display.setDisplayFullScreen( aFullScreenMode);
+iDisplay.setDisplayFullScreen(aFullScreenMode);
 }
 /**
 * from Interface VideoControl
 *
 */
 public void setDisplayLocation(int aX, int aY)
 {
 // checkState();
-System.out.println("VideoControl.java :: setDisplayLocation x, y = " + aX + ","+ aY);
+Logger.LOG(Logger.EJavaMMAPI,Logger.EInfo,"VideoControl.java :: setDisplayLocation x, y = " + aX + ","+ aY);
 if (iStatus == USE_GUI_PRIMITIVE)
 {
 // In USE_GUI_PRIMITIVE mode, this call will be ignored.
 return;
 }
 if (iStatus != USE_DIRECT_VIDEO)
 {
 // This method only works when the USE_DIRECT_VIDEO mode is set.
 throw new IllegalStateException();
 }
-	/*
+/*
 // cannot fail -> ignore return value
 setDisplayProperty(aX, aY, SET_DISPLAY_LOCATION);
-	*/
+*/
-	System.out.println("inside setDisplayLocation()");
+Logger.LOG(Logger.EJavaMMAPI,Logger.EInfo,"inside setDisplayLocation()");
-	//canvasdisplay.setDisplayLocation( aX , aY);
+//canvasdisplay.setDisplayLocation( aX , aY);
-	display.setDisplayLocation( aX , aY);
+iDisplay.setDisplayLocation(aX , aY);
-	 }
+}
 /**
 * from Interface VideoControl
 *
 */
 public void setVisible(boolean aVisible)
 {
 // checkState();
 if (iStatus == NOT_INITIALIZED)
 {
 throw new IllegalStateException(
 "VideoControl.initDisplayMode() not called yet");
 }
 // cannot fail -> ignore return value
 setDisplayProperty(SET_DISPLAY_VISIBLE_FALSE);
 }
 */
 Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,
-" before display.setVisible()");
+" before iDisplay.setVisible()");
-System.out.println("inside setVisible()");
+Logger.LOG(Logger.EJavaMMAPI,Logger.EInfo,"inside setVisible()");
-if(aVisible)
+// canvasdisplay.setVisible( aVisible );
-{
+iDisplay.setVisible(aVisible);
-// set the Midlet BG/FG status to native
-updateForeground();
-	}
-display.setVisible( aVisible );
 Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,
-"after display.setVisible()");
+"after iDisplay.setVisible()");
 }
 /**
 * from Interface VideoControl
 *
 */
 public int getDisplayWidth()
-{/*
+{
+/*
+checkState();
+if (iStatus == NOT_INITIALIZED)
+{
+throw new IllegalStateException(
+"VideoControl.initDisplayMode() not called yet");
+}
+int width = getControlProperty(PROPERTY_DISPLAY_WIDTH);
+return width;
+*/
+//return  canvasdisplay.getDisplayWidth( );
+return iDisplay.getDisplayWidth();
+}
+/**
+* from Interface VideoControl
+*
+*/
+public int getDisplayHeight()
+{
+/* checkState();
+if (iStatus == NOT_INITIALIZED)
+{
+throw new IllegalStateException(
+"VideoControl.initDisplayMode() not called yet");
+}
+int height = getControlProperty(PROPERTY_DISPLAY_HEIGHT);
+return height;
+*/
+return  iDisplay.getDisplayHeight();
+}
+/**
+* from Interface VideoControl
+*
+*/
+public int getDisplayX()
+{
+/* checkState();
+if (iStatus == NOT_INITIALIZED)
+{
+return UNDEFINED_RETURN_VALUE;
+}
+int x = getControlProperty(PROPERTY_DISPLAY_X);
+return x;
+*/
+return  iDisplay.getDisplayX();
+}
+/**
+* from Interface VideoControl
+*
+*/
+public int getDisplayY()
+{
+/*
 checkState();
 if (iStatus == NOT_INITIALIZED)
 {
-throw new IllegalStateException(
-"VideoControl.initDisplayMode() not called yet");
-}
-int width = getControlProperty(PROPERTY_DISPLAY_WIDTH);
-return width;
-*/
-//return  canvasdisplay.getDisplayWidth( );
-return display.getDisplayWidth( );
-}
-/**
-* from Interface VideoControl
-*
-*/
-public int getDisplayHeight()
-{
-/* checkState();
-if (iStatus == NOT_INITIALIZED)
-{
-throw new IllegalStateException(
-"VideoControl.initDisplayMode() not called yet");
-}
-int height = getControlProperty(PROPERTY_DISPLAY_HEIGHT);
-return height;
-*/
-return  display.getDisplayHeight( );
-}
-/**
-* from Interface VideoControl
-*
-*/
-public int getDisplayX()
-{
-/* checkState();
-if (iStatus == NOT_INITIALIZED)
-{
-return UNDEFINED_RETURN_VALUE;
-}
-int x = getControlProperty(PROPERTY_DISPLAY_X);
-return x;
-*/
-return  display.getDisplayX( );
-}
-/**
-* from Interface VideoControl
-*
-*/
-public int getDisplayY()
-{
-		/*
-checkState();
-if (iStatus == NOT_INITIALIZED)
-{
 return UNDEFINED_RETURN_VALUE;
 }
 int y = getControlProperty(PROPERTY_DISPLAY_Y);
 return y;
 */
-return  display.getDisplayY( );
+return  iDisplay.getDisplayY();
 }
 /**
 * from Interface VideoControl
 *
 */
 public int getSourceWidth()
 {
 /* checkState();
 int width = getControlProperty(PROPERTY_SOURCE_WIDTH);
 if (width <= 0)
 {
 width = 1;
 }
 return width;
 */
-return  display.getSourceWidth( );
+return  iDisplay.getSourceWidth();
 }
 /**
 * from Interface VideoControl
 *
 {
 height = 1;
 }
 return height;
 */
-		return  display.getSourceHeight( );
+return  iDisplay.getSourceHeight();
 }
 /**
 * from Interface VideoControl
 {
 guiObject = initDynamicDisplayMode(aArg);
 }
 }
+//iItem = (Item)aArg;
+if (iVideoItem == null)
+Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,
+"VideoControl : iVideoItem is null");
+iDisplay = new ItemDisplay(iEventSource , iVideoItem);
+Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,
+"VideoControl : creation of ItemDisplay");
+int handle = initNativeDisplay(iVideoItem, iDisplay, true);
+// here actual listener is added to iDisplay
+iDisplay.setNativeHandle(handle);
+iVideoItem.setNativeHandle(handle);
+// Window resource initialization is done to the native video player
+//iDisplay.setWindowResources();
 iStatus = USE_GUI_PRIMITIVE;
 return guiObject;
 }
 else if (aMode == USE_DIRECT_VIDEO)
 {
 {
 throw new java.lang.IllegalArgumentException(
 "For USE_DIRECT_VIDEO mode argument should not be null");
 }
 iVideoCanvas = (Canvas)aArg;
-			// MMAPI UI 3.x req.
+// MMAPI UI 3.x req.
-			display = new MMACanvasDisplay(iEventSource , iVideoCanvas);
+iDisplay = new MMACanvasDisplay(iEventSource , iVideoCanvas);
-			System.out.println("VideoControl.java: after eswt control got from canvas has added observer");
+Logger.LOG(Logger.EJavaMMAPI,Logger.EInfo,"VideoControl.java: after eswt control got from canvas has added observer");
-int handle = initNativeDisplay(iVideoCanvas, display);
+int handle = initNativeDisplay(iVideoCanvas, iDisplay, false);
-// here actual listener is added to display
+// here actual listener is added to iDisplay
-						display.setNativeHandle(handle);
+iDisplay.setNativeHandle(handle);
-						// Window resource initialization is done to the native video player
+// Window resource initialization is done to the native video player
-						display.setWindowResources();
+iDisplay.setWindowResources(null);
 iStatus = USE_DIRECT_VIDEO;
 /*( try
 {
 this.setVisible(false);
 }
 catch (IllegalStateException ex) { }
-					*/
+*/
 return null;
 }
 else
 {
 // java.lang.IllegalArgumentException - Thrown if the mode is invalid.
 throw new java.lang.IllegalArgumentException(
 "Mode not supported or invalid, " +
 "valid modes are USE_DIRECT_VIDEO and USE_GUI_PRIMITIVE");
 }
 }
-		/**
+/**
 * Called from java for early initialization of native handle to java peer
 * Because it will be used to make a jni call
 */
 public void setNativeDisplayHandleToJavaPeer(int handle)
 {
-	System.out.println("VideoControl.java: setNativeDisplayHandleToJavaPeer handle =" + handle);
+Logger.LOG(Logger.EJavaMMAPI,Logger.EInfo,"VideoControl.java: setNativeDisplayHandleToJavaPeer handle =" + handle);
-	  display.setNativeHandle(handle);
+iDisplay.setNativeHandle(handle);
 }
 /**
 * Initializes native display.
 *
 */
-private int initNativeDisplay(Object aGuiObject, Object mmadisplay)
+private int initNativeDisplay(Object aGuiObject, Object mmadisplay, boolean aGuiType)
 {
 int handle = _initDisplayMode(iControlHandle,
 iEventSource,
 mmadisplay,
-aGuiObject);
+aGuiObject,
+aGuiType);
 NativeError.check(handle);
 return handle;
 }
 /**
 Object guiObject = guiFactory.initDisplayMode();
 // initNativeDisplay return handle MMMADirectContainer, 0 parameter
 // indicates that dynamic display will be used
 // MMAPI UI 3.x req.
 //  guiFactory.setContentHandle(initNativeDisplay(guiObject, 0));
 return guiObject;
 }
 /**
 * Initializes LCDUI display mode.
 * @return LCDUI Item
 */
 private Object initLCDUI()
 {
-iVideoItem = new VideoItem(iEventSource);
+Logger.LOG(Logger.EJavaMMAPI,Logger.EInfo,"+ VideoControl.java : initLCDUI() ");
+iVideoItem = new VideoItem(iEventSource,iPlayer);
 iPlayer.addPlayerListener(iVideoItem);
 // MMAPI UI 3.x req.
 // int handle = initNativeDisplay(iVideoItem,
 //                                1 /*iToolkitInvoker.itemGetHandle(iVideoItem)*/);
 // iVideoItem.setNativeHandle(handle);
 iStatus = USE_GUI_PRIMITIVE;
 return iVideoItem;
 }
 }
 return guiObject;
 }
 //  private int updateForeground()  // MMAPI UI 3.x changes
 private void updateForeground()
 {
 int isFG = 1;
 /*
 // Check whether display is initialized
 checkState();
 if (iStatus == NOT_INITIALIZED)
 {
 return visible;
 }
 iMIDletInstance = MIDletExecutor.getCurrentMIDlet();
 MIDlet midlet = iMIDletInstance.getMIDlet();
 //Displayable displayable;
 if (midlet == null)
 {
 return visible;
 }
+else
+{
+Displayable displayable = Display.getDisplay(midlet).getCurrent();
+if (displayable != null && displayable.isShown())
+{
+Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,
+"VideoControl.updateForeground isShown() = 1");
+// visible
+}
+else
+{
+Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,
+"VideoControl.updateForeground isShown() = 0");
+// not visible
+visible = 0;
+}
+// Set the foreground state
+_setForeground(iControlHandle,
+iEventSource,
+visible);
+}
+return visible;
+*/
+// MMAPI UI 3.x req.
+// Get the midlet position BG/FG
+boolean visible = ManagerImpl.getInstance().isForground();
+if (visible)
+isFG = 1;
 else
-{
+isFG = 0;
-Displayable displayable = Display.getDisplay(midlet).getCurrent();
-if (displayable != null && displayable.isShown())
-{
-Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,
-"VideoControl.updateForeground isShown() = 1");
-// visible
-}
-else
-{
-Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,
-"VideoControl.updateForeground isShown() = 0");
-// not visible
-visible = 0;
-}
-// Set the foreground state
-_setForeground(iControlHandle,
-iEventSource,
-visible);
-}
-return visible;
-*/
-// MMAPI UI 3.x req.
-		// Get the midlet position BG/FG
-		boolean visible = ManagerImpl.getInstance().isForground();
-		if(visible)
-		isFG = 1;
-		else
-		isFG = 0;
 _setForeground(iControlHandle,
 iEventSource,
 isFG);
 // return visible;
 }
 private native int _construct(int aControlHandle,
-int aEventSourceHandle,
+int aEventSourceHandle);
-int aToolkitHandle);
 private native int _getControlProperty(int aControlHandle,
 int aEventSourceHandle,
 int aPropertyType);
 String aProperties);
 private native int _initDisplayMode(int aControlHandle,
 int aEventSourceHandle,
 Object aJavaDisplay,
-Object aJavaDisplayObject);
+Object aJavaDisplayObject,
+boolean aGuiTYpe);
 private native int _setForeground(int aControlHandle,
 int aEventSourceHandle,
 int aIsForeground);
 private native boolean _isESWT();

changeset 26	dc7c549001d5
parent 23	98ccebc37403
child 47	f40128debb5d
child 56	abc41079b313