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

equal deleted inserted replaced

-:98ccebc37403
+:dc7c549001d5
 delete iDisplay;
 // Event server takes event ownership
 if (iEventPoster)
 {
-if(iDeleteRefEvent)
+if (iDeleteRefEvent)
 {
 iEventPoster->PostEvent(iDeleteRefEvent);
 }
 }
 if (iSnapshot)
 "snapshotReady",
 "(I[B)V");
 aControl->iSnapshot = CMMASnapshot::NewL(aControl->iGuiPlayer,
 *aControl);
 // aControl->RegisterForegroundListenerL(aToolkit);   // 3.x QT based UI
 }
 /*   // 3.x QT based UI
 // mobitv fix`
 void CMMAVideoControl::RegisterForegroundListenerL(CMIDToolkit* aToolkit)
 {
 LOG(EJavaMMAPI,EInfo,"CMMAVideoControl::RegisterForegroundListenerL - ");
 }
 */
 void CMMAVideoControl::StaticInitL(CMMAVideoControl* aControl,
-								   jobject javaDisplayRef,
+jobject javaDisplayRef,
-								   MMAFunctionServer* aEventSource,
+MMAFunctionServer* aEventSource,
 TInt* aDisplayHandle,
-CMMAEvent* aDeleteRefEvent)
+CMMAEvent* aDeleteRefEvent,
-{
+TBool aGuiType)
+{
-LOG( EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticInitL +");
+LOG(EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticInitL +");
-aControl->iDeleteRefEvent = aDeleteRefEvent;
+if (aGuiType == true)
-CMMACanvasDisplay* canvasDisplay =
+{
-	            CMMACanvasDisplay::NewLC(aEventSource,javaDisplayRef);
+LOG(EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticInitL - aGuiType is customitem ");
-	  aControl->iDisplay = canvasDisplay;
+aControl->iDeleteRefEvent = aDeleteRefEvent;
-	  CleanupStack::Pop(canvasDisplay);
-*aDisplayHandle = reinterpret_cast<TInt>(canvasDisplay);
-/*    MMIDComponent::TType componentType = aComponent->Type();
-switch (componentType)
-{
-case MMIDComponent::ECustomItem:
-{
-//MMIDCustomItem  // end of // 3.x QT based UI
-// MMIDCustomItem* customItem =
-//   reinterpret_cast< MMIDCustomItem* >(aComponent);
 CMMAItemDisplay* itemDisplay =
-CMMAItemDisplay::NewLC(customItem);
+CMMAItemDisplay::NewLC(aEventSource,javaDisplayRef);
 aControl->iDisplay = itemDisplay;
 CleanupStack::Pop(itemDisplay);
-*aDisplayHandle = JavaMakeHandle(itemDisplay);
+*aDisplayHandle = reinterpret_cast<TInt>(itemDisplay);
-break;
+}
-}
+else
-case MMIDComponent::ECanvas:
+{
-{
+LOG(EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticInitL - aGuiType is canvas ");
-//MMIDCanvas
+aControl->iDeleteRefEvent = aDeleteRefEvent;
-MMIDCanvas* canvas = reinterpret_cast< MMIDCanvas* >(aComponent);
 CMMACanvasDisplay* canvasDisplay =
-CMMACanvasDisplay::NewLC(canvas);
+CMMACanvasDisplay::NewLC(aEventSource,javaDisplayRef);
 aControl->iDisplay = canvasDisplay;
 CleanupStack::Pop(canvasDisplay);
-*aDisplayHandle = JavaMakeHandle(canvasDisplay);
+*aDisplayHandle = reinterpret_cast<TInt>(canvasDisplay);
-break;
+}
-}
-default:
+/*    MMIDComponent::TType componentType = aComponent->Type();
-{
+switch (componentType)
-// other component types are not supported
+{
-User::Leave(KErrNotSupported);
+case MMIDComponent::ECustomItem:
-}
+{
+//MMIDCustomItem  // end of // 3.x QT based UI
-}*/
+// MMIDCustomItem* customItem =
+//   reinterpret_cast< MMIDCustomItem* >(aComponent);
+CMMAItemDisplay* itemDisplay =
+CMMAItemDisplay::NewLC(customItem);
+aControl->iDisplay = itemDisplay;
+CleanupStack::Pop(itemDisplay);
+*aDisplayHandle = JavaMakeHandle(itemDisplay);
+break;
+}
+case MMIDComponent::ECanvas:
+{
+//MMIDCanvas
+MMIDCanvas* canvas = reinterpret_cast< MMIDCanvas* >(aComponent);
+CMMACanvasDisplay* canvasDisplay =
+CMMACanvasDisplay::NewLC(canvas);
+aControl->iDisplay = canvasDisplay;
+CleanupStack::Pop(canvasDisplay);
+*aDisplayHandle = JavaMakeHandle(canvasDisplay);
+break;
+}
+default:
+{
+// other component types are not supported
+User::Leave(KErrNotSupported);
+}
+}*/
 aControl->iGuiPlayer->SetDisplayL(aControl->iDisplay);
-LOG( EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticInitL - ");
+LOG(EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticInitL - ");
 }
 void CMMAVideoControl::SetDisplayHandleToJavaPeer(MMAFunctionServer* eventSource ,jobject aJavaVideoControlPeer)
 {
-	JNIEnv* validJNI = eventSource->getValidJniEnv();
+JNIEnv* validJNI = eventSource->getValidJniEnv();
-	jmethodID jmid = validJNI->GetMethodID( validJNI->GetObjectClass(aJavaVideoControlPeer),
+jmethodID jmid = validJNI->GetMethodID(validJNI->GetObjectClass(aJavaVideoControlPeer),
 "setNativeDisplayHandleToJavaPeer",
 "(I)V");
 // DEBUG_INT("CMMADisplay::GetCallbackInUiThread getCallBackMethodID = %d",getCallBackMethodID);
 TInt handle = reinterpret_cast<TInt>(iDisplay);
 validJNI->CallVoidMethod(aJavaVideoControlPeer,jmid,handle);
-iGuiPlayer->SetDisplayL(iDisplay);
+TRAP_IGNORE(iGuiPlayer->SetDisplayL(iDisplay));
 }
 void CMMAVideoControl::StaticInitDynamicModeL(
 CMMAVideoControl* aVideoControl,
 TInt* aContentHandle,
 MMMADirectContent* content = dcDisplay;
 *aContentHandle = reinterpret_cast< TInt >(content);
 aVideoControl->iDisplay = dcDisplay;
 aVideoControl->iGuiPlayer->SetDisplayL(aVideoControl->iDisplay);
 CleanupStack::Pop(dcDisplay);
-LOG( EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticInitDynamicModeL-");
+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; once  display is implemented in java
+// remove the below return and uncomment the below code once  display is implemented in java
 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");
 // 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;
 }
 case com_nokia_microedition_media_control_VideoControl_PROPERTY_DISPLAY_X:
 {
 *aReturnValue = display->DisplayLocation().iX;
 break;
 }
 case com_nokia_microedition_media_control_VideoControl_PROPERTY_DISPLAY_Y:
 {
 *aReturnValue = display->DisplayLocation().iY;
 break;
 }
 case com_nokia_microedition_media_control_VideoControl_PROPERTY_SOURCE_WIDTH:
 {
 LOG( EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticGetPropertyL get source width");
 *aReturnValue = aControl->iGuiPlayer->SourceSize().iWidth;
 break;
 }
 case com_nokia_microedition_media_control_VideoControl_PROPERTY_SOURCE_HEIGHT:
 {
 LOG( EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticGetPropertyL get source height");
 *aReturnValue = aControl->iGuiPlayer->SourceSize().iHeight;
 break;
 }
 default:
 {
 *aReturnValue = KErrNotFound;
 User::Leave(KErrNotFound);
 break;
 }
 }
-}
+*/
+}
-void CMMAVideoControl::StaticSetPropertyL(CMMAVideoControl* aControl,
-TInt aPropertyType,
+void CMMAVideoControl::StaticSetPropertyL(CMMAVideoControl* /*aControl*/,
-TInt aPropertyA,
+TInt /*aPropertyType*/,
-TInt aPropertyB)
+TInt /*aPropertyA*/,
-{
+TInt /*aPropertyB*/)
-LOG1( EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticSetPropertyL property type %d",
+{
-aPropertyType);
+//LOG1( EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticSetPropertyL property type %d",
-LOG1( EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticSetPropertyL a property %d",
+//          aPropertyType);
-aPropertyA);
+//LOG1( EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticSetPropertyL a property %d",
-LOG1( EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticSetPropertyL b property %d",
+//         aPropertyA);
-aPropertyB);
+// LOG1( EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticSetPropertyL b property %d",
+//          aPropertyB);
 // MMAPI UI 3.x req.
-// remove the below return; once  display is implemented in java
+// remove the below return and uncomment the below code; once  display is implemented in java
 return;
-MMMADisplay* display = aControl->iDisplay;
+/*
+MMMADisplay* display = aControl->iDisplay;
-__ASSERT_DEBUG(display != NULL,
-User::Panic(_L("display not initialized"), KErrNotReady));
+__ASSERT_DEBUG(display != NULL,
+User::Panic(_L("display not initialized"), KErrNotReady));
-switch (aPropertyType)
-{
+switch (aPropertyType)
-case com_nokia_microedition_media_control_VideoControl_SET_DISPLAY_SIZE:
+{
-{
+case com_nokia_microedition_media_control_VideoControl_SET_DISPLAY_SIZE:
-TSize displaySize(aPropertyA, aPropertyB);
+{
-display->SetDisplaySizeL(displaySize);
+TSize displaySize(aPropertyA, aPropertyB);
+display->SetDisplaySizeL(displaySize);
-// inform java side
-if (!display->IsFullScreen())
+// inform java side
-{
+if (!display->IsFullScreen())
-aControl->iGuiPlayer->NotifyWithStringEvent(
+{
-CMMAPlayerEvent::ESizeChanged, KControlName);
+aControl->iGuiPlayer->NotifyWithStringEvent(
-}
+CMMAPlayerEvent::ESizeChanged, KControlName);
-break;
+}
-}
+break;
-case com_nokia_microedition_media_control_VideoControl_SET_DISPLAY_LOCATION:
+}
-{
+case com_nokia_microedition_media_control_VideoControl_SET_DISPLAY_LOCATION:
-TPoint displayLocation(aPropertyA, aPropertyB);
+{
-display->SetDisplayLocationL(displayLocation);
+TPoint displayLocation(aPropertyA, aPropertyB);
-break;
+display->SetDisplayLocationL(displayLocation);
-}
+break;
-case com_nokia_microedition_media_control_VideoControl_SET_DISPLAY_VISIBLE_TRUE:
+}
-{
+case com_nokia_microedition_media_control_VideoControl_SET_DISPLAY_VISIBLE_TRUE:
-display->SetVisible(ETrue);
+{
-break;
+display->SetVisible(ETrue);
-}
+break;
-case com_nokia_microedition_media_control_VideoControl_SET_DISPLAY_VISIBLE_FALSE:
+}
-{
+case com_nokia_microedition_media_control_VideoControl_SET_DISPLAY_VISIBLE_FALSE:
-display->SetVisible(EFalse);
+{
-break;
+display->SetVisible(EFalse);
-}
+break;
-case com_nokia_microedition_media_control_VideoControl_SET_DISPLAY_FULLSCREEN_TRUE:
+}
-{
+case com_nokia_microedition_media_control_VideoControl_SET_DISPLAY_FULLSCREEN_TRUE:
-// store old user rect to determine if SIZE_CHANGED event
+{
-// has to be delivered when full screen mode is turned off.
+// store old user rect to determine if SIZE_CHANGED event
-aControl->iOldDisplaySize = display->DisplaySize();
+// has to be delivered when full screen mode is turned off.
+aControl->iOldDisplaySize = display->DisplaySize();
-display->SetFullScreenL(ETrue);
-break;
+display->SetFullScreenL(ETrue);
-}
+break;
-case com_nokia_microedition_media_control_VideoControl_SET_DISPLAY_FULLSCREEN_FALSE:
+}
-{
+case com_nokia_microedition_media_control_VideoControl_SET_DISPLAY_FULLSCREEN_FALSE:
-display->SetFullScreenL(EFalse);
+{
+display->SetFullScreenL(EFalse);
-// Send SIZE_CHANGED event when fullscreen is turned off if
-// size of the video display has changed. Possible position
+// Send SIZE_CHANGED event when fullscreen is turned off if
-// change is however disregarded
+// size of the video display has changed. Possible position
-if (aControl->iOldDisplaySize != display->DisplaySize())
+// change is however disregarded
-{
+if (aControl->iOldDisplaySize != display->DisplaySize())
-aControl->iGuiPlayer->NotifyWithStringEvent(
+{
-CMMAPlayerEvent::ESizeChanged, KControlName);
+aControl->iGuiPlayer->NotifyWithStringEvent(
-}
+CMMAPlayerEvent::ESizeChanged, KControlName);
+}
-break;
-}
+break;
-default:
+}
-{
+default:
-User::Leave(KErrNotFound);
+{
-break;
+User::Leave(KErrNotFound);
-}
+break;
 }
+}
+*/
 }
 void CMMAVideoControl::TakeSnapShotL(CMMAVideoControl* aControl,
 const TDesC* aProperties)
 aControl->iSnapshot->TakeSnapShotL(*aProperties);
 }
 EXPORT_C void CMMAVideoControl::SnapshotReady()
 {
-LOG( EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::SnapshotReady()");
+LOG(EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::SnapshotReady()");
 // now this class owns the buffer
 HBufC8* imageBuffer = iSnapshot->ImageBuffer();
 // Use standard new to avoid useless trap.
 CMMASnapshotEvent* event =
 {
 return KControlName;
 }
 TBool CMMAVideoControl::IsForeground()
 {
-LOG1( EJavaMMAPI, EInfo, "CMMAVideoControl::IsForeground() %d",iIsForeground);
+LOG1(EJavaMMAPI, EInfo, "CMMAVideoControl::IsForeground() %d",iIsForeground);
 return iIsForeground;
 }
 void CMMAVideoControl::StaticSetForegroundL(CMMAVideoControl* aControl,
 TInt aForeground)
 {
-LOG1( EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticSetForegroundL + aForeground %d",
+LOG1(EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticSetForegroundL + aForeground %d",
 aForeground);
 __ASSERT_DEBUG(
 aControl,
 User::Panic(_L("MMA::CMMAVideoControl::StaticSetForegroundL : CMMAVideoControl is NULL"),
 KErrArgument)
 if (aControl)
 {
 aControl->SetForeground(aForeground, EFalse);
 }
-LOG( EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticSetForegroundL - ");
+LOG(EJavaMMAPI, EInfo, "MMA::CMMAVideoControl::StaticSetForegroundL - ");
 }
 /*   // 3.x QT based UI
 // Implement MMIDEnvObserver

changeset 26	dc7c549001d5
parent 23	98ccebc37403
child 47	f40128debb5d
child 49	35baca0e7a2e