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

equal deleted inserted replaced

-:023eef975703
+:abc41079b313
 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.nokia.mj.impl.utils.Logger;
 //import com.symbian.midp.runtime.MIDletExecutor;
 import com.nokia.mj.impl.media.PlayerPermission;
 import com.nokia.mj.impl.rt.support.ApplicationUtils;
 // 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.graphics.Rectangle;
 import org.eclipse.swt.widgets.*;
 import javax.microedition.lcdui.*;
 import org.eclipse.ercp.swt.mobile.MobileShell;
 private static String LISTENER = ".Listener";
 // class name used to check if eswt is included
 private static String ESWT_CONTROL = ".control";
+//Contants for display type
+private static final int DISPLAY_CANVAS = 0;
+private static final int DISPLAY_VIDEOITEM = 1;
+private static final int DISPLAY_ESWT = 2;
 protected int iStatus = NOT_INITIALIZED;
 // Needed for getting native handle from lcdui components
 //com.symbian.midp.runtime.ToolkitInvoker iToolkitInvoker;
 private VideoItem iVideoItem;
 private Canvas iVideoCanvas;
 private Item iItem ;
+private int iGuiType;
 BaseDisplay iDisplay;
 //    private MIDletInstance iMIDletInstance;
 // error code used asynchronous native calls
 // toolkit, stored as object as we don't have access to Toolkit class.
 private Object iToolkit;
 // for midlet foreground statelistening
 //ToolkitInvoker iTlkitInvoker;
+//ESWT
+private org.eclipse.swt.widgets.Display eswtDisplay;
+private Control iControl;
+private ESWTProxyControl control;
 private Finalizer mFinalizer = new Finalizer()
 {
 public void finalizeImpl()
 {
 Logger.LOG(Logger.EJavaMMAPI,Logger.EInfo,"inside setDisplaySize()");
 //canvasdisplay.setDisplaySize( aWidth, aHeight);
-iDisplay.setDisplaySize(aWidth, aHeight);
+//iDisplay.setDisplaySize(aWidth, aHeight);
-/*
+if (iGuiType == DISPLAY_ESWT)
+{
+//iDisplay.setDisplaySize(aWidth, aHeight);
+}
 int ret = setDisplayProperty(aWidth, aHeight, SET_DISPLAY_SIZE);
 if (ret < 0)
 {
 throw new MediaException("setDisplaySize() failed, SymbianOS error: "
 + ret);
 }
 if (iStatus == USE_GUI_PRIMITIVE &&
 iVideoItem != null)  // with dynamic display mode item can be null
 {
-iVideoItem.privateInvalidate();
+//iVideoItem.privateInvalidate();
 }
-*/
 }
 /**
 * from Interface VideoControl
 *
 */
 public void setDisplayFullScreen(boolean aFullScreenMode) throws MediaException
+{
+checkState();
+if (iStatus == NOT_INITIALIZED)
+{
+throw new IllegalStateException(
+"VideoControl.initDisplayMode() not called yet");
+}
+int ret;
+if (aFullScreenMode)
+{
+if (iGuiType == DISPLAY_ESWT)
+{
+iDisplay.setDisplayFullScreen(aFullScreenMode);
+}
+//Rectangle fullscreenRect = iDisplay.getFullScreenBounds();
+Rectangle fullscreenRect = iDisplay.getBounds();
+System.out.println("MMAPI: setDisplayFullscreen size width = " + fullscreenRect.width + " height = " + fullscreenRect.height);
+ret = setDisplayProperty(fullscreenRect.width, fullscreenRect.height, SET_DISPLAY_FULLSCREEN_TRUE);
+}
+else
+{
+ret = setDisplayProperty(SET_DISPLAY_FULLSCREEN_FALSE);
+}
+if (ret < 0)
+{
+throw new MediaException();
+}
+Logger.LOG(Logger.EJavaMMAPI,Logger.EInfo,"inside setDisplayFullScreen()");
+//canvasdisplay.setDisplayFullScreen( aFullScreenMode);
+//       iDisplay.setDisplayFullScreen(aFullScreenMode);
+}
+/**
+* from Interface VideoControl
+*
+*/
+public void setDisplayLocation(int aX, int aY)
+{
+checkState();
+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);
+Logger.LOG(Logger.EJavaMMAPI,Logger.EInfo,"inside setDisplayLocation()");
+//canvasdisplay.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");
 }
