diff -r 69946d1824c4 -r b9e04db066d4 videoplayerapp/videoplayerengine/src/mpxvideoplayerappuiengine.cpp --- a/videoplayerapp/videoplayerengine/src/mpxvideoplayerappuiengine.cpp Mon May 03 12:32:50 2010 +0300 +++ b/videoplayerapp/videoplayerengine/src/mpxvideoplayerappuiengine.cpp Fri May 14 15:53:50 2010 +0300 @@ -15,7 +15,7 @@ * */ -// Version : %version: 7 % +// Version : %version: ou1cpsw#8 % @@ -97,8 +97,11 @@ void CMpxVideoPlayerAppUiEngine::LateInitL() { CreatePlaybackUtilityL(); - - iRecognizer = CMediaRecognizer::NewL(); + + if ( ! iRecognizer ) + { + iRecognizer = CMediaRecognizer::NewL(); + } } // ------------------------------------------------------------------------------------------------- @@ -209,6 +212,8 @@ TFileName filename; aFile.FullName(filename); + + LateInitL(); CMediaRecognizer::TMediaType mediaType = iRecognizer->IdentifyMediaTypeL( filename, aFile ); @@ -241,6 +246,8 @@ MPX_ENTER_EXIT(_L("CMpxVideoPlayerAppUiEngine::OpenFileL()"), _L("aFileName = %S"), &aFileName); + LateInitL(); + CMediaRecognizer::TMediaType mediaType = iRecognizer->IdentifyMediaTypeL(aFileName); if ( mediaType == CMediaRecognizer::ELocalVideoFile ) @@ -299,7 +306,9 @@ CleanupStack::PushL( playList ); playList->SetSingleItemPlaylist(); playList->SetToFirst(); - + + LateInitL(); + iPlaybackUtility->InitL( *playList, ETrue ); CleanupStack::PopAndDestroy( playList ); @@ -479,12 +488,14 @@ //OpenMediaL( aMedia ); // Initialize and initiate playback of a single video + LateInitL(); + TPtrC mediaFile( aMedia.ValueText( KMPXMediaGeneralUri ) ); CMediaRecognizer::TMediaType mediaType = iRecognizer->IdentifyMediaTypeL(mediaFile); if ( mediaType == CMediaRecognizer::ELocalRamFile || mediaType == CMediaRecognizer::ELocalAsxFile ) - { + { HandleMultiLinksFileL( mediaFile, mediaType ); } else