diff -r 55fa1ec415c6 -r 8f0df5c82986 videoplayback/videohelix/tsrc/ut_videohelixtest/src/videohelixtestbody.cpp --- a/videoplayback/videohelix/tsrc/ut_videohelixtest/src/videohelixtestbody.cpp Tue May 11 16:15:40 2010 +0300 +++ b/videoplayback/videohelix/tsrc/ut_videohelixtest/src/videohelixtestbody.cpp Tue May 25 12:44:54 2010 +0300 @@ -15,7 +15,7 @@ * */ -// Version : %version: 21 % +// Version : %version: 23 % // [INCLUDE FILES] - do not remove @@ -99,7 +99,6 @@ ENTRY( "ChangeAspectRatioL", CVHPPTestClass::ChangeAspectRatioL), ENTRY( "AlarmOn", CVHPPTestClass::AlarmOn), - ENTRY( "AlarmAutoResume", CVHPPTestClass::AlarmAutoResume), ENTRY( "PhoneCallRejected", CVHPPTestClass::PhoneCallRejected), ENTRY( "VoiceCallAccepted", CVHPPTestClass::VoiceCallAccepted), ENTRY( "VideoCallAccepted", CVHPPTestClass::VideoCallAccepted), @@ -1724,51 +1723,6 @@ } // ----------------------------------------------------------------------------- -// CVHPPTestClass::AlarmOnAndOff -// ----------------------------------------------------------------------------- -// -TInt -CVHPPTestClass::AlarmAutoResume( CStifItemParser& aItem ) -{ - MPX_ENTER_EXIT(_L("CVHPPTestClass::AlarmOnAndOff()")); - iLog->Log(_L("CVHPPTestClass::AlarmOnAndOff()")); - - TInt backgroundCmd = 0; - TInt err = 0;//aItem.GetNextInt( backgroundCmd ); - - err = AlarmOn(aItem); - - if ( err == KErrNone ) - { - err = aItem.GetNextInt( backgroundCmd ); - - //reset alarm - RProperty::Set( KPSUidCoreApplicationUIs, KLightsAlarmLightActive, ELightsNotBlinking ); - - if ( err == KErrNone ) - { - TCallbackEvent* event = new TCallbackEvent; - event->iError = 0; - event->iData = 0; - event->iEvent = EPPlaying; - AddExpectedEvent( event ); - - //auto resume if alarm off - CMPXCommand* cmdPlay = CMPXCommand::NewL(); - CleanupStack::PushL( cmdPlay ); - cmdPlay->SetTObjectValueL( KMPXCommandGeneralDoSync, ETrue ); - cmdPlay->SetTObjectValueL( KMPXCommandGeneralId, KMPXMediaIdVideoPlayback ); - cmdPlay->SetTObjectValueL( KMPXMediaVideoPlaybackCommand, backgroundCmd ); - cmdPlay->SetTObjectValueL( KMPXMediaVideoAppForeground, ETrue ); - iPlaybackPlugin->CommandL( *cmdPlay ); - CleanupStack::PopAndDestroy( cmdPlay ); - } - } - - return err; -} - -// ----------------------------------------------------------------------------- // CVHPPTestClass::PhoneCallRejected // ----------------------------------------------------------------------------- //