-/*
+if (aVisible)
-int ret;
-if (aFullScreenMode)
-{
-ret = setDisplayProperty(SET_DISPLAY_FULLSCREEN_TRUE);
-}
-else
-{
-ret = setDisplayProperty(SET_DISPLAY_FULLSCREEN_FALSE);
-}
-if (ret < 0)
-{
-throw new MediaException();
-}
-*/
-Logger.LOG(Logger.EJavaMMAPI,Logger.EInfo,"inside setDisplayFullScreen()");
-//canvasdisplay.setDisplayFullScreen( aFullScreenMode);
-iDisplay.setDisplayFullScreen(aFullScreenMode);
-}
-/**
-* from Interface VideoControl
-*
-*/
-public void setDisplayLocation(int aX, int aY)
-{
-// checkState();
-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);
-*/
-Logger.LOG(Logger.EJavaMMAPI,Logger.EInfo,"inside setDisplayLocation()");
-//canvasdisplay.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");
-}
-/*if (aVisible)
 {
 // Update the foreground or background state of the midlet before
 // setting the visibility of the control
-updateForeground();
+//updateForeground();
 // cannot fail -> ignore return value
 setDisplayProperty(SET_DISPLAY_VISIBLE_TRUE);
 }
 else
 {
 // cannot fail -> ignore return value
 setDisplayProperty(SET_DISPLAY_VISIBLE_FALSE);
 }
-*/
 Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,
 " before iDisplay.setVisible()");
 Logger.LOG(Logger.EJavaMMAPI,Logger.EInfo,"inside setVisible()");
