--- a/videoplayerapp/mpxvideoplayer/src/mpxvideoplayerappuiengine.cpp Tue Jan 26 12:00:59 2010 +0200
+++ b/videoplayerapp/mpxvideoplayer/src/mpxvideoplayerappuiengine.cpp Tue Feb 02 00:12:10 2010 +0200
@@ -15,7 +15,7 @@
*
*/
-// Version : %version: da1mmcf#58 %
+// Version : %version: da1mmcf#59 %
#include <eikon.hrh>
@@ -429,7 +429,7 @@
else if ( iRecognizer->IsValidStreamingPrefix( aFileName ) ||
mediaType == CMediaRecognizer::ELocalSdpFile )
{
- InitializeStreamingLinkL( aFileName );
+ InitializeStreamingLinkL( aFileName );
}
else
{
@@ -483,8 +483,8 @@
if ( iUpdateSeekInfo )
{
//
- // The plugin has been instantiated, update the media
- //
+ // The plugin has been instantiated, update the media
+ //
UpdatePbPluginMediaL();
iUpdateSeekInfo = EFalse;
}
@@ -524,7 +524,8 @@
if ( iPlaybackUtility )
{
- iPlaybackUtility->CommandL( EPbCmdClose );
+ ClosePlaybackPluginL();
+
MMPXPlayerManager& manager = iPlaybackUtility->PlayerManager();
TRAP_IGNORE( manager.ClearSelectPlayersL() );
}
@@ -770,7 +771,7 @@
}
else
{
- InitializeStreamingLinkL( link );
+ InitializeStreamingLinkL( link );
}
CleanupStack::PopAndDestroy(); // link
}
@@ -1272,7 +1273,7 @@
if ( aError == KErrNone )
{
- InitializePlaylistL( aPlaylist, EFalse );
+ InitializePlaylistL( aPlaylist, EFalse );
}
}
@@ -1477,13 +1478,13 @@
void CMpxVideoPlayerAppUiEngine::InitializeStreamingLinkL( const TDesC& aUri )
{
MPX_ENTER_EXIT(_L("CMpxVideoPlayerAppUiEngine::InitializeStreamingLinkL()"),
- _L("aUri = %S"), &aUri );
+ _L("aUri = %S"), &aUri );
SetAccessPointL();
- iPlaybackUtility->InitStreamingL( aUri,
- (TDesC8*)(&KDATATYPEVIDEOHELIX),
- iAccessPointId );
+ iPlaybackUtility->InitStreamingL( aUri,
+ (TDesC8*)(&KDATATYPEVIDEOHELIX),
+ iAccessPointId );
ActivatePlaybackViewL();
}
@@ -1495,9 +1496,9 @@
void CMpxVideoPlayerAppUiEngine::InitializeFileL( const TDesC& aFileName )
{
MPX_ENTER_EXIT(_L("CMpxVideoPlayerAppUiEngine::InitializeFileL()"),
- _L("aFileName = %S"), &aFileName );
+ _L("aFileName = %S"), &aFileName );
- iPlaybackUtility->InitL( aFileName );
+ iPlaybackUtility->InitL( aFileName );
ActivatePlaybackViewL();
}
@@ -1511,10 +1512,29 @@
{
MPX_ENTER_EXIT(_L("CMpxVideoPlayerAppUiEngine::InitializePlaylistL()"));
- iPlaybackUtility->InitL( aPlaylist, aPlay );
+ iPlaybackUtility->InitL( aPlaylist, aPlay );
ActivatePlaybackViewL();
}
+// -------------------------------------------------------------------------------------------------
+// CMpxVideoPlayerAppUiEngine::ClosePlaybackPluginL()
+// -------------------------------------------------------------------------------------------------
+//
+void CMpxVideoPlayerAppUiEngine::ClosePlaybackPluginL()
+{
+ MPX_ENTER_EXIT(_L("CMpxVideoPlayerAppUiEngine::ClosePlaybackPluginL"));
+
+ if ( iViewUtility->ActiveViewType() == TUid::Uid( KMpxPlaybackPluginTypeUid ) )
+ {
+ //
+ // The display window must be removed before closing the playback plugin
+ //
+ iAppUi->View()->HandleCommandL( EAknSoftkeyClose );
+ }
+
+ iPlaybackUtility->CommandL( EPbCmdClose );
+}
+
// EOF