diff -r 66ecddbca914 -r 4a5c47a50617 accessoryservices/pluggeddisplay/pluggeddisplayengine/src/compositecablestateconnected.cpp --- a/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/compositecablestateconnected.cpp Tue May 11 17:23:24 2010 +0300 +++ b/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/compositecablestateconnected.cpp Tue May 25 14:04:18 2010 +0300 @@ -80,6 +80,11 @@ iCRWatchForTvSystem->Cancel(); delete iCRWatchForTvSystem; } + if ( iCRWatchForVOverScan ) + { + iCRWatchForVOverScan->Cancel(); + delete iCRWatchForVOverScan; + } if ( iTVOutConfigForSettingChanges ) { iTVOutConfigForSettingChanges->Cancel(); @@ -191,7 +196,8 @@ { if ( ( KSettingsTvAspectRatio == aId ) || ( KSettingsTvoutFlickerFilter == aId ) || - ( KSettingsTvSystemInfo == aId ) ) + ( KSettingsTvSystemInfo == aId ) || + ( KSettingsTvoutVerticalOverscan == aId) ) { Input( EPDEIfCentralRepositoryWatch, EPDEIfCentralRepositoryWatchEventKeyChanged ); } @@ -286,6 +292,7 @@ iCRWatchForFlickerFilter->Watch(); iCRWatchForAspectRatio->Watch(); iCRWatchForTvSystem->Watch(); + iCRWatchForVOverScan->Watch(); iSubState = ESubStateEnabled; } else @@ -343,6 +350,7 @@ iCRWatchForFlickerFilter->Cancel(); iCRWatchForAspectRatio->Cancel(); iCRWatchForTvSystem->Cancel(); + iCRWatchForVOverScan->Cancel(); ClearAvailableTvOutConfig(); iTVOutConfigForComposite.Disable(); iSubState = ESubStateDisabling; @@ -362,8 +370,8 @@ iCRWatchForFlickerFilter->Cancel(); iCRWatchForAspectRatio->Cancel(); iCRWatchForTvSystem->Cancel(); + iCRWatchForVOverScan->Cancel(); ClearAvailableTvOutConfig(); - iTVOutConfigForComposite.Disable(); iResettingInput = ETrue; Enter(); } @@ -582,6 +590,7 @@ iCRWatchForFlickerFilter->Cancel(); iCRWatchForAspectRatio->Cancel(); iCRWatchForTvSystem->Cancel(); + iCRWatchForVOverScan->Cancel(); iResettingInput = EFalse; } @@ -599,6 +608,7 @@ iCRWatchForFlickerFilter->Cancel(); iCRWatchForAspectRatio->Cancel(); iCRWatchForTvSystem->Cancel(); + iCRWatchForVOverScan->Cancel(); iResettingInput = EFalse; } @@ -765,6 +775,7 @@ iCRWatchForFlickerFilter->Cancel(); iCRWatchForAspectRatio->Cancel(); iCRWatchForTvSystem->Cancel(); + iCRWatchForVOverScan->Cancel(); } else if ( EIfTVOutConfigEventSetFailed == aEvent ) { @@ -848,6 +859,7 @@ iCRWatchForAspectRatio = CCentralRepositoryWatch::NewL(*this, KCRUidTvoutSettings, KSettingsTvAspectRatio ); iCRWatchForFlickerFilter = CCentralRepositoryWatch::NewL(*this, KCRUidTvoutSettings, KSettingsTvoutFlickerFilter ); iCRWatchForTvSystem = CCentralRepositoryWatch::NewL(*this, KCRUidTvoutSettings, KSettingsTvSystemInfo ); + iCRWatchForVOverScan = CCentralRepositoryWatch::NewL(*this, KCRUidTvoutSettings, KSettingsTvoutVerticalOverscan ); iTVOutConfigForSettingChanges = CTVOutConfigForComposite::NewL(iCompositeCableStatusFSM); iResettingInput = EFalse; }