--- a/videoplayback/videohelix/src/mpxvideoplaybackcontroller.cpp Wed Sep 15 12:15:24 2010 +0300
+++ b/videoplayback/videohelix/src/mpxvideoplaybackcontroller.cpp Wed Oct 13 14:34:36 2010 +0300
@@ -16,7 +16,7 @@
*/
-// Version : %version: 66 %
+// Version : %version: 64 %
//
@@ -167,9 +167,6 @@
iDrmHelper = CMpxVideoDrmHelper::NewL();
- iCallDetector = CMPXCallDetector::NewL( this );
- iCallDetector->RequestNotification();
-
iSavedPosition = 0;
iViewActivated = EFalse;
}
@@ -294,14 +291,6 @@
delete iSeekingState;
delete iStoppedState;
- if ( iCallDetector )
- {
- iCallDetector->Cancel();
-
- delete iCallDetector;
- iCallDetector = NULL;
- }
-
if ( iPlaybackMode )
{
delete iPlaybackMode;
@@ -930,7 +919,7 @@
// ------------------------------------------------------------------------------------------------
void CMPXVideoPlaybackController::SetMuteCenRepL( TBool aMute )
{
- if ( iFileDetails && iFileDetails->iAudioEnabled )
+ if ( iFileDetails && iFileDetails->iAudioEnabled && !iAccessoryMonitor->IsTvOutConnected() )
{
iMuteWatcher->SetValueL( aMute );
@@ -2562,13 +2551,4 @@
iPlaybackMode->HandleFrameReady(aError);
}
-
-void CMPXVideoPlaybackController::CallDetectedL()
-{
- MPX_ENTER_EXIT(_L("CMPXVideoPlaybackController::CallDetectedL"));
-
- // Pause playback
- DoHandleCommandL( EPbCmdPause );
-}
-
// End of file