diff -r 36d7ded3ca23 -r 01f0bb65bcf1 mmsharing/livecommsui/lcui/src/lcview.cpp --- a/mmsharing/livecommsui/lcui/src/lcview.cpp Wed Aug 18 09:46:00 2010 +0300 +++ b/mmsharing/livecommsui/lcui/src/lcview.cpp Thu Sep 02 20:23:40 2010 +0300 @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include @@ -74,9 +74,9 @@ mEffectHandler(0), mItemContextMenu(0), mIsOptionMenuOpen(false), - mDialpad(0), + mDialpad(0), + mDialpadVtKeyHandler(0), timerId(0), - mDialpadVtKeyHandler(0), isViewReady(0) { LC_QDEBUG( "livecomms [UI] -> LcView::LcView()" ) @@ -215,6 +215,10 @@ SLOT( updateVideoRects() ), Qt::QueuedConnection ); } + //Subscribe to the Volume Change Events. + connect( &mEngine, SIGNAL(volumeChanged(int)), + this, SLOT(updateVolumeSlider(int)) ); + LC_QDEBUG( "livecomms [UI] <- LcView::init()" ) } @@ -291,10 +295,9 @@ // void LcView::activated() { - LC_QDEBUG( "livecomms [UI] -> LcView::activated()" ) + LC_QDEBUG( "livecomms [UI] -> LcView::activated()" ) + updateVideoRects(); - - //synchronize with engine if ( mEngine.mainCamera() ) { setCameraActionToSecondary(); @@ -313,7 +316,13 @@ } else { setSpeakerActionToSpeaker(); } - + + if( mEngine.isLocalPlayerPlaying() ){ + setCameraActionToDisable(); + } else { + setCameraActionToEnable(); + } + if ( mChangeCameraAction ) { connect( &mEngine, SIGNAL(cameraChangedToMain()), @@ -375,6 +384,14 @@ mEffectHandler, SLOT(showSendWindow()) ); connect( &mEngine, SIGNAL(localPlayerPaused()), mEffectHandler, SLOT(hideSendWindow()) ); + connect( &mEngine, SIGNAL(localPlayerPlaying()), + this, SLOT(setCameraActionToDisable())); + connect( &mEngine, SIGNAL(localPlayerPaused()), + this, SLOT(setCameraActionToEnable())); + connect( &mEngine, SIGNAL(localPlayerUnavailable()), + this, SLOT(setCameraActionToEnable())); + connect( &mEngine, SIGNAL(localPlayerPlaying()), + this, SLOT(updateVideoRects())); } if ( mReceivedVideoWidget ) { @@ -382,6 +399,8 @@ mEffectHandler, SLOT(showReceiveWindow()) ); connect( &mEngine, SIGNAL(remotePlayerPaused()), mEffectHandler, SLOT(hideReceiveWindow()) ); + connect( &mEngine, SIGNAL(remotePlayerPlaying()), + this, SLOT(updateVideoRects()) ); } mEngine.setCurrentView(this); @@ -1037,4 +1056,19 @@ LC_QDEBUG_2("livecomms [UI] - LcView::isPositioned(),",isViewReady) return isViewReady; } + + +// ----------------------------------------------------------------------------- +// LcView::updateVolumeSlider +// ----------------------------------------------------------------------------- +// +void LcView::updateVolumeSlider( int aVolumeLevel ) +{ + LC_QDEBUG("livecomms [UI] -> LcView::updateVolumeSlider()") + //TBD: Show volume slider, with update volume level + LC_QDEBUG_2("Volume Level Is,",aVolumeLevel) + LC_QDEBUG("livecomms [UI] <- LcView::updateVolumeSlider()") +} + + // End of file