--- a/musichomescreen/mcpmusicplayer/src/mcpmusicplayer.cpp Thu Jan 07 12:45:53 2010 +0200
+++ b/musichomescreen/mcpmusicplayer/src/mcpmusicplayer.cpp Mon Jan 18 20:18:06 2010 +0200
@@ -655,6 +655,7 @@
case EMPlayerStatePlaying:
{
MPX_DEBUG1("CMCPMusicPlayer::DoUpdatePlayerStateL EMPlayerStatePlaying");
+ iMusicPlayerOpeningTimer->Cancel();
UpdateToolBarL(TBK::KSkeep_L|TBK::KPause|TBK::KSkeep_R);
break;
}
@@ -1275,31 +1276,12 @@
//
TInt CMCPMusicPlayer::MusicPlayerOpeningTimerCallback( TAny* aPtr )
{
- MPX_DEBUG1("CMCPMusicPlayer::MusicPlayerOpeningTimerCallback <---");
- RWsSession wsSession;
- TInt error = wsSession.Connect();
- if ( error != KErrNone )
- {
- return error;
- }
-
- TBool taskExists( EFalse );
- CAknTaskList* taskList( NULL );
- TRAPD( err, taskList = CAknTaskList::NewL( wsSession ) );
- if ( err == KErrNone )
+ MPX_DEBUG1("CMCPMusicPlayer::MusicPlayerOpeningTimerCallback <---");
+ if ( EMPlayerStatePlaying != static_cast<CMCPMusicPlayer*>(aPtr)->iEngine->PlayerState() )
{
- MPX_DEBUG2("CMCPMusicPlayer::MusicPlayerOpeningTimerCallback "
- "error = %d occur when creating CAknTaskList", err);
- TApaTask task = taskList->FindRootApp( TUid::Uid( KMusicPlayerAppUidAsTInt ) );
- delete taskList;
- taskExists = task.Exists();
- }
- wsSession.Close();
-
- if ( !taskExists )
- {
- MPX_DEBUG1("CMCPMusicPlayer::MusicPlayerOpeningTimerCallback Music Player not opened");
- //Reset the widget and menu, music player is not running
+ MPX_DEBUG1("CMCPMusicPlayer::MusicPlayerOpeningTimerCallback Music Player not Playing");
+ //Reset the widget and menu, music player is not running and playing.
+ static_cast<CMCPMusicPlayer*>(aPtr)->iActive = EFalse;
TRAP_IGNORE( static_cast<CMCPMusicPlayer*>(aPtr)->ResetL() );
}
static_cast<CMCPMusicPlayer*>(aPtr)->iMusicPlayerOpeningTimer->Cancel();