--- a/mmsharing/mmshavailability/src/musavainviteresponder.cpp Tue Sep 14 21:13:00 2010 +0300
+++ b/mmsharing/mmshavailability/src/musavainviteresponder.cpp Wed Sep 15 12:09:15 2010 +0300
@@ -20,6 +20,7 @@
#include "musavainviteresponder.h"
#include "musavainviteresponderobserver.h"
#include "muslogger.h"
+#include "mussettings.h"
#include <e32cmn.h>
#include <sipresponseelements.h>
@@ -110,8 +111,16 @@
SendResponseL( KMUSAVA486, KMusAvaStatusBusy );
}
else
- {
- SendResponseL( KMUSAVA603, KMusAvaStatusDecline );
+ {
+ if ( MultimediaSharingSettings::OperatorVariantSettingL() ==
+ MusSettingsKeys::EOperatorSpecific )
+ {
+ SendResponseL( KMUSAVA486, KMusAvaStatusBusy );
+ }
+ else
+ {
+ SendResponseL( KMUSAVA603, KMusAvaStatusDecline );
+ }
}
}
--- a/mmsharing/mmshavailability/tsrc/ut_availability/src/UT_CMusAvaInviteResponder.cpp Tue Sep 14 21:13:00 2010 +0300
+++ b/mmsharing/mmshavailability/tsrc/ut_availability/src/UT_CMusAvaInviteResponder.cpp Wed Sep 15 12:09:15 2010 +0300
@@ -25,6 +25,7 @@
#include "muslogger.h"
#include "CSipSseTestTls.h"
#include "musavacapabilitytesthelper.h" //remove compilation warning
+#include "mussettings.h"
// EXTERNAL INCLUDES
#include <digia/eunit/eunitmacros.h>
@@ -118,7 +119,15 @@
iResponderObserverImp->iApplicationState = MMusAvaSettingsObserver::EApplicationStateNotDefined;
iInviteResponder->iTransaction->iIsClientTransaction = EFalse;
iInviteResponder->AnswerL();
- EUNIT_ASSERT( iInviteResponder->iTransaction->iResponseElements->StatusCode() == 603 );
+ if ( MultimediaSharingSettings::OperatorVariantSettingL() ==
+ MusSettingsKeys::EOperatorSpecific )
+ {
+ EUNIT_ASSERT( iInviteResponder->iTransaction->iResponseElements->StatusCode() == 486 );
+ }
+ else
+ {
+ EUNIT_ASSERT( iInviteResponder->iTransaction->iResponseElements->StatusCode() == 603 );
+ }
}
void UT_CMusAvaInviteResponder::UT_CMusAvaInviteResponder_SendResponseLL()
--- a/mmsharing/mmshengine/src/musengclipsession.cpp Tue Sep 14 21:13:00 2010 +0300
+++ b/mmsharing/mmshengine/src/musengclipsession.cpp Wed Sep 15 12:09:15 2010 +0300
@@ -1105,11 +1105,13 @@
position.Int64(),
duration.Int64() )
- TRAP( error, isRewindFromEnd =
+ 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 Tue Sep 14 21:13:00 2010 +0300
+++ b/mmsharing/mmshengine/tsrc/ut_engine/src/ut_musengclipsession.cpp Wed Sep 15 12:09:15 2010 +0300
@@ -1587,18 +1587,24 @@
// 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 Tue Sep 14 21:13:00 2010 +0300
+++ b/mmsharing/mmshengine/tsrc/ut_engine/src/ut_musengsession.cpp Wed Sep 15 12:09:15 2010 +0300
@@ -200,7 +200,7 @@
EUNIT_ASSERT( iLiveSession->AudioRoutingCanBeChanged() );
iLiveSession->iTelephoneUtils->iTelephonyAudioRouting->iCurrentOutput =
- CTelephonyAudioRouting::EWiredAudioAccessory;
+ CTelephonyAudioRouting::ETTY;
EUNIT_ASSERT( !iLiveSession->AudioRoutingCanBeChanged() );
}
--- a/mmsharing/mmshengine/tsrc/ut_engine/src/ut_musengtelephoneutils.cpp Tue Sep 14 21:13:00 2010 +0300
+++ b/mmsharing/mmshengine/tsrc/ut_engine/src/ut_musengtelephoneutils.cpp Wed Sep 15 12:09:15 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, fails because current set is not handset
+ // Try to set loudspeaker on, succeed
iTelephoneUtils->LoudspeakerL( ETrue, ETrue );
EUNIT_ASSERT( iTelephoneUtils->iTelephonyAudioRouting->iCurrentOutput ==
- CTelephonyAudioRouting::EWiredAudioAccessory );
+ CTelephonyAudioRouting::ELoudspeaker );
// Change conditions
iTelephoneUtils->iTelephonyAudioRouting->iCurrentOutput =
--- a/mmsharing/mmshui/inc/musuibackgroundviewcontainer.h Tue Sep 14 21:13:00 2010 +0300
+++ b/mmsharing/mmshui/inc/musuibackgroundviewcontainer.h Wed Sep 15 12:09:15 2010 +0300
@@ -23,6 +23,7 @@
#include <coecntrl.h> // Control base class
class MAknsControlContext;
+class CMusUiEventController;
/**
* This class handles ordinal position two plain window.
@@ -69,6 +70,11 @@
*/
void UpdateOrdinalPositionValue( TBool aUp );
+ /**
+ * Sets the event controller
+ */
+ void SetUiEventController( CMusUiEventController* aController );
+
private: // Construction
CMusUiBackgroundViewContainer( TInt aOrdinalPosition );
@@ -81,6 +87,14 @@
* 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.
@@ -146,6 +160,11 @@
*/
TInt iOrdinalPosition;
+ /**
+ * Event controller
+ */
+ CMusUiEventController* iController;
+
};
--- a/mmsharing/mmshui/src/musuiactivequerydialog.cpp Tue Sep 14 21:13:00 2010 +0300
+++ b/mmsharing/mmshui/src/musuiactivequerydialog.cpp Wed Sep 15 12:09:15 2010 +0300
@@ -109,7 +109,7 @@
void CMusUiActiveQueryDialog::RunL()
{
MUS_LOG1( "mus: [MUSUI ] -> CMusUiActiveQueryDialog::RunL [%d]", iStatus.Int() );
- if ( iStatus == EAknSoftkeyYes )
+ if ( iStatus == EAknSoftkeyYes || iStatus == EEikBidOk )
{
MUS_LOG( "mus: [MUSUI ] CMusUiActiveQueryDialog::RunL: if" );
iObserver.QueryAcceptedL( ETrue );
--- a/mmsharing/mmshui/src/musuibackgroundviewcontainer.cpp Tue Sep 14 21:13:00 2010 +0300
+++ b/mmsharing/mmshui/src/musuibackgroundviewcontainer.cpp Wed Sep 15 12:09:15 2010 +0300
@@ -18,6 +18,7 @@
#include "musuibackgroundviewcontainer.h"
#include "musuiappui.h"
#include "muslogger.h" // debug logging
+#include "musuieventcontroller.h"
#include <AknsControlContext.h>
#include <AknsBasicBackgroundControlContext.h>
@@ -54,7 +55,8 @@
// -----------------------------------------------------------------------------
//
CMusUiBackgroundViewContainer::CMusUiBackgroundViewContainer(
- TInt aOrdinalPosition ) : iOrdinalPosition( aOrdinalPosition )
+ TInt aOrdinalPosition ) : iOrdinalPosition( aOrdinalPosition ),
+ iController( NULL )
{
}
@@ -172,6 +174,16 @@
// -----------------------------------------------------------------------------
+// Sets the event controller
+// -----------------------------------------------------------------------------
+//
+void CMusUiBackgroundViewContainer::SetUiEventController( CMusUiEventController* aController )
+ {
+ iController = aController;
+ }
+
+
+// -----------------------------------------------------------------------------
// Called by framework when the view size is changed
// -----------------------------------------------------------------------------
//
@@ -191,6 +203,33 @@
// -----------------------------------------------------------------------------
+// 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/musuiclipsharingview.cpp Tue Sep 14 21:13:00 2010 +0300
+++ b/mmsharing/mmshui/src/musuiclipsharingview.cpp Wed Sep 15 12:09:15 2010 +0300
@@ -630,6 +630,7 @@
*this,
videoRect );
}
+ iBackgroundContainer->SetUiEventController( EventController() );
iContainer->SetController( iController );
--- a/mmsharing/mmshui/src/musuigeneralview.cpp Tue Sep 14 21:13:00 2010 +0300
+++ b/mmsharing/mmshui/src/musuigeneralview.cpp Wed Sep 15 12:09:15 2010 +0300
@@ -234,6 +234,12 @@
ETrue,
ETrue );
+ Toolbar()->HideItem( EventControllerL().IsMicMutedL() ?
+ EMusuiCmdToolbarUnmute :
+ EMusuiCmdToolbarMute,
+ EFalse,
+ ETrue );
+
TBool loudSpeakerEnabled( EventControllerL().IsLoudSpeakerEnabled() );
Toolbar()->HideItem( loudSpeakerEnabled ?
@@ -242,18 +248,12 @@
ETrue,
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 );
-
-
+ Toolbar()->HideItem( loudSpeakerEnabled ?
+ EMusuiCmdToolbarSpeakerOff :
+ EMusuiCmdToolbarSpeakerOn,
+ EFalse,
+ ETrue );
+
MUS_LOG( "mus: [MUSUI ] <- CMusUiGeneralView::DynInitToolbarL" );
}
--- a/mmsharing/mmshui/src/musuiinvitationquery.cpp Tue Sep 14 21:13:00 2010 +0300
+++ b/mmsharing/mmshui/src/musuiinvitationquery.cpp Wed Sep 15 12:09:15 2010 +0300
@@ -146,7 +146,7 @@
{
MUS_LOG1( "mus: [MUSUI ] -> CMusUiInvitationQuery::RunL [%d]", iStatus.Int() );
iActiveTimer->Cancel();
- if ( iStatus == EAknSoftkeyYes )
+ if ( iStatus == EAknSoftkeyYes || iStatus == EEikBidOk )
{
MUS_LOG( "mus: [MUSUI ] CMusUiInvitationQuery::RunL: if" );
iObserver.InvitationAcceptedL();
--- a/mmsharing/mmshui/src/musuilivesharingview.cpp Tue Sep 14 21:13:00 2010 +0300
+++ b/mmsharing/mmshui/src/musuilivesharingview.cpp Wed Sep 15 12:09:15 2010 +0300
@@ -705,6 +705,7 @@
videoRect );
iController->StartInvitationL();
}
+ iBackgroundContainer->SetUiEventController( EventController() );
iContainer->SetController( iController );
--- a/mmsharing/mmshui/src/musuireceiveview.cpp Tue Sep 14 21:13:00 2010 +0300
+++ b/mmsharing/mmshui/src/musuireceiveview.cpp Wed Sep 15 12:09:15 2010 +0300
@@ -474,6 +474,7 @@
*this,
videoRect );
}
+ iBackgroundContainer->SetUiEventController( EventController() );
MUS_LOG( "mus: [MUSUI ] <- CMusUiReceiveView::DoActivateL" );
}
--- a/mmsharing/mmshui/src/musuisendcontroller.cpp Tue Sep 14 21:13:00 2010 +0300
+++ b/mmsharing/mmshui/src/musuisendcontroller.cpp Wed Sep 15 12:09:15 2010 +0300
@@ -39,6 +39,8 @@
#include <pathinfo.h>
#include <CDirectoryLocalizer.h>
+_LIT16( KMusUSign, "%U" );
+
using namespace NMusSessionApi;
@@ -401,9 +403,31 @@
{
MUS_LOG( "mus: [MUSUI ] -> CMusUiSendController::SessionRejected" );
DismissWaitDialog();
- TRAP_IGNORE (
- MusUiDialogUtil::ShowInformationDialogL(
- R_MUS_LIVE_SHARING_VIEW_NOTE_CONNECTION_REJECTED ) );
+
+ 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( iCallbackService->AsyncEventL( EMusUiAsyncHandleExit ) );