--- a/mmsharing/mmshengine/src/musenglivesession.cpp Tue Feb 02 00:09:07 2010 +0200
+++ b/mmsharing/mmshengine/src/musenglivesession.cpp Fri Feb 19 22:48:06 2010 +0200
@@ -153,13 +153,13 @@
CMceCameraSource* camera = MusEngMceUtils::GetCameraL( *iSession );
- if ( aNewZoomFactor <= iCameraInfo.iMaxZoom )
+ if ( aNewZoomFactor < iCameraInfo.iMaxZoom )
{
MUS_LOG( "mus: [ENGINE] Optical zoom factor increased" )
camera->SetZoomFactorL( aNewZoomFactor );
}
- if ( aNewZoomFactor - iCameraInfo.iMaxZoom > 0 )
+ if ( aNewZoomFactor - iCameraInfo.iMaxZoom >= 0 )
{
camera->SetDigitalZoomFactorL( aNewZoomFactor - iCameraInfo.iMaxZoom );
MUS_LOG1( "mus: [ENGINE] Digital zoom factor increased to %d",
--- a/mmsharing/mmshengine/tsrc/ut_engine/inc/ut_musenglivesession.h Tue Feb 02 00:09:07 2010 +0200
+++ b/mmsharing/mmshengine/tsrc/ut_engine/inc/ut_musenglivesession.h Fri Feb 19 22:48:06 2010 +0200
@@ -65,6 +65,7 @@
void UT_NewLL();
void UT_CurrentZoomLL();
+ void UT_CMusEngLiveSession_SetZoomLL();
void UT_MaxZoomLL();
void UT_ZoomInLL();
void UT_ZoomOutLL();
--- a/mmsharing/mmshengine/tsrc/ut_engine/src/ut_musenglivesession.cpp Tue Feb 02 00:09:07 2010 +0200
+++ b/mmsharing/mmshengine/tsrc/ut_engine/src/ut_musenglivesession.cpp Fri Feb 19 22:48:06 2010 +0200
@@ -235,6 +235,25 @@
//
// -----------------------------------------------------------------------------
//
+void UT_CMusEngLiveSession::UT_CMusEngLiveSession_SetZoomLL()
+ {
+ TRAPD( error, iLiveSession->SetZoomL(2) );
+ MUS_TEST_FORWARD_ALLOC_FAILURE( error );
+ EUNIT_ASSERT( error == KErrNotReady );
+ ESTABLISH_OUT_SESSION( iLiveSession );
+ CMceCameraSource* camera =
+ MusEngMceUtils::GetCameraL( *(iLiveSession->iSession) );
+ EUNIT_ASSERT( camera->iZoomFactor == 1 );
+ EUNIT_ASSERT( camera->iDigitalZoomFactor == 0 );
+ TRAPD( err, iLiveSession->SetZoomL(0) );
+ EUNIT_ASSERT( err == KErrArgument );
+ iLiveSession->SetZoomL(2);
+ EUNIT_ASSERT( camera->iZoomFactor == 2 );
+ TRAPD( err1, iLiveSession->SetZoomL(14) );
+ EUNIT_ASSERT( err1 == KErrArgument );
+ iLiveSession->SetZoomL( 5 );
+ EUNIT_ASSERT( camera->iDigitalZoomFactor == 2 );
+ }
void UT_CMusEngLiveSession::UT_MaxZoomLL()
{
// Check that checking maximum zoom is not possible before invite
--- a/mmsharing/mmshshared/loc/mus.loc Tue Feb 02 00:09:07 2010 +0200
+++ b/mmsharing/mmshshared/loc/mus.loc Fri Feb 19 22:48:06 2010 +0200
@@ -699,6 +699,13 @@
#define qtn_msh_set_activation_off "Off"
// d:Text of a list item in video sharing settings view
+// d:Activation setting: on
+// l:list_set_graphic_pane_t1
+// r:3.2
+//
+#define qtn_msh_set_activation_on "On"
+
+// d:Text of a list item in video sharing settings view
// d:Capability auditory note setting title
// l:list_setting_pane_t1
// r:3.2
--- a/mmsharing/mmshui/inc/musuilevelindicator.h Tue Feb 02 00:09:07 2010 +0200
+++ b/mmsharing/mmshui/inc/musuilevelindicator.h Fri Feb 19 22:48:06 2010 +0200
@@ -96,6 +96,11 @@
*
*/
void SetIndicatorType( TMusUiIndicatorType aType );
+
+ /**
+ *
+ */
+ TMusUiIndicatorType GetIndicatorType();
private: // From CCoeControl
@@ -181,7 +186,7 @@
CMusUiActiveTimer* iDisableLevelTimer;
- TInt iIndicatorType;
+ TMusUiIndicatorType iIndicatorType;
CAknSlider* iSlider;
--- a/mmsharing/mmshui/inc/musuilivesharingcontroller.h Tue Feb 02 00:09:07 2010 +0200
+++ b/mmsharing/mmshui/inc/musuilivesharingcontroller.h Fri Feb 19 22:48:06 2010 +0200
@@ -110,8 +110,6 @@
TBool ToolbarZoomSelected();
TBool ToolbarBrightnessSelected();
-
- void ResetToolbarSelected();
private: // new functions:
--- a/mmsharing/mmshui/inc/musuilivesharingviewcontainer.h Tue Feb 02 00:09:07 2010 +0200
+++ b/mmsharing/mmshui/inc/musuilivesharingviewcontainer.h Fri Feb 19 22:48:06 2010 +0200
@@ -64,6 +64,8 @@
void SetZoomVisible( TBool aVisible );
void SetBrightnessVisible( TBool aVisible );
+
+ TMusUiIndicatorType GetIndicatorType();
private: // from base class CCoeControl
--- a/mmsharing/mmshui/src/musuilevelindicator.cpp Tue Feb 02 00:09:07 2010 +0200
+++ b/mmsharing/mmshui/src/musuilevelindicator.cpp Fri Feb 19 22:48:06 2010 +0200
@@ -330,7 +330,17 @@
iIndicatorType = aType;
}
-
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+TMusUiIndicatorType CMusUiLevelIndicator::GetIndicatorType()
+ {
+ return iIndicatorType;
+ }
+
+
// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
--- a/mmsharing/mmshui/src/musuilivesharingcontroller.cpp Tue Feb 02 00:09:07 2010 +0200
+++ b/mmsharing/mmshui/src/musuilivesharingcontroller.cpp Fri Feb 19 22:48:06 2010 +0200
@@ -383,10 +383,11 @@
{
iToolbarZoomSelected = ETrue;
iToolbarBrightnessSelected = EFalse;
- iLiveObserver.SetZoomVisible( iToolbarZoomSelected );
iLiveObserver.SetZoomValues( iSession->MinZoomL(),
iSession->MaxZoomL() );
iLiveObserver.SetZoomL( iSession->CurrentZoomL() );
+
+ iLiveObserver.SetZoomVisible( iToolbarZoomSelected );
break;
}
case EMusuiCmdViewMiddleSoftkeyOk:
@@ -420,10 +421,11 @@
{
iToolbarZoomSelected = EFalse;
iToolbarBrightnessSelected = ETrue;
- iLiveObserver.SetBrightnessVisible( iToolbarBrightnessSelected );
iLiveObserver.SetBrightnessValues( iSession->MinBrightnessL(),
iSession->MaxBrightnessL() );
iLiveObserver.SetBrightnessL( iSession->CurrentBrightnessL() );
+
+ iLiveObserver.SetBrightnessVisible( iToolbarBrightnessSelected );
break;
}
case EMusuiCmdViewBrightness:
@@ -627,17 +629,6 @@
//
// -----------------------------------------------------------------------------
//
-void CMusUiLiveSharingController::ResetToolbarSelected()
- {
- iToolbarZoomSelected = EFalse;
- iToolbarBrightnessSelected = EFalse;
- }
-
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-//
void CMusUiLiveSharingController::BrightnessL()
{
MUS_LOG( "mus: [MUSUI ] -> CMusUiLiveSharingController::BrightnessL" );
--- a/mmsharing/mmshui/src/musuilivesharingview.cpp Tue Feb 02 00:09:07 2010 +0200
+++ b/mmsharing/mmshui/src/musuilivesharingview.cpp Fri Feb 19 22:48:06 2010 +0200
@@ -757,15 +757,5 @@
Toolbar()->HideItem( EMusuiCmdToolbarZoom, aIsPaused, ETrue );
MUS_LOG( "mus: [MUSUI ] <- CMusUiLiveSharingView::HideToolbarCommandForPause");
}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-//
-void CMusUiLiveSharingView::ResetToolBarSelected()
- {
- MUS_LOG( "mus: [MUSUI ] -> CMusUiLiveSharingView::ResetToolBarSelected" );
- iController->ResetToolbarSelected();
- MUS_LOG( "mus: [MUSUI ] <- CMusUiLiveSharingView::ResetToolBarSelected" );
- }
+
// end of file
--- a/mmsharing/mmshui/src/musuilivesharingviewcontainer.cpp Tue Feb 02 00:09:07 2010 +0200
+++ b/mmsharing/mmshui/src/musuilivesharingviewcontainer.cpp Fri Feb 19 22:48:06 2010 +0200
@@ -146,6 +146,16 @@
// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+TMusUiIndicatorType CMusUiLiveSharingViewContainer::GetIndicatorType()
+ {
+ return iIndicator->GetIndicatorType();
+ }
+
+
+// -----------------------------------------------------------------------------
// Called by framework when to retrieve the no. of controls.
// -----------------------------------------------------------------------------
//
@@ -242,12 +252,7 @@
}
else
{
- // Tapping outside slider area means ending of zoom or brightness
- // adjustment
- SetZoomVisible( EFalse ); // This hides also the brightness slider
- CMusUiLiveSharingView* liveView =
- (CMusUiLiveSharingView*)this->MusUiView();
- liveView->ResetToolBarSelected();
+ MakeVisible( EFalse );
}
}
--- a/mmsharing/mmshui/src/musuisendview.cpp Tue Feb 02 00:09:07 2010 +0200
+++ b/mmsharing/mmshui/src/musuisendview.cpp Fri Feb 19 22:48:06 2010 +0200
@@ -62,7 +62,8 @@
MUS_LOG_TDESC( "mus: [MUSUI ] -> CMusUiSendView::ManualAddressEntryL: ",
aAddress );
- CAknAppUiBase::TAppUiOrientation aOrientation ;
+ CAknAppUiBase::TAppUiOrientation aOrientation
+ = CAknAppUiBase::EAppUiOrientationUnspecified;
TBuf<KMusSipAddressMaxLength> address( aAddress );
if ( SendController() && MusUiDialogUtil::ShowTextQueryDialogL(
--- a/mmsharing/mmshui/src/musuisendviewcontainer.cpp Tue Feb 02 00:09:07 2010 +0200
+++ b/mmsharing/mmshui/src/musuisendviewcontainer.cpp Fri Feb 19 22:48:06 2010 +0200
@@ -183,10 +183,6 @@
MakeVisible( aVisible );
- if ( !aVisible )
- {
- iView->LevelIndicatorDismissed();
- }
MUS_LOG( "mus: [MUSUI ] <- CMusUiSendViewContainer::SetLevelIndicatorVisibility" )
}
--- a/mmshplugins/mmshsettingsuiplugin/data/mussettingsuirsc.rss Tue Feb 02 00:09:07 2010 +0200
+++ b/mmshplugins/mmshsettingsuiplugin/data/mussettingsuirsc.rss Fri Feb 19 22:48:06 2010 +0200
@@ -12,7 +12,7 @@
* Contributors:
*
* Description: Resource file for MUSSettingsPlugin.
-* Version : %version: 18 % << Don't touch! Updated by Synergy at check-out.
+* Version : %version: be1sipx1#19 % << Don't touch! Updated by Synergy at check-out.
*
*/
@@ -285,11 +285,11 @@
{
LBUF
{
- txt = qtn_msh_set_note_on;
+ txt = qtn_msh_set_activation_on;
},
LBUF
{
- txt = qtn_msh_set_note_off;
+ txt = qtn_msh_set_activation_off;
}
};
}
--- a/mmshplugins/mmshsettingsuiplugin/src/mussettingspluginimplementationtable.cpp Tue Feb 02 00:09:07 2010 +0200
+++ b/mmshplugins/mmshsettingsuiplugin/src/mussettingspluginimplementationtable.cpp Fri Feb 19 22:48:06 2010 +0200
@@ -20,7 +20,7 @@
#include "mussettingsplugin.h"
#include <ecom/implementationproxy.h>
#include <e32std.h>
-
+#include "muslogger.h"
// ======== LOCAL FUNCTIONS ========
@@ -41,7 +41,7 @@
EXPORT_C const TImplementationProxy* ImplementationGroupProxy(
TInt& aTableCount )
{
- RDebug::Print(_L("[GSLog] ImplementationGroupProxy()" ));
+ MUS_LOG( "[GSLog] ImplementationGroupProxy()" );
aTableCount = sizeof(KGSVSSettingsPluginImplementationTable)
/ sizeof(TImplementationProxy);
return KGSVSSettingsPluginImplementationTable;