accessoryservices/pluggeddisplay/pluggeddisplayengine/src/compositecablestateconnected.cpp
equal
deleted
inserted
replaced
78 if ( iCRWatchForTvSystem ) |
78 if ( iCRWatchForTvSystem ) |
79 { |
79 { |
80 iCRWatchForTvSystem->Cancel(); |
80 iCRWatchForTvSystem->Cancel(); |
81 delete iCRWatchForTvSystem; |
81 delete iCRWatchForTvSystem; |
82 } |
82 } |
|
83 if ( iCRWatchForVOverScan ) |
|
84 { |
|
85 iCRWatchForVOverScan->Cancel(); |
|
86 delete iCRWatchForVOverScan; |
|
87 } |
83 if ( iTVOutConfigForSettingChanges ) |
88 if ( iTVOutConfigForSettingChanges ) |
84 { |
89 { |
85 iTVOutConfigForSettingChanges->Cancel(); |
90 iTVOutConfigForSettingChanges->Cancel(); |
86 delete iTVOutConfigForSettingChanges; |
91 delete iTVOutConfigForSettingChanges; |
87 } |
92 } |
189 FUNC_LOG; |
194 FUNC_LOG; |
190 if ( KCRUidTvoutSettings == aRepositoryId ) |
195 if ( KCRUidTvoutSettings == aRepositoryId ) |
191 { |
196 { |
192 if ( ( KSettingsTvAspectRatio == aId ) || |
197 if ( ( KSettingsTvAspectRatio == aId ) || |
193 ( KSettingsTvoutFlickerFilter == aId ) || |
198 ( KSettingsTvoutFlickerFilter == aId ) || |
194 ( KSettingsTvSystemInfo == aId ) ) |
199 ( KSettingsTvSystemInfo == aId ) || |
|
200 ( KSettingsTvoutVerticalOverscan == aId) ) |
195 { |
201 { |
196 Input( EPDEIfCentralRepositoryWatch, EPDEIfCentralRepositoryWatchEventKeyChanged ); |
202 Input( EPDEIfCentralRepositoryWatch, EPDEIfCentralRepositoryWatchEventKeyChanged ); |
197 } |
203 } |
198 else |
204 else |
199 { |
205 { |
284 if ( !iCableDisconnectedWhileEnabling ) |
290 if ( !iCableDisconnectedWhileEnabling ) |
285 { |
291 { |
286 iCRWatchForFlickerFilter->Watch(); |
292 iCRWatchForFlickerFilter->Watch(); |
287 iCRWatchForAspectRatio->Watch(); |
293 iCRWatchForAspectRatio->Watch(); |
288 iCRWatchForTvSystem->Watch(); |
294 iCRWatchForTvSystem->Watch(); |
|
295 iCRWatchForVOverScan->Watch(); |
289 iSubState = ESubStateEnabled; |
296 iSubState = ESubStateEnabled; |
290 } |
297 } |
291 else |
298 else |
292 { |
299 { |
293 iCableDisconnectedWhileEnabling = EFalse; |
300 iCableDisconnectedWhileEnabling = EFalse; |
341 { |
348 { |
342 INFO( "Event: EPDEIfAccessoryConnectionEventCableDisconnected" ); |
349 INFO( "Event: EPDEIfAccessoryConnectionEventCableDisconnected" ); |
343 iCRWatchForFlickerFilter->Cancel(); |
350 iCRWatchForFlickerFilter->Cancel(); |
344 iCRWatchForAspectRatio->Cancel(); |
351 iCRWatchForAspectRatio->Cancel(); |
345 iCRWatchForTvSystem->Cancel(); |
352 iCRWatchForTvSystem->Cancel(); |
|
353 iCRWatchForVOverScan->Cancel(); |
346 ClearAvailableTvOutConfig(); |
354 ClearAvailableTvOutConfig(); |
347 iTVOutConfigForComposite.Disable(); |
355 iTVOutConfigForComposite.Disable(); |
348 iSubState = ESubStateDisabling; |
356 iSubState = ESubStateDisabling; |
349 } |
357 } |
350 else |
358 else |
360 { |
368 { |
361 INFO( "Event: EPDEIfCentralRepositoryWatchEventKeyChanged" ); |
369 INFO( "Event: EPDEIfCentralRepositoryWatchEventKeyChanged" ); |
362 iCRWatchForFlickerFilter->Cancel(); |
370 iCRWatchForFlickerFilter->Cancel(); |
363 iCRWatchForAspectRatio->Cancel(); |
371 iCRWatchForAspectRatio->Cancel(); |
364 iCRWatchForTvSystem->Cancel(); |
372 iCRWatchForTvSystem->Cancel(); |
|
373 iCRWatchForVOverScan->Cancel(); |
365 ClearAvailableTvOutConfig(); |
374 ClearAvailableTvOutConfig(); |
366 iTVOutConfigForComposite.Disable(); |
|
367 iResettingInput = ETrue; |
375 iResettingInput = ETrue; |
368 Enter(); |
376 Enter(); |
369 } |
377 } |
370 else |
378 else |
371 { |
379 { |
580 if(iResettingInput) |
588 if(iResettingInput) |
581 { |
589 { |
582 iCRWatchForFlickerFilter->Cancel(); |
590 iCRWatchForFlickerFilter->Cancel(); |
583 iCRWatchForAspectRatio->Cancel(); |
591 iCRWatchForAspectRatio->Cancel(); |
584 iCRWatchForTvSystem->Cancel(); |
592 iCRWatchForTvSystem->Cancel(); |
|
593 iCRWatchForVOverScan->Cancel(); |
585 iResettingInput = EFalse; |
594 iResettingInput = EFalse; |
586 } |
595 } |
587 |
596 |
588 TransitStateIdle(); |
597 TransitStateIdle(); |
589 } |
598 } |
597 if(iResettingInput) |
606 if(iResettingInput) |
598 { |
607 { |
599 iCRWatchForFlickerFilter->Cancel(); |
608 iCRWatchForFlickerFilter->Cancel(); |
600 iCRWatchForAspectRatio->Cancel(); |
609 iCRWatchForAspectRatio->Cancel(); |
601 iCRWatchForTvSystem->Cancel(); |
610 iCRWatchForTvSystem->Cancel(); |
|
611 iCRWatchForVOverScan->Cancel(); |
602 iResettingInput = EFalse; |
612 iResettingInput = EFalse; |
603 } |
613 } |
604 |
614 |
605 TransitStateIdle(); |
615 TransitStateIdle(); |
606 } |
616 } |
763 } |
773 } |
764 |
774 |
765 iCRWatchForFlickerFilter->Cancel(); |
775 iCRWatchForFlickerFilter->Cancel(); |
766 iCRWatchForAspectRatio->Cancel(); |
776 iCRWatchForAspectRatio->Cancel(); |
767 iCRWatchForTvSystem->Cancel(); |
777 iCRWatchForTvSystem->Cancel(); |
|
778 iCRWatchForVOverScan->Cancel(); |
768 } |
779 } |
769 else if ( EIfTVOutConfigEventSetFailed == aEvent ) |
780 else if ( EIfTVOutConfigEventSetFailed == aEvent ) |
770 { |
781 { |
771 INFO( "Event: EIfTVOutConfigEventSetFailed" ); |
782 INFO( "Event: EIfTVOutConfigEventSetFailed" ); |
772 iCableDisconnectedWhileResetting = EFalse; |
783 iCableDisconnectedWhileResetting = EFalse; |
846 FUNC_LOG; |
857 FUNC_LOG; |
847 // Create Central Repository Watchers |
858 // Create Central Repository Watchers |
848 iCRWatchForAspectRatio = CCentralRepositoryWatch::NewL(*this, KCRUidTvoutSettings, KSettingsTvAspectRatio ); |
859 iCRWatchForAspectRatio = CCentralRepositoryWatch::NewL(*this, KCRUidTvoutSettings, KSettingsTvAspectRatio ); |
849 iCRWatchForFlickerFilter = CCentralRepositoryWatch::NewL(*this, KCRUidTvoutSettings, KSettingsTvoutFlickerFilter ); |
860 iCRWatchForFlickerFilter = CCentralRepositoryWatch::NewL(*this, KCRUidTvoutSettings, KSettingsTvoutFlickerFilter ); |
850 iCRWatchForTvSystem = CCentralRepositoryWatch::NewL(*this, KCRUidTvoutSettings, KSettingsTvSystemInfo ); |
861 iCRWatchForTvSystem = CCentralRepositoryWatch::NewL(*this, KCRUidTvoutSettings, KSettingsTvSystemInfo ); |
|
862 iCRWatchForVOverScan = CCentralRepositoryWatch::NewL(*this, KCRUidTvoutSettings, KSettingsTvoutVerticalOverscan ); |
851 iTVOutConfigForSettingChanges = CTVOutConfigForComposite::NewL(iCompositeCableStatusFSM); |
863 iTVOutConfigForSettingChanges = CTVOutConfigForComposite::NewL(iCompositeCableStatusFSM); |
852 iResettingInput = EFalse; |
864 iResettingInput = EFalse; |
853 } |
865 } |
854 |
866 |
855 |
867 |