--- a/videoplayback/hbvideoplaybackview/viewsrc/mpxvideoviewwrapper.cpp Fri Apr 16 14:59:52 2010 +0300
+++ b/videoplayback/hbvideoplaybackview/viewsrc/mpxvideoviewwrapper.cpp Mon May 03 12:32:50 2010 +0300
@@ -15,7 +15,7 @@
*
*/
-// Version : %version: da1mmcf#24 %
+// Version : %version: da1mmcf#27 %
@@ -129,7 +129,6 @@
//
if ( iDisplayHandler )
{
- iDisplayHandler->RemoveDisplayWindow();
delete iDisplayHandler;
iDisplayHandler = NULL;
}
@@ -237,17 +236,6 @@
{
MPX_DEBUG(_L("CMPXVideoViewWrapper::HandleCommandL() EMPXPbvCmdClose"));
- //
- // The display window must be removed before closing the playback plugin
- //
- if ( iDisplayHandler )
- {
- //
- // Remove the display window so the surface can be released
- //
- iDisplayHandler->RemoveDisplayWindow();
- }
-
CreateGeneralPlaybackCommandL( EPbCmdClose );
break;
}
@@ -473,17 +461,12 @@
{
HandleVideoPlaybackMessage( aMessage );
}
- else if ( KMPXMediaIdVideoDisplaySyncMessage == id )
+ else if ( KMPXMediaIdVideoDisplayMessage == id )
{
if ( iDisplayHandler )
{
iDisplayHandler->HandleVideoDisplayMessageL( aMessage );
}
-
- //
- // Signal Sync Message handling is complete
- //
- iPlaybackUtility->CommandL( EPbCmdSyncMsgComplete );
}
}
@@ -656,11 +639,6 @@
}
case EPbStateStopped:
{
- if ( iPlaylistView && iDisplayHandler )
- {
- iDisplayHandler->RemoveDisplayWindow();
- }
-
if ( iFileDetails->mMultiItemPlaylist )
{
iView->handleStoppedState();
@@ -929,6 +907,23 @@
const QString qKeywords( (QChar*)keywords.Ptr(), keywords.Length() );
iFileDetails->mKeywords = qKeywords;
}
+
+ //
+ // Creation date/time
+ //
+ if ( aMedia.IsSupported( KMPXMediaVideoCreated ) )
+ {
+ iFileDetails->mCreationTime = aMedia.ValueTObjectL<TInt>( KMPXMediaVideoCreated );
+ }
+
+ //
+ // Last Modified date/time
+ //
+ if ( aMedia.IsSupported( KMPXMediaVideoLastModified ) )
+ {
+ iFileDetails->mModificationTime = aMedia.ValueTObjectL<TInt>( KMPXMediaVideoLastModified );
+ }
+
}
// -------------------------------------------------------------------------------------------------
@@ -1283,7 +1278,24 @@
//
iControlsController->handleEvent( EMPXControlCmdShowVolumeControls );
- iPlaybackUtility->CommandL( aCmd );
+ switch( aCmd )
+ {
+ case EPbCmdDecreaseVolume:
+ {
+ CreateVideoSpecificCmdL( EPbCmdHandleDecreaseVolume );
+ break;
+ }
+ case EPbCmdIncreaseVolume:
+ {
+ CreateVideoSpecificCmdL( EPbCmdHandleIncreaseVolume );
+ break;
+ }
+ default:
+ {
+ iPlaybackUtility->CommandL( aCmd );
+ break;
+ }
+ }
}
// -------------------------------------------------------------------------------------------------
@@ -1417,11 +1429,11 @@
if ( iFileDetails )
{
- MPX_DEBUG(_L("CMPXVideoViewWrapper::IsMultiItemPlaylist(%d)"),
- iFileDetails->mMultiItemPlaylist );
multiLinks = iFileDetails->mMultiItemPlaylist;
}
+ MPX_DEBUG(_L("CMPXVideoViewWrapper::IsMultiItemPlaylist() ret %d"), multiLinks );
+
return multiLinks;
}