diff -r c8b9b0986973 -r 23553eb4e470 profilesservices/RingingTone3DPlugin/src/CRingingTone3DPlugin.cpp --- a/profilesservices/RingingTone3DPlugin/src/CRingingTone3DPlugin.cpp Fri Mar 12 15:43:47 2010 +0200 +++ b/profilesservices/RingingTone3DPlugin/src/CRingingTone3DPlugin.cpp Mon Mar 15 12:41:46 2010 +0200 @@ -217,7 +217,7 @@ //FLOG( _L("CRingingTone3DPlugin::InitL END") ); } - +#ifdef RD_VIDEO_AS_RINGING_TONE // ----------------------------------------------------------------------------- // CRingingTone3DPlugin::Init // @@ -238,7 +238,7 @@ FLOG( _L("CRingingTone3DPlugin::InitL END") ); } - +#endif // ----------------------------------------------------------------------------- // CRingingTone3DPlugin::SetAttr (from C3DRingingToneInterface.h) @@ -327,12 +327,13 @@ Init( ( CDrmPlayerUtility* )aValue ); break; } +#ifdef RD_VIDEO_AS_RINGING_TONE case E3DRTIAttrVideoPlayerUtility: { Init( ( CVideoPlayerUtility* )aValue ); break; } - +#endif default: { break; @@ -859,11 +860,13 @@ ret = CEnvironmentalReverbUtility::NewL( *iDrmPlayerUtility ); break; } +#ifdef RD_VIDEO_AS_RINGING_TONE case EVideoPlayerUtility: { ret = CEnvironmentalReverbUtility::NewL( *iVideoPlayerUtility ); break; } +#endif default: { Panic(KErrArgument); @@ -901,11 +904,13 @@ ret = CSourceLocation::NewL( *iDrmPlayerUtility ); break; } +#ifdef RD_VIDEO_AS_RINGING_TONE case EVideoPlayerUtility: { ret = CSourceLocation::NewL( *iVideoPlayerUtility ); break; } +#endif default: { Panic(KErrArgument); @@ -943,11 +948,13 @@ ret = CListenerLocation::NewL( *iDrmPlayerUtility ); break; } +#ifdef RD_VIDEO_AS_RINGING_TONE case EVideoPlayerUtility: { ret = CListenerLocation::NewL( *iVideoPlayerUtility ); break; } +#endif default: { Panic(KErrArgument); @@ -986,11 +993,13 @@ ret = CSourceDoppler::NewL( *iDrmPlayerUtility ); break; } +#ifdef RD_VIDEO_AS_RINGING_TONE case EVideoPlayerUtility: { ret = CSourceDoppler::NewL( *iVideoPlayerUtility ); break; } +#endif default: { Panic(KErrArgument); @@ -1077,11 +1086,13 @@ iDrmPlayerUtility->Play(); break; } +#ifdef RD_VIDEO_AS_RINGING_TONE case EVideoPlayerUtility: { iVideoPlayerUtility->Play(); break; } +#endif default: { break; @@ -1120,11 +1131,13 @@ iDrmPlayerUtility->Stop(); break; } +#ifdef RD_VIDEO_AS_RINGING_TONE case EVideoPlayerUtility: { iVideoPlayerUtility->Stop(); break; } +#endif default: { Panic(KErrArgument);