-// canvasdisplay.setVisible( aVisible );
-iDisplay.setVisible(aVisible);
+//iDisplay.setVisible(aVisible);
 Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,
 "after iDisplay.setVisible()");
 * from Interface VideoControl
 *
 */
 public int getDisplayWidth()
 {
-/*
+checkState();
-checkState();
+if (iStatus == NOT_INITIALIZED)
-if (iStatus == NOT_INITIALIZED)
+{
-{
+throw new IllegalStateException(
-throw new IllegalStateException(
+"VideoControl.initDisplayMode() not called yet");
-"VideoControl.initDisplayMode() not called yet");
+}
-}
+int width = getControlProperty(PROPERTY_DISPLAY_WIDTH);
-int width = getControlProperty(PROPERTY_DISPLAY_WIDTH);
+return width;
-return width;
-*/
-//return  canvasdisplay.getDisplayWidth( );
-return iDisplay.getDisplayWidth();
 }
 /**
 * from Interface VideoControl
 *
 */
 public int getDisplayHeight()
 {
-/* checkState();
+checkState();
 if (iStatus == NOT_INITIALIZED)
 {
 throw new IllegalStateException(
 "VideoControl.initDisplayMode() not called yet");
 }
 int height = getControlProperty(PROPERTY_DISPLAY_HEIGHT);
 return height;
-*/
-return  iDisplay.getDisplayHeight();
+//return  iDisplay.getDisplayHeight();
 }
 /**
 * from Interface VideoControl
 *
 */
 public int getDisplayX()
 {
-/* checkState();
+checkState();
 if (iStatus == NOT_INITIALIZED)
 {
 return UNDEFINED_RETURN_VALUE;
 }
 int x = getControlProperty(PROPERTY_DISPLAY_X);
 return x;
-*/
-return  iDisplay.getDisplayX();
+//return  iDisplay.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  iDisplay.getDisplayY();
+// return  iDisplay.getDisplayY();
 }
 /**
 * from Interface VideoControl
 *
 */
 public int getSourceWidth()
 {
-/* checkState();
+checkState();
 int width = getControlProperty(PROPERTY_SOURCE_WIDTH);
 if (width <= 0)
 {
 width = 1;
 }
 return width;
-*/
-return  iDisplay.getSourceWidth();
+//return  0;//iDisplay.getSourceWidth();
 }
 /**
 * from Interface VideoControl
 *
 */
 public int getSourceHeight()
 {
-/*checkState();
+checkState();
 int height = getControlProperty(PROPERTY_SOURCE_HEIGHT);
 if (height <= 0)
 {
 height = 1;
 }
 return height;
-*/
-return  iDisplay.getSourceHeight();
+//return  0;//iDisplay.getSourceHeight();
 }
 /**
 * from Interface VideoControl
 // called again after it has previously been called successfully.
 throw new IllegalStateException(
 "initDisplayMode() already called successfully");
 }
+if (aArg != null && aArg.equals(Control.class.getName()))
+{
+eswtDisplay = org.eclipse.swt.widgets.Display.getDefault();
+}
+else
+{
+eswtDisplay = com.nokia.mj.impl.nokialcdui.LCDUIInvoker.getEswtDisplay();
+}
 if (aMode == USE_GUI_PRIMITIVE)
 {
 Object guiObject = null;
 if (aArg == null)
 {
 guiObject = initLCDUI();
 }
 else // try load dynamic display mode
 {
 guiObject = initDynamicDisplayMode(aArg);
+iControl = (Control)guiObject;
+iDisplay = new MMAeSWTDisplay(iEventSource, iControl);
+int handle = initNativeDisplay(iControl, iDisplay, iGuiType);
+Logger.LOG(Logger.EJavaMMAPI,Logger.EInfo,"MMAPI: VideoControl.java: initDisplayMode(): nativeDisplayHandle = " + handle);
+iDisplay.setNativeHandle(handle);
+ESWTProxyControl proxyControl = (ESWTProxyControl)iControl;
+proxyControl.seteSWTDisplay(iDisplay);
+proxyControl.setNativeDisplayHandle(handle);
+//display.setWindowResources();
+iStatus = USE_GUI_PRIMITIVE;
+return iControl;
 }
 }
 //iItem = (Item)aArg;
 iDisplay = new ItemDisplay(iEventSource , iVideoItem);
 Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,
 "VideoControl : creation of ItemDisplay");
-int handle = initNativeDisplay(iVideoItem, iDisplay, true);
+int handle = initNativeDisplay(iVideoItem, iDisplay, DISPLAY_VIDEOITEM);
 // 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();
 {
 throw new java.lang.IllegalArgumentException(
 "For USE_DIRECT_VIDEO mode argument should not be null");
 }
 iVideoCanvas = (Canvas)aArg;
+iGuiType = DISPLAY_CANVAS;
 // MMAPI UI 3.x req.
 iDisplay = new MMACanvasDisplay(iEventSource , iVideoCanvas);
 Logger.LOG(Logger.EJavaMMAPI,Logger.EInfo,"VideoControl.java: after eswt control got from canvas has added observer");
-int handle = initNativeDisplay(iVideoCanvas, iDisplay, false);
+int handle = initNativeDisplay(iVideoCanvas, iDisplay, DISPLAY_CANVAS);
 // here actual listener is added to iDisplay
 iDisplay.setNativeHandle(handle);
 // Window resource initialization is done to the native video player
 iDisplay.setWindowResources(null);
 iStatus = USE_DIRECT_VIDEO;
 /**
 * Initializes native display.
 *
 */
