FCL/sf/app/jrt: comparison javauis/mmapi_qt/baseline/src/cmmavideocontrol.cpp

equal deleted inserted replaced

-:85266cc22c7f
+:35baca0e7a2e
 void CMMAVideoControl::StaticInitL(CMMAVideoControl* aControl,
 jobject javaDisplayRef,
 MMAFunctionServer* aEventSource,
 TInt* aDisplayHandle,
 CMMAEvent* aDeleteRefEvent,
-TBool aGuiType)
+TInt aGuiType)
 {
 LOG(EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticInitL +");
-if (aGuiType == true)
+if (aGuiType == CMMAVideoControl::EDISPLAY_VIDEOITEM)
 {
 LOG(EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticInitL - aGuiType is customitem ");
 aControl->iDeleteRefEvent = aDeleteRefEvent;
 CMMAItemDisplay* itemDisplay =
 CMMAItemDisplay::NewLC(aEventSource,javaDisplayRef);
 aControl->iDisplay = itemDisplay;
 CleanupStack::Pop(itemDisplay);
 *aDisplayHandle = reinterpret_cast<TInt>(itemDisplay);
 }
-else
+else if (aGuiType == CMMAVideoControl::EDISPLAY_CANVAS)
 {
 LOG(EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticInitL - aGuiType is canvas ");
 aControl->iDeleteRefEvent = aDeleteRefEvent;
 CMMACanvasDisplay* canvasDisplay =
 TRAP_IGNORE(iGuiPlayer->SetDisplayL(iDisplay));
 }
 void CMMAVideoControl::StaticInitDynamicModeL(
 CMMAVideoControl* aVideoControl,
+JNIEnv* aJni,
 TInt* aContentHandle,
 MMAFunctionServer* aEventSource,
 jobject aGUIObject,
 CMMAEvent* aDeleteRefEvent)
 {
 LOG(EJavaMMAPI,EInfo,"MMA::CMMAVideoControl::StaticInitDynamicModeL+");
 aVideoControl->iDeleteRefEvent = aDeleteRefEvent;
 CMMADCDisplay* dcDisplay = CMMADCDisplay::NewLC(aVideoControl->iGuiPlayer,
 aEventSource,
+aJni,
 aGUIObject);
-MMMADirectContent* content = dcDisplay;
+//MMMADirectContent* content = dcDisplay;
-*aContentHandle = reinterpret_cast< TInt >(content);
+*aContentHandle = reinterpret_cast< TInt >(dcDisplay);
 aVideoControl->iDisplay = dcDisplay;
 aVideoControl->iGuiPlayer->SetDisplayL(aVideoControl->iDisplay);
 CleanupStack::Pop(dcDisplay);
 LOG(EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticInitDynamicModeL-");
 }
-void CMMAVideoControl::StaticGetPropertyL(CMMAVideoControl* /*aControl*/,
+void CMMAVideoControl::StaticGetPropertyL(CMMAVideoControl* aControl,
-TInt /*aPropertyType*/,
+TInt aPropertyType,
-TInt* /*aReturnValue*/)
+TInt* aReturnValue)
 {
-// LOG1( EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticGetPropertyL property %d",
+LOG1(EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticGetPropertyL property %d",
-//           aPropertyType);
+aPropertyType);
 // MMAPI UI 3.x req.
 // remove the below return and uncomment the below code once  display is implemented in java
-return;
+//    return;
-/*
 MMMADisplay* display = aControl->iDisplay;
 if (aPropertyType != com_nokia_microedition_media_control_VideoControl_PROPERTY_SOURCE_WIDTH &&
 aPropertyType != com_nokia_microedition_media_control_VideoControl_PROPERTY_SOURCE_HEIGHT &&
 !display)
 {
-LOG( EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticGetPropertyL not initialized yet");
+LOG(EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticGetPropertyL not initialized yet");
 // init is not done yet, returning 0
 *aReturnValue = 0;
 return;
 }
 switch (aPropertyType)
 {
 case com_nokia_microedition_media_control_VideoControl_PROPERTY_DISPLAY_WIDTH:
 {
 *aReturnValue = display->DisplaySize().iWidth;
 break;
 }
 case com_nokia_microedition_media_control_VideoControl_PROPERTY_DISPLAY_HEIGHT:
 {
 *aReturnValue = display->DisplaySize().iHeight;
-break;
+LOG1(EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticGetPropertyL aReturnValue %d",
-}
+*aReturnValue);
-case com_nokia_microedition_media_control_VideoControl_PROPERTY_DISPLAY_X:
+break;
-{
+}
-*aReturnValue = display->DisplayLocation().iX;
+case com_nokia_microedition_media_control_VideoControl_PROPERTY_DISPLAY_X:
-break;
+{
-}
+*aReturnValue = display->DisplayLocation().iX;
-case com_nokia_microedition_media_control_VideoControl_PROPERTY_DISPLAY_Y:
+break;
-{
+}
-*aReturnValue = display->DisplayLocation().iY;
+case com_nokia_microedition_media_control_VideoControl_PROPERTY_DISPLAY_Y:
-break;
+{
-}
+*aReturnValue = display->DisplayLocation().iY;
-case com_nokia_microedition_media_control_VideoControl_PROPERTY_SOURCE_WIDTH:
+break;
-{
+}
-LOG( EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticGetPropertyL get source width");
+case com_nokia_microedition_media_control_VideoControl_PROPERTY_SOURCE_WIDTH:
-*aReturnValue = aControl->iGuiPlayer->SourceSize().iWidth;
+{
-break;
+LOG(EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticGetPropertyL get source width");
-}
+*aReturnValue = aControl->iGuiPlayer->SourceSize().iWidth;
-case com_nokia_microedition_media_control_VideoControl_PROPERTY_SOURCE_HEIGHT:
+break;
-{
+}
-LOG( EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticGetPropertyL get source height");
+case com_nokia_microedition_media_control_VideoControl_PROPERTY_SOURCE_HEIGHT:
-*aReturnValue = aControl->iGuiPlayer->SourceSize().iHeight;
+{
-break;
+LOG(EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticGetPropertyL get source height");
-}
+*aReturnValue = aControl->iGuiPlayer->SourceSize().iHeight;
-default:
+break;
-{
+}
-*aReturnValue = KErrNotFound;
+default:
-User::Leave(KErrNotFound);
+{
-break;
+*aReturnValue = KErrNotFound;
-}
+User::Leave(KErrNotFound);
-}
+break;
-*/
+}
 }
+}
-void CMMAVideoControl::StaticSetPropertyL(CMMAVideoControl* /*aControl*/,
-TInt /*aPropertyType*/,
-TInt /*aPropertyA*/,
+void CMMAVideoControl::StaticSetPropertyL(CMMAVideoControl* aControl,
-TInt /*aPropertyB*/)
+TInt aPropertyType,
+TInt aPropertyA,
+TInt aPropertyB)
 {
 //LOG1( EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticSetPropertyL property type %d",
 //          aPropertyType);
 //LOG1( EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticSetPropertyL a property %d",
 //         aPropertyA);
 // LOG1( EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticSetPropertyL b property %d",
 //          aPropertyB);
 // MMAPI UI 3.x req.
 // remove the below return and uncomment the below code; once  display is implemented in java
-return;
+// return;
-/*
 MMMADisplay* display = aControl->iDisplay;
 __ASSERT_DEBUG(display != NULL,
 User::Panic(_L("display not initialized"), KErrNotReady));
 switch (aPropertyType)
+{
+case com_nokia_microedition_media_control_VideoControl_SET_DISPLAY_SIZE:
+{
+TSize displaySize(aPropertyA, aPropertyB);
+LOG2(EJavaMMAPI, EInfo, "CMMAVideoControl::statepropertyl %d , %d",displaySize.iHeight,displaySize.iWidth);
+display->SetDisplaySizeL(displaySize);
+LOG(EJavaMMAPI, EInfo, "CMMAVideoControl::SetDisplayProperty:: setDisplaySizeL Completed");
+// inform java side
+if (!display->IsFullScreen())
 {
-case com_nokia_microedition_media_control_VideoControl_SET_DISPLAY_SIZE:
+aControl->iGuiPlayer->NotifyWithStringEvent(
-{
+CMMAPlayerEvent::ESizeChanged, KControlName);
-TSize displaySize(aPropertyA, aPropertyB);
-display->SetDisplaySizeL(displaySize);
-// inform java side
-if (!display->IsFullScreen())
-{
-aControl->iGuiPlayer->NotifyWithStringEvent(
-CMMAPlayerEvent::ESizeChanged, KControlName);
-}
-break;
 }
-case com_nokia_microedition_media_control_VideoControl_SET_DISPLAY_LOCATION:
+break;
-{
+}
-TPoint displayLocation(aPropertyA, aPropertyB);
+case com_nokia_microedition_media_control_VideoControl_SET_DISPLAY_LOCATION:
-display->SetDisplayLocationL(displayLocation);
+{
-break;
+TPoint displayLocation(aPropertyA, aPropertyB);
-}
+display->SetDisplayLocationL(displayLocation);
-case com_nokia_microedition_media_control_VideoControl_SET_DISPLAY_VISIBLE_TRUE:
+break;
-{
+}
-display->SetVisible(ETrue);
+case com_nokia_microedition_media_control_VideoControl_SET_DISPLAY_VISIBLE_TRUE:
-break;
+{
-}
+display->SetVisible(ETrue);
-case com_nokia_microedition_media_control_VideoControl_SET_DISPLAY_VISIBLE_FALSE:
+break;
-{
+}
-display->SetVisible(EFalse);
+case com_nokia_microedition_media_control_VideoControl_SET_DISPLAY_VISIBLE_FALSE:
-break;
+{
-}
+display->SetVisible(EFalse);
-case com_nokia_microedition_media_control_VideoControl_SET_DISPLAY_FULLSCREEN_TRUE:
+break;
-{
+}
-// store old user rect to determine if SIZE_CHANGED event
+case com_nokia_microedition_media_control_VideoControl_SET_DISPLAY_FULLSCREEN_TRUE:
-// has to be delivered when full screen mode is turned off.
+{
-aControl->iOldDisplaySize = display->DisplaySize();
+// store old user rect to determine if SIZE_CHANGED event
+// has to be delivered when full screen mode is turned off.
-display->SetFullScreenL(ETrue);
+aControl->iOldDisplaySize = display->DisplaySize();
-break;
+LOG1(EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticSetPropertyL a property %d",
-}
+aPropertyA);
-case com_nokia_microedition_media_control_VideoControl_SET_DISPLAY_FULLSCREEN_FALSE:
+LOG1(EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticSetPropertyL b property %d",
-{
+aPropertyB);
-display->SetFullScreenL(EFalse);
+//TSize fullscreenSize(aPropertyA, aPropertyB);
+//display->SetFullscreenSize(fullscreenSize);
-// Send SIZE_CHANGED event when fullscreen is turned off if
+//display->SetDisplaySizeL(fullscreenSize);
-// size of the video display has changed. Possible position
+//display->SetFullScreenL(ETrue);
-// change is however disregarded
+display->SourceSizeChanged(aPropertyA, aPropertyB,0,0,TRect(0,0,0,0));
-if (aControl->iOldDisplaySize != display->DisplaySize())
+break;
-{
+}
-aControl->iGuiPlayer->NotifyWithStringEvent(
+case com_nokia_microedition_media_control_VideoControl_SET_DISPLAY_FULLSCREEN_FALSE:
-CMMAPlayerEvent::ESizeChanged, KControlName);
+{
-}
+TSize fullscreenSize = aControl->iOldDisplaySize;
+display->SetFullscreenSize(fullscreenSize);
-break;
+display->SetFullScreenL(EFalse);
-}
-default:
+// Send SIZE_CHANGED event when fullscreen is turned off if
-{
+// size of the video display has changed. Possible position
-User::Leave(KErrNotFound);
+// change is however disregarded
-break;
+/* if (aControl->iOldDisplaySize != display->DisplaySize())
-}
+{
-}
+aControl->iGuiPlayer->NotifyWithStringEvent(
-*/
+CMMAPlayerEvent::ESizeChanged, KControlName);
+}*/
+break;
+}
+default:
+{
+User::Leave(KErrNotFound);
+break;
+}
+}
 }
 void CMMAVideoControl::TakeSnapShotL(CMMAVideoControl* aControl,
 const TDesC* aProperties)
 {
 iDisplay->SetForeground(iIsForeground, aUseEventServer);
 }
 }
+/*
+MMMAGuiPlayer* CMMAVideoControl::GuiPlayer()
+{
+return iGuiPlayer;
+}
+*/
 /**
 * Handles a change to resources which are shared accross the environment.
 */
 /*
 void CMMAVideoControl::HandleResourceChangeL(TInt aType)

changeset 49	35baca0e7a2e
parent 26	dc7c549001d5
child 56	abc41079b313