--- a/mmsharing/mmshavailability/src/musavainviteresponder.cpp Wed Sep 15 12:09:15 2010 +0300
+++ b/mmsharing/mmshavailability/src/musavainviteresponder.cpp Wed Oct 13 14:28:06 2010 +0300
@@ -20,7 +20,6 @@
#include "musavainviteresponder.h"
#include "musavainviteresponderobserver.h"
#include "muslogger.h"
-#include "mussettings.h"
#include <e32cmn.h>
#include <sipresponseelements.h>
@@ -111,16 +110,8 @@
SendResponseL( KMUSAVA486, KMusAvaStatusBusy );
}
else
- {
- if ( MultimediaSharingSettings::OperatorVariantSettingL() ==
- MusSettingsKeys::EOperatorSpecific )
- {
- SendResponseL( KMUSAVA486, KMusAvaStatusBusy );
- }
- else
- {
- SendResponseL( KMUSAVA603, KMusAvaStatusDecline );
- }
+ {
+ SendResponseL( KMUSAVA603, KMusAvaStatusDecline );
}
}
--- a/mmsharing/mmshavailability/tsrc/ut_availability/src/UT_CMusAvaInviteResponder.cpp Wed Sep 15 12:09:15 2010 +0300
+++ b/mmsharing/mmshavailability/tsrc/ut_availability/src/UT_CMusAvaInviteResponder.cpp Wed Oct 13 14:28:06 2010 +0300
@@ -25,7 +25,6 @@
#include "muslogger.h"
#include "CSipSseTestTls.h"
#include "musavacapabilitytesthelper.h" //remove compilation warning
-#include "mussettings.h"
// EXTERNAL INCLUDES
#include <digia/eunit/eunitmacros.h>
@@ -119,15 +118,7 @@
iResponderObserverImp->iApplicationState = MMusAvaSettingsObserver::EApplicationStateNotDefined;
iInviteResponder->iTransaction->iIsClientTransaction = EFalse;
iInviteResponder->AnswerL();
- if ( MultimediaSharingSettings::OperatorVariantSettingL() ==
- MusSettingsKeys::EOperatorSpecific )
- {
- EUNIT_ASSERT( iInviteResponder->iTransaction->iResponseElements->StatusCode() == 486 );
- }
- else
- {
- EUNIT_ASSERT( iInviteResponder->iTransaction->iResponseElements->StatusCode() == 603 );
- }
+ EUNIT_ASSERT( iInviteResponder->iTransaction->iResponseElements->StatusCode() == 603 );
}
void UT_CMusAvaInviteResponder::UT_CMusAvaInviteResponder_SendResponseLL()
--- a/mmsharing/mmshengine/src/musengclipsession.cpp Wed Sep 15 12:09:15 2010 +0300
+++ b/mmsharing/mmshengine/src/musengclipsession.cpp Wed Oct 13 14:28:06 2010 +0300
@@ -1105,13 +1105,11 @@
position.Int64(),
duration.Int64() )
- isRewindFromEnd =
+ TRAP( error, isRewindFromEnd =
( position.Int64() != 0 &&
- position.Int64() == duration.Int64() &&
!filesource->IsEnabled() &&
videoOut->State() == CMceMediaStream::EDisabled &&
- !iPause );
-
+ !iPause ) )
if( isRewindFromEnd )
{
MUS_LOG( "mus: [ENGINE] Rewind from end of clip" )
--- a/mmsharing/mmshengine/tsrc/ut_engine/src/ut_musengclipsession.cpp Wed Sep 15 12:09:15 2010 +0300
+++ b/mmsharing/mmshengine/tsrc/ut_engine/src/ut_musengclipsession.cpp Wed Oct 13 14:28:06 2010 +0300
@@ -1587,24 +1587,18 @@
// Disapling stream
videoOut->iState = CMceMediaStream::EDisabled;
- EUNIT_ASSERT( !iClipSession->IsRewindFromEnd() )
+ EUNIT_ASSERT( iClipSession->IsRewindFromEnd() )
iClipSession->iPause = ETrue;
EUNIT_ASSERT( !iClipSession->IsRewindFromEnd() )
iClipSession->iPause = EFalse;
- EUNIT_ASSERT(!iClipSession->IsRewindFromEnd() )
-
+ EUNIT_ASSERT( iClipSession->IsRewindFromEnd() )
+
// and finaly try with "real" end of clip
(static_cast<CMceFileSource*> (videoOut->Source()))->iPosition = 0;
(static_cast<CMceFileSource*> (videoOut->Source()))->iDuration = 111;
- EUNIT_ASSERT( !iClipSession->IsRewindFromEnd() )
-
- (static_cast<CMceFileSource*> (videoOut->Source()))->iPosition = 111;
- (static_cast<CMceFileSource*> (videoOut->Source()))->iDuration = 111;
- EUNIT_ASSERT( iClipSession->IsRewindFromEnd() )
-
- videoOut->iState = CMceMediaStream::EIdle;
+
EUNIT_ASSERT( !iClipSession->IsRewindFromEnd() )
}
--- a/mmsharing/mmshengine/tsrc/ut_engine/src/ut_musengsession.cpp Wed Sep 15 12:09:15 2010 +0300
+++ b/mmsharing/mmshengine/tsrc/ut_engine/src/ut_musengsession.cpp Wed Oct 13 14:28:06 2010 +0300
@@ -200,7 +200,7 @@
EUNIT_ASSERT( iLiveSession->AudioRoutingCanBeChanged() );
iLiveSession->iTelephoneUtils->iTelephonyAudioRouting->iCurrentOutput =
- CTelephonyAudioRouting::ETTY;
+ CTelephonyAudioRouting::EWiredAudioAccessory;
EUNIT_ASSERT( !iLiveSession->AudioRoutingCanBeChanged() );
}
--- a/mmsharing/mmshengine/tsrc/ut_engine/src/ut_musengtelephoneutils.cpp Wed Sep 15 12:09:15 2010 +0300
+++ b/mmsharing/mmshengine/tsrc/ut_engine/src/ut_musengtelephoneutils.cpp Wed Oct 13 14:28:06 2010 +0300
@@ -151,7 +151,7 @@
iTelephoneUtils->iTelephonyAudioRouting->iCurrentOutput =
CTelephonyAudioRouting::EWiredAudioAccessory;
- EUNIT_ASSERT( iTelephoneUtils->AudioRoutingCanBeChanged() );
+ EUNIT_ASSERT( !iTelephoneUtils->AudioRoutingCanBeChanged() );
iTelephoneUtils->iTelephonyAudioRouting->iCurrentOutput =
CTelephonyAudioRouting::EBTAudioAccessory;
@@ -248,10 +248,10 @@
iTelephoneUtils->iTelephonyAudioRouting->iCurrentOutput =
CTelephonyAudioRouting::EWiredAudioAccessory;
- // Try to set loudspeaker on, succeed
+ // Try to set loudspeaker on, fails because current set is not handset
iTelephoneUtils->LoudspeakerL( ETrue, ETrue );
EUNIT_ASSERT( iTelephoneUtils->iTelephonyAudioRouting->iCurrentOutput ==
- CTelephonyAudioRouting::ELoudspeaker );
+ CTelephonyAudioRouting::EWiredAudioAccessory );
// Change conditions
iTelephoneUtils->iTelephonyAudioRouting->iCurrentOutput =
--- a/mmsharing/mmshui/data/musui.rss Wed Sep 15 12:09:15 2010 +0300
+++ b/mmsharing/mmshui/data/musui.rss Wed Oct 13 14:28:06 2010 +0300
@@ -969,17 +969,6 @@
};
};
},
-
- //****************************************************************** //
- TBAR_CTRL
- {
- type = EAknCtButton;
- id = EMusuiCmdToolbarBlank;
- control = AVKON_BUTTON
- {
- flags = KAknButtonSizeFitText;
- };
- },
// ****************************************************************** //
--- a/mmsharing/mmshui/inc/musui.hrh Wed Sep 15 12:09:15 2010 +0300
+++ b/mmsharing/mmshui/inc/musui.hrh Wed Oct 13 14:28:06 2010 +0300
@@ -71,7 +71,6 @@
EMusuiCmdToolbarBrightness,
EMusuiCmdToolbarMute,
EMusuiCmdToolbarUnmute,
- EMusuiCmdToolbarBlank,
EMusuiCmdToolbarSpeakerOff,
EMusuiCmdToolbarSpeakerOn,
EMusuiCmdToolbarGallery,
--- a/mmsharing/mmshui/inc/musuiappui.h Wed Sep 15 12:09:15 2010 +0300
+++ b/mmsharing/mmshui/inc/musuiappui.h Wed Oct 13 14:28:06 2010 +0300
@@ -127,10 +127,6 @@
virtual TInt GetUiVolumeValue();
virtual CMusUiResourceHandler* ResourceHandler();
-
- void SetExitingFlag();
-
- TBool IsExiting();
private: // from base class CEikAppUi
@@ -202,8 +198,6 @@
CMusUiResourceHandler* iResourceHandler;
- TBool iExiting;
-
};
--- a/mmsharing/mmshui/inc/musuibackgroundviewcontainer.h Wed Sep 15 12:09:15 2010 +0300
+++ b/mmsharing/mmshui/inc/musuibackgroundviewcontainer.h Wed Oct 13 14:28:06 2010 +0300
@@ -23,7 +23,6 @@
#include <coecntrl.h> // Control base class
class MAknsControlContext;
-class CMusUiEventController;
/**
* This class handles ordinal position two plain window.
@@ -70,11 +69,6 @@
*/
void UpdateOrdinalPositionValue( TBool aUp );
- /**
- * Sets the event controller
- */
- void SetUiEventController( CMusUiEventController* aController );
-
private: // Construction
CMusUiBackgroundViewContainer( TInt aOrdinalPosition );
@@ -87,14 +81,6 @@
* From CoeControl,SizeChanged.
*/
void SizeChanged();
-
- /**
- * Handles a change to the application's resources which are shared
- * across the environment.
- *
- * @param aType The type of resources that have changed.
- */
- void HandleResourceChange( TInt aType );
/**
* Returns the number of control contained by this class.
@@ -160,11 +146,6 @@
*/
TInt iOrdinalPosition;
- /**
- * Event controller
- */
- CMusUiEventController* iController;
-
};
--- a/mmsharing/mmshui/inc/musuieventobserver.h Wed Sep 15 12:09:15 2010 +0300
+++ b/mmsharing/mmshui/inc/musuieventobserver.h Wed Oct 13 14:28:06 2010 +0300
@@ -70,8 +70,6 @@
virtual TInt GetUiVolumeValue() = 0;
virtual CMusUiResourceHandler* ResourceHandler() = 0;
-
- virtual void SetExitingFlag() = 0;
};
#endif // MUSUIEVENTOBSERVER_H
--- a/mmsharing/mmshui/inc/musuilivesharingcontroller.h Wed Sep 15 12:09:15 2010 +0300
+++ b/mmsharing/mmshui/inc/musuilivesharingcontroller.h Wed Oct 13 14:28:06 2010 +0300
@@ -105,6 +105,11 @@
* or menu
*/
TBool BrightnessSelected();
+
+ /**
+ * Reset brightness and zoom selected value
+ */
+ void ResetSelectedFlags();
void LevelIndicatorDismissed();
TBool ToolbarZoomSelected();
--- a/mmsharing/mmshui/src/musuiappui.cpp Wed Sep 15 12:09:15 2010 +0300
+++ b/mmsharing/mmshui/src/musuiappui.cpp Wed Oct 13 14:28:06 2010 +0300
@@ -52,8 +52,7 @@
void CMusUiAppUi::ConstructL()
{
MUS_LOG( "mus: [MUSUI ] -> CMusUiAppUi::ConstructL" );
- BaseConstructL( EAknEnableSkin | EAppOrientationAutomatic | EAknEnableMSK
- | EAknSingleClickCompatible );
+ BaseConstructL( EAknEnableSkin | EAppOrientationAutomatic | EAknEnableMSK );
iResourceHandler = CMusUiResourceHandler::NewL( *this );
MultimediaSharing::TMusUseCase usecase = MusUiStartController::ReadUseCaseL();
@@ -509,8 +508,6 @@
RemoveView( KMusUidClipSharingView );
RemoveView( KMusUidReceivingView );
- iExiting = EFalse;
-
User::Exit( KErrNone );
}
MUS_LOG( "mus: [MUSUI ] <- CMusUiAppUi::HandleExit" );
@@ -776,24 +773,4 @@
}
}
-
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-//
-void CMusUiAppUi::SetExitingFlag()
- {
- iExiting = ETrue;
- }
-
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-//
-TBool CMusUiAppUi::IsExiting ()
- {
- return iExiting;
- }
// end of file
--- a/mmsharing/mmshui/src/musuibackgroundviewcontainer.cpp Wed Sep 15 12:09:15 2010 +0300
+++ b/mmsharing/mmshui/src/musuibackgroundviewcontainer.cpp Wed Oct 13 14:28:06 2010 +0300
@@ -18,7 +18,6 @@
#include "musuibackgroundviewcontainer.h"
#include "musuiappui.h"
#include "muslogger.h" // debug logging
-#include "musuieventcontroller.h"
#include <AknsControlContext.h>
#include <AknsBasicBackgroundControlContext.h>
@@ -55,8 +54,7 @@
// -----------------------------------------------------------------------------
//
CMusUiBackgroundViewContainer::CMusUiBackgroundViewContainer(
- TInt aOrdinalPosition ) : iOrdinalPosition( aOrdinalPosition ),
- iController( NULL )
+ TInt aOrdinalPosition ) : iOrdinalPosition( aOrdinalPosition )
{
}
@@ -174,16 +172,6 @@
// -----------------------------------------------------------------------------
-// Sets the event controller
-// -----------------------------------------------------------------------------
-//
-void CMusUiBackgroundViewContainer::SetUiEventController( CMusUiEventController* aController )
- {
- iController = aController;
- }
-
-
-// -----------------------------------------------------------------------------
// Called by framework when the view size is changed
// -----------------------------------------------------------------------------
//
@@ -203,33 +191,6 @@
// -----------------------------------------------------------------------------
-// From base class CCoeControl. Handles a change to the application's
-// resources which are shared across the environment.
-// -----------------------------------------------------------------------------
-//
-void CMusUiBackgroundViewContainer::HandleResourceChange( TInt aType )
- {
- MUS_LOG( "mus: [MUSUI ] -> CMusUiBackgroundViewContainer::HandleResourceChange" );
- CCoeControl::HandleResourceChange( aType );
-
- TBool displayEnabled( EFalse );
- if ( iController )
- {
- TRAP_IGNORE( displayEnabled = iController->IsDisplayEnabledL() )
- }
-
- if ( aType == KEikDynamicLayoutVariantSwitch && !displayEnabled )
- {
- TRect mainPaneRect;
- AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane,
- mainPaneRect );
- SetRect( mainPaneRect );
- }
- MUS_LOG( "mus: [MUSUI ] <- CMusUiBackgroundViewContainer::HandleResourceChange" );
- }
-
-
-// -----------------------------------------------------------------------------
// Called by framework when to retrieve the no. of controls.
// -----------------------------------------------------------------------------
//
--- a/mmsharing/mmshui/src/musuiclipsharingcontroller.cpp Wed Sep 15 12:09:15 2010 +0300
+++ b/mmsharing/mmshui/src/musuiclipsharingcontroller.cpp Wed Oct 13 14:28:06 2010 +0300
@@ -596,6 +596,9 @@
{
iEventObserver.ShowNaviPaneIconL( EMusUiNaviIconForward );
iClipObserver.SetPositionValueL( iSession->PositionL().Int() );
+ iSharingObserver.ReplaceToolbarCommand( EMusuiCmdToolbarPause,
+ EMusuiCmdToolbarUnPause,
+ ETrue );
//iClipObserver.SetDurationVisible();
}
MUS_LOG( "mus: [MUSUI ] CMusUiClipSharingController::HandleCommandL: EMusuiCmdViewFastForward END" );
@@ -608,6 +611,9 @@
{
iEventObserver.ShowNaviPaneIconL( EMusUiNaviIconRew );
iClipObserver.SetPositionValueL( iSession->PositionL().Int() );
+ iSharingObserver.ReplaceToolbarCommand( EMusuiCmdToolbarPause,
+ EMusuiCmdToolbarUnPause,
+ ETrue );
//iClipObserver.SetDurationVisible();
}
MUS_LOG( "mus: [MUSUI ] CMusUiClipSharingController::HandleCommandL: EMusuiCmdViewFastReverse END" );
@@ -619,6 +625,9 @@
{
iEventObserver.ShowNaviPaneIconL( EMusUiNaviIconPause );
PauseL();
+ iSharingObserver.ReplaceToolbarCommand( EMusuiCmdToolbarUnPause,
+ EMusuiCmdToolbarPause,
+ ETrue );
}
break;
}
@@ -628,6 +637,9 @@
{
iEventObserver.ShowNaviPaneIconL( EMusUiNaviIconPause );
PauseL();
+ iSharingObserver.ReplaceToolbarCommand( EMusuiCmdToolbarUnPause,
+ EMusuiCmdToolbarPause,
+ ETrue );
}
break;
}
--- a/mmsharing/mmshui/src/musuiclipsharingview.cpp Wed Sep 15 12:09:15 2010 +0300
+++ b/mmsharing/mmshui/src/musuiclipsharingview.cpp Wed Oct 13 14:28:06 2010 +0300
@@ -29,7 +29,6 @@
#include "muslogger.h" // debug logging
#include <musui.rsg>
#include <musui.mbg>
-#include "musuidialogutil.h"
#include <aknViewAppUi.h>
#include <avkon.hrh>
@@ -305,8 +304,7 @@
!AknLayoutUtils::PenEnabled() )
{
aToolbar->SetFocusedItemL( EMusuiCmdToolbarPause );
- }
- Toolbar()->RemoveItem( EMusuiCmdToolbarBlank );
+ }
}
// Last generic base class functionality
@@ -331,11 +329,6 @@
}
else
{
- if ( SendController() && SendController()->IsAudioRoutingLoudSpeaker() )
- {
- MusUiDialogUtil::ShowGlobalInformationDialogL(
- R_MUS_NOTE_HF_DEACTIVATED );
- }
MusAppUi()->HandleExit();
}
MUS_LOG( "mus: [MUSUI ] <- CMusUiClipSharingView::RunFetchDialogL" );
@@ -630,7 +623,6 @@
*this,
videoRect );
}
- iBackgroundContainer->SetUiEventController( EventController() );
iContainer->SetController( iController );
--- a/mmsharing/mmshui/src/musuieventcontroller.cpp Wed Sep 15 12:09:15 2010 +0300
+++ b/mmsharing/mmshui/src/musuieventcontroller.cpp Wed Oct 13 14:28:06 2010 +0300
@@ -964,6 +964,8 @@
EngineSession()->VolumeUpL();
// Status pane update will be done later. When we get
// VolumeChanged() callback
+ iSharingObserver.ActivateVolumeControlL(
+ EngineSession()->VolumeL() );
break;
}
case EMusuiCmdViewVolumeDown:
@@ -973,6 +975,8 @@
EngineSession()->VolumeDownL();
// Status pane update will be done later. When we get
// VolumeChanged() callback
+ iSharingObserver.ActivateVolumeControlL(
+ EngineSession()->VolumeL() );
break;
}
case EMusuiCmdViewVolumeChanged:
--- a/mmsharing/mmshui/src/musuigeneralview.cpp Wed Sep 15 12:09:15 2010 +0300
+++ b/mmsharing/mmshui/src/musuigeneralview.cpp Wed Oct 13 14:28:06 2010 +0300
@@ -41,7 +41,7 @@
#include <AknIncallBubbleNotify.h>
#include <featmgr.h>
-const TInt KBackgroundIntervalForClose = 30 * 1000 * 1000; // 30s
+const TInt KBackgroundIntervalForClose = 10 * 1000 * 1000; // 10s
const TInt KMusFgBgEventFiltering = 200 * 1000; // 200 ms
// -----------------------------------------------------------------------------
@@ -234,12 +234,6 @@
ETrue,
ETrue );
- Toolbar()->HideItem( EventControllerL().IsMicMutedL() ?
- EMusuiCmdToolbarUnmute :
- EMusuiCmdToolbarMute,
- EFalse,
- ETrue );
-
TBool loudSpeakerEnabled( EventControllerL().IsLoudSpeakerEnabled() );
Toolbar()->HideItem( loudSpeakerEnabled ?
@@ -248,12 +242,18 @@
ETrue,
ETrue );
- Toolbar()->HideItem( loudSpeakerEnabled ?
- EMusuiCmdToolbarSpeakerOff :
- EMusuiCmdToolbarSpeakerOn,
- EFalse,
- ETrue );
-
+ // Dim audio routing button if audio routing cannot be changed
+ // or when some button is selected
+ TBool dimAudioRouting( iToolbarItemSelected ||
+ !EventControllerL().AudioRoutingCanBeChanged() );
+
+ Toolbar()->SetItemDimmed( loudSpeakerEnabled ?
+ EMusuiCmdToolbarSpeakerOff :
+ EMusuiCmdToolbarSpeakerOn,
+ dimAudioRouting,
+ ETrue );
+
+
MUS_LOG( "mus: [MUSUI ] <- CMusUiGeneralView::DynInitToolbarL" );
}
--- a/mmsharing/mmshui/src/musuilivesharingcontroller.cpp Wed Sep 15 12:09:15 2010 +0300
+++ b/mmsharing/mmshui/src/musuilivesharingcontroller.cpp Wed Oct 13 14:28:06 2010 +0300
@@ -629,6 +629,17 @@
//
// -----------------------------------------------------------------------------
//
+void CMusUiLiveSharingController::ResetSelectedFlags()
+ {
+ iToolbarZoomSelected = EFalse;
+ iToolbarBrightnessSelected = EFalse;
+ }
+
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
void CMusUiLiveSharingController::ZoomL()
{
MUS_LOG( "mus: [MUSUI ] -> CMusUiLiveSharingController::ZoomL" );
--- a/mmsharing/mmshui/src/musuilivesharingview.cpp Wed Sep 15 12:09:15 2010 +0300
+++ b/mmsharing/mmshui/src/musuilivesharingview.cpp Wed Oct 13 14:28:06 2010 +0300
@@ -130,11 +130,6 @@
CEikMenuPane* aMenuPane )
{
MUS_LOG( "mus: [MUSUI ] -> CMusUiLiveSharingView::DynInitMenuPaneL [%d]" );
- //if the mus is in exit procedure,we do nothing
- if ( MusAppUi()->IsExiting() )
- {
- return;
- }
SetZoomVisible(EFalse);
SetBrightnessVisible(EFalse);
// Base class initiated initialization first
@@ -228,6 +223,11 @@
aCommand );
__ASSERT_ALWAYS( iController, User::Leave( KErrNotReady ) );
+
+ if( !iContainer->IsVisible() )
+ {
+ iController->ResetSelectedFlags();
+ }
switch ( aCommand )
{
@@ -413,8 +413,7 @@
!AknLayoutUtils::PenEnabled() )
{
aToolbar->SetFocusedItemL( EMusuiCmdToolbarPauseLive );
- }
- Toolbar()->RemoveItem( EMusuiCmdToolbarBlank );
+ }
}
// Last generic base class functionality
@@ -705,7 +704,6 @@
videoRect );
iController->StartInvitationL();
}
- iBackgroundContainer->SetUiEventController( EventController() );
iContainer->SetController( iController );
--- a/mmsharing/mmshui/src/musuilivesharingviewcontainer.cpp Wed Sep 15 12:09:15 2010 +0300
+++ b/mmsharing/mmshui/src/musuilivesharingviewcontainer.cpp Wed Oct 13 14:28:06 2010 +0300
@@ -198,9 +198,13 @@
aKeyEvent.iScanCode );
TKeyResponse ret( EKeyWasNotConsumed );
+
+ if ( IsVisible() )
+ {
+ return ret;
+ }
- if ( MUS_NO_TOOLBAR )
- {
+
CMusUiLiveSharingView* view =
static_cast< CMusUiLiveSharingView* >( MusUiView() );
switch ( aKeyEvent.iCode )
@@ -231,7 +235,6 @@
}
default:
break;
- }
}
MUS_LOG( "mus: [MUSUI ] <- CMusUiLiveSharingViewContainer::OfferKeyEventL" );
--- a/mmsharing/mmshui/src/musuireceiveview.cpp Wed Sep 15 12:09:15 2010 +0300
+++ b/mmsharing/mmshui/src/musuireceiveview.cpp Wed Oct 13 14:28:06 2010 +0300
@@ -300,8 +300,6 @@
{
aToolbar->SetFocusedItemL( EMusuiCmdToolbarFullScreen );
}
-
- Toolbar()->RemoveItem( EMusuiCmdToolbarBlank );
// Last generic base class functionality
CMusUiGeneralView::DynInitToolbarL( aResourceId, aToolbar );
@@ -474,7 +472,6 @@
*this,
videoRect );
}
- iBackgroundContainer->SetUiEventController( EventController() );
MUS_LOG( "mus: [MUSUI ] <- CMusUiReceiveView::DoActivateL" );
}
--- a/mmsharing/mmshui/src/musuisendcontroller.cpp Wed Sep 15 12:09:15 2010 +0300
+++ b/mmsharing/mmshui/src/musuisendcontroller.cpp Wed Oct 13 14:28:06 2010 +0300
@@ -39,8 +39,6 @@
#include <pathinfo.h>
#include <CDirectoryLocalizer.h>
-_LIT16( KMusUSign, "%U" );
-
using namespace NMusSessionApi;
@@ -403,31 +401,9 @@
{
MUS_LOG( "mus: [MUSUI ] -> CMusUiSendController::SessionRejected" );
DismissWaitDialog();
-
- delete iDialogPrompt;
- iDialogPrompt = NULL;
-
- TRAP_IGNORE ( iDialogPrompt = StringLoader::LoadL(
- R_MUS_LIVE_SHARING_VIEW_NOTE_CONNECTION_REJECTED ) );
-
- if ( iDialogPrompt->Find( KMusUSign ) >= KErrNone )
- {
- delete iDialogPrompt;
- iDialogPrompt = NULL;
- TRAP_IGNORE ( iDialogPrompt = StringLoader::LoadL(
- R_MUS_LIVE_SHARING_VIEW_NOTE_CONNECTION_REJECTED,
- MusTelNumberValue() ) );
- }
- else
- {
- // NOP
- }
-
- if ( iDialogPrompt )
- {
- TRAP_IGNORE (
- MusUiDialogUtil::ShowInformationDialogL( *iDialogPrompt ) );
- }
+ TRAP_IGNORE (
+ MusUiDialogUtil::ShowInformationDialogL(
+ R_MUS_LIVE_SHARING_VIEW_NOTE_CONNECTION_REJECTED ) );
TRAP_IGNORE( iCallbackService->AsyncEventL( EMusUiAsyncHandleExit ) );
@@ -664,7 +640,7 @@
MUS_LOG( "mus: [MUSUI ] -> CMusUiSendController::ExitProcedureL" );
DismissWaitDialog();
- iEventObserver.SetExitingFlag();
+
switch ( iShutdownState )
{
case EMusUiShutdownStarted:
--- a/mmsharing/mmshui/src/musuisendviewcontainer.cpp Wed Sep 15 12:09:15 2010 +0300
+++ b/mmsharing/mmshui/src/musuisendviewcontainer.cpp Wed Oct 13 14:28:06 2010 +0300
@@ -191,6 +191,11 @@
MakeVisible( aVisible );
+ if( !aVisible )
+ {
+ MusUiView()->LevelIndicatorDismissed();
+ }
+
MUS_LOG( "mus: [MUSUI ] <- CMusUiSendViewContainer::SetLevelIndicatorVisibility" )
}
--- a/mmshplugins/mmshsettingsuiplugin/src/mussettingscontainer.cpp Wed Sep 15 12:09:15 2010 +0300
+++ b/mmshplugins/mmshsettingsuiplugin/src/mussettingscontainer.cpp Wed Oct 13 14:28:06 2010 +0300
@@ -12,7 +12,7 @@
* Contributors:
*
* Description: Container for MUSSettingsPlugin.
-* Version : %version: be1sipx1#22 % << Don't touch! Updated by Synergy at check-out.
+* Version : %version: 21 % << Don't touch! Updated by Synergy at check-out.
*
*/
@@ -88,7 +88,6 @@
delete iActivationItems;
delete iProfileItems;
delete iAutoRecordItems;
- delete iNoteItems;
delete iListboxItemArray;
MUS_LOG( "[MUSSET] <- CMusSettingsContainer::~CMusSettingsContainer()" )
}
@@ -118,9 +117,6 @@
iProfileItems = iCoeEnv->ReadDesC16ArrayResourceL(
R_SIP_PROFILE_SETTING_PAGE_LBX );
- iNoteItems = iCoeEnv->ReadDesC16ArrayResourceL(
- R_VS_AUDIO_SETTING_PAGE_LBX );
-
CreateListBoxItemsL();
// Operator variant mode needs some item should not be visible to user.
@@ -392,7 +388,7 @@
MusSettingsKeys::EAuditoryNotificationOff );
}
- AddItemL( KGSSettIdNote, ( *iNoteItems )[ auditoryNotification ] );
+ AddItemL( KGSSettIdNote, ( *iActivationItems )[ auditoryNotification ] );
MUS_LOG( "[MUSSET] <- CMusSettingsContainer::MakeNoteItemL()" )
}