-private int initNativeDisplay(Object aGuiObject, Object mmadisplay, boolean aGuiType)
+private int initNativeDisplay(Object aGuiObject, Object mmadisplay, int aGuiType)
 {
 int handle = _initDisplayMode(iControlHandle,
 iEventSource,
 mmadisplay,
 aGuiObject,
 */
 private int getControlProperty(int aPropertyType)
 {
 return _getControlProperty(iControlHandle,
 iEventSource,
-aPropertyType);
+aPropertyType,
+iGuiType);
 }
 /**
 * Sets two properties to native side.
 *
 {
 return _setDisplayProperty(iControlHandle,
 iEventSource,
 aParamA,
 aParamB,
-aPropertyType);
+aPropertyType,
+iGuiType);
 }
 /**
 * Sets one property to native side.
 *
 {
 return _setDisplayProperty(iControlHandle,
 iEventSource,
 0,
 0,
-aPropertyType);
+aPropertyType,
+iGuiType);
 }
 /**
 * Called from native side when snapshot is ready
 *
 * @param aMode parameter for display mode
 * @return GUI object
 */
 private Object initDynamicDisplayMode(Object aMode)
 {
-MMAGUIFactory guiFactory = null;
+//MMAGUIFactory guiFactory = null;
 try
 {
-String className = ((String)aMode).toLowerCase() +
+// String className = ((String)aMode).toLowerCase();
-GUI_FACTORY_CLASS_NAME;
+//GUI_FACTORY_CLASS_NAME;*/
-Class guiClass = Class.forName(className);
+Class guiClass = Class.forName((String)aMode);
-guiFactory = (MMAGUIFactory)guiClass.newInstance();
+//guiFactory = (MMAGUIFactory)guiClass.newInstance();
+Logger.LOG(Logger.EJavaMMAPI,Logger.EInfo,"MMAPI: VideoControl.java: After loading class");
+eswtDisplay.syncExec(new Runnable()
+{
+public void run()
+{
+Logger.LOG(Logger.EJavaMMAPI,Logger.EInfo,"MMAPI: VideoControl.java: Before creating ESWTProxyControl.");
+control = new ESWTProxyControl();
+Logger.LOG(Logger.EJavaMMAPI,Logger.EInfo,"MMAPI: VideoControl.java: ESWTProxyControl created.");
+}
+});
 }
 catch (ClassNotFoundException cnfe)
 {
 // if the class could not be found
 throw new IllegalArgumentException(
 "Mode not supported or invalid, " +
 "valid modes are USE_DIRECT_VIDEO and USE_GUI_PRIMITIVE");
 }
-catch (IllegalAccessException iae)
+/*       catch (IllegalAccessException iae)
 {
 // if the class or initializer is not accessible
 throw new IllegalArgumentException("Mode: " + aMode +
 " caused " + iae);
 }
 catch (InstantiationException ie)
 {
 // if an application tries to instantiate an abstract class or an
 // interface, or if the instantiation fails for some other reason
 throw new IllegalArgumentException("Mode: " + aMode +
 " caused " + ie);
-}
+}*/
 catch (ClassCastException cce)
 {
 // Thrown to indicate that the code has attempted to cast an
 // object to a subclass of which it is not an instance.
 throw new IllegalArgumentException("Mode: " + aMode +
 " caused " + cce);
 }
-Object guiObject = guiFactory.initDisplayMode();
+//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;
+iGuiType = DISPLAY_ESWT;
+return control;
 }
 /**
 * Initializes LCDUI display mode.
 * @return LCDUI Item
 private native int _construct(int aControlHandle,
 int aEventSourceHandle);
 private native int _getControlProperty(int aControlHandle,
 int aEventSourceHandle,
-int aPropertyType);
+int aPropertyType,
+int aGuiType);
 private native int _setDisplayProperty(int aControlHandle,
 int aEventSourceHandle,
 int aParamA,
 int aParamB,
-int aPropertyType);
+int aPropertyType,
+int aGuiType);
 private native int _getSnapshot(int aControlHandle,
 int aEventSourceHandle,
 String aProperties);
 private native int _initDisplayMode(int aControlHandle,
 int aEventSourceHandle,
 Object aJavaDisplay,
 Object aJavaDisplayObject,
-boolean aGuiTYpe);
+int aGuiTYpe);
 private native int _setForeground(int aControlHandle,
 int aEventSourceHandle,
 int aIsForeground);
 private native boolean _isESWT();

changeset 56	abc41079b313
parent 26	dc7c549001d5