--- a/inc/musresourcefinderutil.inl Mon Mar 15 12:40:08 2010 +0200
+++ b/inc/musresourcefinderutil.inl Wed Mar 31 21:25:43 2010 +0300
@@ -59,6 +59,7 @@
BaflUtils::NearestLanguageFile(fs ,fName );
CleanupStack::PopAndDestroy( fileName ); // fileName
fileName = fName.AllocLC();
+ fileNamePtr.Set(fileName->Des());
}
if ( BaflUtils::FileExists( fs, *fileName ) )
{
--- a/mmsharing/mmshengine/inc/musengclipsession.h Mon Mar 15 12:40:08 2010 +0200
+++ b/mmsharing/mmshengine/inc/musengclipsession.h Wed Mar 31 21:25:43 2010 +0300
@@ -203,10 +203,8 @@
/**
* Returns current position as microseconds.
- * @param aActualPosition ETrue if actual position is wanted, EFalse
- * if buffering time is taken in count.
*/
- TTimeIntervalMicroSeconds PositionMicroSecondsL( TBool aActualPosition = EFalse );
+ TTimeIntervalMicroSeconds PositionMicroSecondsL();
/**
* Constructs audio stream structure during session completion and adds
@@ -218,10 +216,6 @@
void ConstructAudioStructureL( CMceStreamBundle& aLocalBundle );
void DetermineBufferingPeriod( CMceMediaStream& aStream );
-
- TTimeIntervalMicroSeconds GetVideoSinkRelativeFilePos(
- const TTimeIntervalMicroSeconds& aActualPosition,
- const TTimeIntervalMicroSeconds& aDuration );
TBool IsH264Supported() const;
--- a/mmsharing/mmshengine/src/musengclipsession.cpp Mon Mar 15 12:40:08 2010 +0200
+++ b/mmsharing/mmshengine/src/musengclipsession.cpp Wed Mar 31 21:25:43 2010 +0300
@@ -152,7 +152,7 @@
}
// Set new position
- file->SetPositionL( PositionMicroSecondsL( ETrue ) );
+ file->SetPositionL( PositionMicroSecondsL() );
MUS_LOG( " SetPositionL returned without error " )
// Reset timer
@@ -207,7 +207,7 @@
}
// Set new position
- file->SetPositionL( PositionMicroSecondsL( ETrue ) );
+ file->SetPositionL( PositionMicroSecondsL() );
MUS_LOG( " SetPositionL returned without error " )
// Reset timer
@@ -840,8 +840,7 @@
//
// -----------------------------------------------------------------------------
//
-TTimeIntervalMicroSeconds CMusEngClipSession::PositionMicroSecondsL(
- TBool aActualPosition )
+TTimeIntervalMicroSeconds CMusEngClipSession::PositionMicroSecondsL()
{
__ASSERT_ALWAYS( iSession, User::Leave( KErrNotReady ) );
@@ -886,12 +885,6 @@
{
calculatedPosition = position;
}
-
- if ( !aActualPosition )
- {
- calculatedPosition =
- GetVideoSinkRelativeFilePos( calculatedPosition, duration );
- }
return calculatedPosition;
}
@@ -1007,65 +1000,6 @@
}
// -----------------------------------------------------------------------------
-// Modifies file position if position has reached end before clip has ended.
-// File position is not going in sync with local video playback as playback
-// buffers media before starting playing.
-// -----------------------------------------------------------------------------
-//
-TTimeIntervalMicroSeconds CMusEngClipSession::GetVideoSinkRelativeFilePos(
- const TTimeIntervalMicroSeconds& aActualPosition,
- const TTimeIntervalMicroSeconds& aDuration )
- {
- MUS_LOG1( "mus: [ENGINE] PositionMicroSecondsL, pos before mod:%d",
- aActualPosition.Int64() )
-
- TTimeIntervalMicroSeconds tempCalculatedPosition( aActualPosition );
-
- if ( iDelayFileEndingPos != 0 )
- {
- iDelayFileEndingPos = aDuration;
- tempCalculatedPosition = iDelayFileEndingPos;
- }
- else
- {
- // FRWD can go to zero even if clip has not ended, do not modify
- // time in such situation.
- if ( aActualPosition == 0 &&
- !iClipEnded &&
- iFRWDStartTime.Int64() == 0 &&
- !iRewindedToBeginning )
- {
- const TInt KMusDelayEndingModifier = 2;
- iDelayFileEndingPos = aDuration.Int64() -
- iBufferingPeriod.Int64() / KMusDelayEndingModifier;
- tempCalculatedPosition = iDelayFileEndingPos;
- if ( iPreviousPos > tempCalculatedPosition )
- {
- tempCalculatedPosition = iPreviousPos;
- }
- }
- else
- {
- iDelayFileEndingPos = 0;
- }
-
- if ( iRewindedToBeginning && aActualPosition > 0 )
- {
- iRewindedToBeginning = EFalse;
- }
-
- if ( tempCalculatedPosition < 0 )
- {
- tempCalculatedPosition = 0;
- }
- }
-
- iPreviousPos = tempCalculatedPosition;
-
- return tempCalculatedPosition;
- }
-
-// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
//
--- a/mmsharing/mmshui/src/musuireceivecontroller.cpp Mon Mar 15 12:40:08 2010 +0200
+++ b/mmsharing/mmshui/src/musuireceivecontroller.cpp Wed Mar 31 21:25:43 2010 +0300
@@ -12,7 +12,7 @@
* Contributors:
*
* Description: Application's UI class.
-* Version : %version: 75.1.11 % << Don't touch! Updated by Synergy at check-out.
+* Version : %version: be1sipx1#75.1.13 % << Don't touch! Updated by Synergy at check-out.
*
*/
@@ -595,6 +595,10 @@
MUS_LOG( "mus: [MUSUI ] -> CMusUiReceiveController::StreamIdle" );
iStreamPaused = ETrue;
TRAPD( err, iEventObserver.ShowNaviPaneIconL( EMusUiNaviIconPause ) );
+ if ( iFullScreenSelected )
+ {
+ TRAP_IGNORE( ChangeFullScreenModeL() );
+ }
if ( err != KErrNone )
{
iEventObserver.HandleError( err );
--- a/mmshplugins/mmshsettingsuiplugin/inc/mussettingsmodel.h Mon Mar 15 12:40:08 2010 +0200
+++ b/mmshplugins/mmshsettingsuiplugin/inc/mussettingsmodel.h Wed Mar 31 21:25:43 2010 +0300
@@ -12,7 +12,7 @@
* Contributors:
*
* Description: MUSSettingsPlugin model class.
-* Version : %version: 10 % << Don't touch! Updated by Synergy at check-out.
+* Version : %version: 11 % << Don't touch! Updated by Synergy at check-out.
*
*/
@@ -23,7 +23,7 @@
#include <e32base.h>
#include <badesca.h>
-//class CDesCArray;
+
class MMusSIPProfileHandler;
class CMusSIPProfileModel;
class CAknMemorySelectionDialogMultiDrive;
@@ -67,35 +67,35 @@
* operator specific variant
* @return activation item
*/
- TBool ActivationItem( );
+ TBool ActivationItem();
/**
* Returns the array containing the profile names.
* NOTE! The ownership of the array is transferred to the caller.
* @return Array consisting of the names of the SIP profiles.
*/
- CDesCArray* ListOfProfileNamesL();
+ CDesCArray* ListOfProfileNamesL();
/**
* Gets a SIP profile name by ID.
* Ownership is transferred to caller.
* @return SIP profile name.
*/
- HBufC* ProfileNameL( TInt aId );
+ HBufC* ProfileNameL( TInt aId );
/**
* Gets the index of the default SIP profile.
* @return KErrNotFound, if one does not exist, otherwise index of the
* default SIP profile.
*/
- TInt DefaultProfileIndex();
+ TInt DefaultProfileIndex();
/**
* Gets the id of the default SIP profile.
* @return KErrNotFound, if one does not exist, otherwise id of the
* default SIP profile.
*/
- TUint32 DefaultProfileId();
+ TUint32 DefaultProfileId();
/**
* Returns SIP profile index on locally cached array based on id.
@@ -118,23 +118,27 @@
*/
CAknMemorySelectionDialogMultiDrive* MemorySelectionDialogLC();
+ /**
+ * Initialize SIP profile enabler data.
+ */
+ void InitializeProfileEnablerL();
public: // constants
/**
* Default SIP profile.
*/
- static const TInt KVsSipProfileDefault;
-
+ static const TInt KVsSipProfileDefault;
+
/**
* SIP profile select.
*/
- static const TInt KVsSipProfileSelect;
+ static const TInt KVsSipProfileSelect;
/**
* Null selection SIP profile.
*/
- static const TInt KVsSipProfileSelectNone;
+ static const TInt KVsSipProfileSelectNone;
private:
@@ -144,11 +148,6 @@
*/
CMusSettingsModel( MMusSIPProfileHandler& aHandler );
- /**
- * Initialize SIP profile enabler data.
- */
- void InitializeProfileEnablerL();
-
void ConstructL();
private: // data
--- a/mmshplugins/mmshsettingsuiplugin/inc/mussipprofilemodel.h Mon Mar 15 12:40:08 2010 +0200
+++ b/mmshplugins/mmshsettingsuiplugin/inc/mussipprofilemodel.h Wed Mar 31 21:25:43 2010 +0300
@@ -12,7 +12,7 @@
* Contributors:
*
* Description: Class implementing SIP profile model.
-* Version : %version: 7 % << Don't touch! Updated by Synergy at check-out.
+* Version : %version: 9 % << Don't touch! Updated by Synergy at check-out.
*
*/
@@ -25,21 +25,20 @@
#include "mmussipprofilehandler.h"
#include <e32base.h>
#include <sipprofileregistryobserver.h>
-
+#include <sipobserver.h>
+#include <sipconnectionobserver.h>
class CSIPManagedProfileRegistry;
class CMusSettingsModel;
-
/**
* CMusSIPProfileModel model class.
* Model class implementing SIP profile model.
*/
-class CMusSIPProfileModel
- :public CBase,
- public MSIPProfileRegistryObserver,
- public MMusSIPProfileHandler
- {
+class CMusSIPProfileModel : public CBase,
+ public MSIPProfileRegistryObserver,
+ public MMusSIPProfileHandler
+{
public:
static CMusSIPProfileModel* NewL();
@@ -55,36 +54,32 @@
* From MMusSIPProfileHandler.
* Returns the index of the default SIP profile.
* @return KErrNotFound, if one does not exist, otherwise index of the
- * default SIP profile.
+ * default SIP profile.
*/
- virtual TInt DefaultProfileIndex();
+ TInt DefaultProfileIndex();
/**
* From MMusSIPProfileHandler.
* Returns the id of the default SIP profile.
* @return KErrNotFound, if one does not exist, otherwise id of the
- * default SIP profile.
+ * default SIP profile.
*/
- virtual TUint32 DefaultProfileId();
-
+ TUint32 DefaultProfileId();
- /*
- *
- *
- */
- virtual void DisableProfileL();
+ /*
+ * Disables MUS profile
+ */
+ void DisableProfileL();
- /*
- *
- *
+ /*
+ * Enables MUS profile
*/
- virtual void EnableProfileL();
+ void EnableProfileL();
- /*
- *
- *
+ /*
+ * Checks, if MUS profile is enabled
*/
- virtual TBool ProfileEnabledL();
+ TBool ProfileEnabledL();
/**
* From MMusSIPProfileHandler.
@@ -92,7 +87,7 @@
* @param aId Profile id
* @return Profile index or KErrNotFound if no matching profile is found.
*/
- virtual TInt ProfileIndexByIdL( TUint32 aId );
+ TInt ProfileIndexByIdL( TUint32 aId );
/**
* From MMusSIPProfileHandler.
@@ -100,7 +95,7 @@
* @param aIndex Profile index
* @return Profile id or KUnknownProfileId if no matching profile is found.
*/
- virtual TUint32 ProfileIdByIndex( TUint aIndex );
+ TUint32 ProfileIdByIndex( TUint aIndex );
/**
* From MMusSIPProfileHandler.
@@ -112,7 +107,7 @@
*
* @return Reference to internally cached SIP profile array.
*/
- virtual RPointerArray<CSIPProfile>& ProfileArrayL();
+ RPointerArray<CSIPProfile>& ProfileArrayL();
public: // From base class MSIPProfileRegistryObserver.
@@ -121,28 +116,29 @@
* SIP profile information event.
* @param aProfileId Id of SIP profile in question.
* @param aEvent Type of information event.
- */
- virtual void ProfileRegistryEventOccurred(
+ */
+ void ProfileRegistryEventOccurred(
TUint32 aSIPProfileId,
TEvent aEvent );
- /**
- * From MSIPProfileRegistryObserver.
- * An asynchronous error has occurred related to SIP profile.
- * @param aSIPProfileId Id of the failed profile.
- * @param aError An error code.
- */
- virtual void ProfileRegistryErrorOccurred(
- TUint32 aSIPProfileId,
- TInt aError );
-
-
-
+ /**
+ * From MSIPProfileRegistryObserver.
+ * An asynchronous error has occurred related to SIP profile.
+ * @param aSIPProfileId Id of the failed profile.
+ * @param aError An error code.
+ */
+ void ProfileRegistryErrorOccurred(
+ TUint32 aSIPProfileId,
+ TInt aError );
+
+
+public:
+
/**
* Set CMusSettingsModel to handle ProfileRegistry Event.
* @param aCMusSettingsModel the CMusSettingsModel to handle ProfileRegistry Event
*/
- void SetCMusSettingsModel(CMusSettingsModel* aCMusSettingsModel);
+ void SetCMusSettingsModel(CMusSettingsModel* aCMusSettingsModel);
protected:
@@ -162,21 +158,23 @@
private: // data
/**
- * Instance of the SIP profile registry engine for managing SIP profiles.
- * Own.
- */
+ * Instance of the SIP profile registry engine for managing SIP profiles.
+ * Own.
+ */
CSIPManagedProfileRegistry* iEngine;
/**
- * Locally cached array of SIP profiles.
- */
+ * Locally cached array of SIP profiles.
+ */
RPointerArray<CSIPProfile> iProfiles;
/**
- * CMusSettingsModel to handle ProfileRegistry
- * Event
- */
+ * CMusSettingsModel to handle ProfileRegistry
+ * Event
+ */
CMusSettingsModel* iCMusSettingsModel;
+
+
};
--- a/mmshplugins/mmshsettingsuiplugin/src/mussettingscontainer.cpp Mon Mar 15 12:40:08 2010 +0200
+++ b/mmshplugins/mmshsettingsuiplugin/src/mussettingscontainer.cpp Wed Mar 31 21:25:43 2010 +0300
@@ -12,28 +12,28 @@
* Contributors:
*
* Description: Container for MUSSettingsPlugin.
-* Version : %version: 20 % << Don't touch! Updated by Synergy at check-out.
+* Version : %version: 21 % << Don't touch! Updated by Synergy at check-out.
*
*/
-#include "mussettingscontainer.h"
-#include "mussettingsplugin.h"
-#include "mussettingsmodel.h"
-#include "gslistbox.h"
-#include "mussettingsplugin.hrh"
-#include <mussettingsuirsc.rsg>
-#include <aknlists.h>
-#include <akntitle.h>
-#include <aknnotewrappers.h>
-#include <csxhelp/msh.hlp.hrh>
-#include <gsfwviewuids.h>
-#include <StringLoader.h>
-#include <sipmanagedprofile.h>
-#include <ctsydomainpskeys.h>
-#include <e32property.h>
-#include <pathinfo.h>
+#include "mussettingscontainer.h"
+#include "mussettingsplugin.h"
+#include "mussettingsmodel.h"
+#include "gslistbox.h"
+#include "mussettingsplugin.hrh"
+#include <mussettingsuirsc.rsg>
+#include <aknlists.h>
+#include <akntitle.h>
+#include <aknnotewrappers.h>
+#include <csxhelp/msh.hlp.hrh>
+#include <gsfwviewuids.h>
+#include <StringLoader.h>
+#include <sipmanagedprofile.h>
+#include <ctsydomainpskeys.h>
+#include <e32property.h>
+#include <pathinfo.h>
#ifdef RD_MULTIPLE_DRIVE
@@ -86,9 +86,9 @@
{
MUS_LOG( "[MUSSET] -> CMusSettingsContainer::~CMusSettingsContainer()" )
delete iActivationItems;
- delete iProfileItems;
- delete iAutoRecordItems;
- delete iListboxItemArray;
+ delete iProfileItems;
+ delete iAutoRecordItems;
+ delete iListboxItemArray;
MUS_LOG( "[MUSSET] <- CMusSettingsContainer::~CMusSettingsContainer()" )
}
@@ -106,10 +106,10 @@
iListBox->Model()->SetItemTextArray( iListboxItemArray );
iListBox->Model()->SetOwnershipType( ELbmDoesNotOwnItemArray );
- // OCC: removed "Automatic in home network" choice
- iActivationItems =
- iCoeEnv->ReadDesC16ArrayResourceL(
- R_OPERATOR_ACTIVATION_SETTING_PAGE_LBX );
+ // OCC: removed "Automatic in home network" choice
+ iActivationItems =
+ iCoeEnv->ReadDesC16ArrayResourceL(
+ R_OPERATOR_ACTIVATION_SETTING_PAGE_LBX );
iAutoRecordItems = iCoeEnv->ReadDesC16ArrayResourceL(
R_VS_VIDEO_SAVING_SETTING_PAGE_LBX );
@@ -177,19 +177,19 @@
{
MakeOperatorActivationItemL();
}
- break;
+ break;
case KGSSettIdSIPProfile:
MakeSIPProfileItemL();
break;
case KGSSettIdAutoRecord:
MakeAutoRecordItemL();
- break;
+ break;
case KGSSettIdRecordedVideoSaving:
- MakeRecordedVideoSavingItemL();
- break;
+ MakeRecordedVideoSavingItemL();
+ break;
case KGSSettIdNote:
- MakeNoteItemL();
- break;
+ MakeNoteItemL();
+ break;
default:
break;
}
@@ -204,13 +204,13 @@
// -----------------------------------------------------------------------------
//
void CMusSettingsContainer::AddItemL( TInt aId, const TPtrC aText )
- {
- MUS_LOG( "[MUSSET] -> CMusSettingsContainer::AddItemL()" )
+ {
+ MUS_LOG( "[MUSSET] -> CMusSettingsContainer::AddItemL()" )
iListboxItemArray->SetDynamicTextL( aId, aText );
iListboxItemArray->SetItemVisibilityL( aId,
- CGSListBoxItemTextArray::EVisible );
- MUS_LOG( "[MUSSET] <- CMusSettingsContainer::AddItemL()" )
- }
+ CGSListBoxItemTextArray::EVisible );
+ MUS_LOG( "[MUSSET] <- CMusSettingsContainer::AddItemL()" )
+ }
// -----------------------------------------------------------------------------
@@ -231,7 +231,7 @@
activation = MusSettingsKeys::EActiveInHomeNetworks;
}
- AddItemL( KGSSettIdVSActivation, ( *iActivationItems )[ activation ] );
+ AddItemL( KGSSettIdVSActivation, ( *iActivationItems )[ activation ] );
MUS_LOG( "[MUSSET] <- CMusSettingsContainer::MakeActivationItemL()" )
}
@@ -244,9 +244,12 @@
void CMusSettingsContainer::MakeOperatorActivationItemL()
{
MUS_LOG( "[MUSSET] -> CMusSettingsContainer::MakeOperatorActivationItemL()" )
- MUS_LOG1( "Activation item( %d )",
- iModel.ActivationItem() )
- AddItemL( KGSSettIdVSActivation, ( *iActivationItems )[ iModel.ActivationItem() ] );
+
+ //sync with real value, if op specifig
+ iModel.InitializeProfileEnablerL();
+
+ MUS_LOG1( "Activation item=%d (0=VS enabled, 1=VS disabled)", iModel.ActivationItem() )
+ AddItemL( KGSSettIdVSActivation, ( *iActivationItems )[ iModel.ActivationItem() ] );
MUS_LOG( "[MUSSET] <- CMusSettingsContainer::MakeOperatorActivationItemL()" )
}
@@ -266,33 +269,33 @@
if ( profile != KDefaultSipProfile && profile != KNoSipProfileSelected )
{
- // profile id defined, get profile name
- HBufC* name = iModel.ProfileNameL( profile );
+ // profile id defined, get profile name
+ HBufC* name = iModel.ProfileNameL( profile );
- if ( name )
- {
- CleanupStack::PushL( name );
- AddItemL( KGSSettIdSIPProfile, *name );
- CleanupStack::PopAndDestroy( name );
- }
+ if ( name )
+ {
+ CleanupStack::PushL( name );
+ AddItemL( KGSSettIdSIPProfile, *name );
+ CleanupStack::PopAndDestroy( name );
+ }
else
- {
- // show profile value not selected
- AddItemL( KGSSettIdSIPProfile,
- ( *iProfileItems )[ CMusSettingsModel::KVsSipProfileSelectNone ] );
- }
- }
+ {
+ // show profile value not selected
+ AddItemL( KGSSettIdSIPProfile,
+ ( *iProfileItems )[ CMusSettingsModel::KVsSipProfileSelectNone ] );
+ }
+ }
else if ( profile == KNoSipProfileSelected )
{
AddItemL( KGSSettIdSIPProfile,
( *iProfileItems )[ CMusSettingsModel::KVsSipProfileSelectNone ] );
- }
+ }
else
{
- AddItemL(
- KGSSettIdSIPProfile,
- ( *iProfileItems )[ CMusSettingsModel::KVsSipProfileDefault ] );
- }
+ AddItemL(
+ KGSSettIdSIPProfile,
+ ( *iProfileItems )[ CMusSettingsModel::KVsSipProfileDefault ] );
+ }
MUS_LOG( "[MUSSET] <- CMusSettingsContainer::MakeSIPProfileItemL()" )
}
@@ -379,13 +382,13 @@
// If unset, use and set default value
if ( auditoryNotification < 0 || auditoryNotification > 1 )
- {
+ {
auditoryNotification = MusSettingsKeys::EAuditoryNotificationOff;
MultimediaSharingSettings::SetAuditoryNotificationSettingL(
MusSettingsKeys::EAuditoryNotificationOff );
- }
+ }
- AddItemL( KGSSettIdNote, ( *iActivationItems )[ auditoryNotification ] );
+ AddItemL( KGSSettIdNote, ( *iActivationItems )[ auditoryNotification ] );
MUS_LOG( "[MUSSET] <- CMusSettingsContainer::MakeNoteItemL()" )
}
@@ -424,25 +427,27 @@
{
MUS_LOG(
"[MUSSET] -> CMusSettingsContainer::ShowNewProfileActiveAfterCallL()" )
- TPSCTsyCallState callState;
- User::LeaveIfError( RProperty::Get( KPSUidCtsyCallInformation,
- KCTsyCallState,
- (TInt&)callState) );
- if ( callState == EPSCTsyCallStateAlerting ||
- callState == EPSCTsyCallStateRinging ||
- callState == EPSCTsyCallStateDialling ||
- callState == EPSCTsyCallStateAnswering ||
- callState == EPSCTsyCallStateDisconnecting ||
- callState == EPSCTsyCallStateConnected ||
- callState == EPSCTsyCallStateHold)
- {
- HBufC* infoTxt = StringLoader::LoadLC( R_QTN_MSH_SET_PROFILE_NOTE );
- CAknInformationNote* note = new ( ELeave ) CAknInformationNote( ETrue );
- note->ExecuteLD( infoTxt->Des() );
- CleanupStack::PopAndDestroy( infoTxt );
- MUS_LOG(
- "[MUSSET] <- CMusSettingsContainer::ShowNewProfileActiveAfterCallL()" )
- }
+ TPSCTsyCallState callState;
+ User::LeaveIfError( RProperty::Get( KPSUidCtsyCallInformation,
+ KCTsyCallState,
+ (TInt&)callState) );
+
+ if ( callState == EPSCTsyCallStateAlerting ||
+ callState == EPSCTsyCallStateRinging ||
+ callState == EPSCTsyCallStateDialling ||
+ callState == EPSCTsyCallStateAnswering ||
+ callState == EPSCTsyCallStateDisconnecting ||
+ callState == EPSCTsyCallStateConnected ||
+ callState == EPSCTsyCallStateHold)
+ {
+ HBufC* infoTxt = StringLoader::LoadLC( R_QTN_MSH_SET_PROFILE_NOTE );
+ CAknInformationNote* note = new ( ELeave ) CAknInformationNote( ETrue );
+ note->ExecuteLD( infoTxt->Des() );
+ CleanupStack::PopAndDestroy( infoTxt );
+ }
+
+ MUS_LOG(
+ "[MUSSET] <- CMusSettingsContainer::ShowNewProfileActiveAfterCallL()" )
}
// -----------------------------------------------------------------------------
@@ -455,5 +460,6 @@
MUS_LOG1("[MUSSET] -> CMusSettingsContainer::HideItemsL() %d",aItemIndex )
iListboxItemArray->SetItemVisibilityL( aItemIndex,
CGSListBoxItemTextArray::EInvisible );
- MUS_LOG("[MUSSET] <- CMusSettingsContainer::HideItemsL()" )
+ MUS_LOG("[MUSSET] <- CMusSettingsContainer::HideItemsL()" )
}
+
--- a/mmshplugins/mmshsettingsuiplugin/src/mussettingsmodel.cpp Mon Mar 15 12:40:08 2010 +0200
+++ b/mmshplugins/mmshsettingsuiplugin/src/mussettingsmodel.cpp Wed Mar 31 21:25:43 2010 +0300
@@ -12,7 +12,7 @@
* Contributors:
*
* Description: Document model class for MUSSettingsPlugin.
-* Version : %version: 17 % << Don't touch! Updated by Synergy at check-out.
+* Version : %version: 18 % << Don't touch! Updated by Synergy at check-out.
*
*/
@@ -100,7 +100,7 @@
MUS_LOG( "[MUSSET] -> CMusSettingsModel::VSSettingsRecordedVideoSavingL()" )
TInt vsVideoLocationMode = MultimediaSharingSettings::VideoLocationSettingL();
MUS_LOG1(
- "[MUSSET] <- CMusSettingsContainer::VSSettingsRecordedVideoSavingL()( %d )",
+ "[MUSSET] <- CMusSettingsModel::VSSettingsRecordedVideoSavingL()( %d )",
vsVideoLocationMode )
return vsVideoLocationMode;
}
@@ -111,10 +111,10 @@
//
void CMusSettingsModel::SetActivationItem( TBool aActive )
{
- MUS_LOG( "[MUSSET] -> CMusSettingsContainer::SetActivationItem()" )
+ MUS_LOG( "[MUSSET] -> CMusSettingsModel::SetActivationItem()" )
MUS_LOG1( " Profile disabled? ( %d )", aActive )
iProfileDisabled = aActive;
- MUS_LOG( "[MUSSET] <- CMusSettingsContainer::SetActivationItem()" )
+ MUS_LOG( "[MUSSET] <- CMusSettingsModel::SetActivationItem()" )
}
// ----------------------------------------------------------------------------
@@ -123,8 +123,8 @@
//
TBool CMusSettingsModel::ActivationItem()
{
- MUS_LOG( "[MUSSET] -> CMusSettingsContainer::SetActivationItem()" )
- MUS_LOG( "[MUSSET] <- CMusSettingsContainer::SetActivationItem()" )
+ MUS_LOG( "[MUSSET] -> CMusSettingsModel::ActivationItem()" )
+ MUS_LOG( "[MUSSET] <- CMusSettingsModel::ActivationItem()" )
return iProfileDisabled;
}
@@ -171,7 +171,7 @@
HBufC* CMusSettingsModel::ProfileNameL( TInt aId )
{
MUS_LOG1(
- "[MUSSET] -> CMusSettingsContainer::ProfileNameL()( %d )",
+ "[MUSSET] -> CMusSettingsModel::ProfileNameL()( %d )",
aId )
const TDesC8* providerName = 0;
TInt index = ProfileIndexByIdL( aId );
@@ -255,25 +255,11 @@
CMusSIPProfileModel& handler =
static_cast<CMusSIPProfileModel&>( iHandler );
TRAPD( error, enabled = handler.ProfileEnabledL());
- if ( error != KErrNone )
- {
- MUS_LOG( "Error returned" )
- // Problems with re-reading profiles; use existing array
- SetActivationItem( EFalse );
- }
- else
- {
- MUS_LOG1("SIP registration service( %d )",
- enabled )
- if( enabled )
- {
- SetActivationItem( enabled );
- }
- else
- {
- SetActivationItem( enabled);
- }
- }
+ enabled = error != KErrNone ? EFalse : enabled;
+ MUS_LOG2("SIP registration service( %d ), error( %d )", enabled, error )
+ //profile enabled - activation disabled = false
+ //profile disabled - activation disabled = true
+ SetActivationItem( !enabled );
}
MUS_LOG( "[MUSSET] <- CMusSettingsModel::InitializeProfileEnabler()" )
}
--- a/mmshplugins/mmshsettingsuiplugin/src/mussettingsplugin.cpp Mon Mar 15 12:40:08 2010 +0200
+++ b/mmshplugins/mmshsettingsuiplugin/src/mussettingsplugin.cpp Wed Mar 31 21:25:43 2010 +0300
@@ -12,7 +12,7 @@
* Contributors:
*
* Description: MUSSettingsPlugin implementation.
-* Version : %version: 34 % << Don't touch! Updated by Synergy at check-out.
+* Version : %version: 36 % << Don't touch! Updated by Synergy at check-out.
*
*/
@@ -111,7 +111,8 @@
iModel = CMusSettingsModel::NewL( *iHandler );
iDiskNotifyHandler = CDiskNotifyHandler::NewL( *this,
iEikonEnv->FsSession() );
- User::LeaveIfError( iDiskNotifyHandler->NotifyDisk() ); // Subscribe disk notifications
+ // Subscribe disk notifications
+ User::LeaveIfError( iDiskNotifyHandler->NotifyDisk() );
iCaption = StringLoader::LoadL( R_GS_VS_PLUGIN_CAPTION );
CloseResourceFile();
@@ -205,7 +206,7 @@
case EGSMSKCmdAppChange:
// case EGSCmdAppChange:
{
- HandleListBoxSelectionL();
+ HandleListBoxSelectionL();
break;
}
@@ -243,9 +244,9 @@
{
MUS_LOG( "[MUSSET] -> CMusSettingsPlugin::GetCaptionL()" )
if ( iCaption && iCaption->Length() <= aCaption.MaxLength() )
- {
+ {
aCaption.Copy( *iCaption );
- }
+ }
MUS_LOG( "[MUSSET] <- CMusSettingsPlugin::GetCaptionL()" )
}
@@ -331,7 +332,7 @@
case KGSSettIdVSActivation:
{
SwitchOnOffValueL( KGSSettIdVSActivation );
- break;
+ break;
}
case KGSSettIdSIPProfile:
{
@@ -341,17 +342,17 @@
case KGSSettIdAutoRecord:
{
SwitchOnOffValueL( KGSSettIdAutoRecord );
- break;
+ break;
}
case KGSSettIdRecordedVideoSaving:
{
- ShowVSSettingsRecordedVideoSavingSettingDialogL();
- break;
+ ShowVSSettingsRecordedVideoSavingSettingDialogL();
+ break;
}
case KGSSettIdNote:
{
- SwitchOnOffValueL( KGSSettIdNote );
- break;
+ SwitchOnOffValueL( KGSSettIdNote );
+ break;
}
default:
{
@@ -404,19 +405,19 @@
if ( dlg->ExecuteLD( CAknSettingPage::EUpdateWhenChanged ) )
{
if ( profileMode == CMusSettingsModel::KVsSipProfileDefault )
- {
- if ( oldProfileMode != profileMode )
- {
- MultimediaSharingSettings::SetSipProfileSettingL(
- CMusSettingsModel::KVsSipProfileDefault );
- Container()->ShowNewProfileActiveAfterCallL();
- Container()->UpdateListBoxL( KGSSettIdSIPProfile );
- }
- }
+ {
+ if ( oldProfileMode != profileMode )
+ {
+ MultimediaSharingSettings::SetSipProfileSettingL(
+ CMusSettingsModel::KVsSipProfileDefault );
+ Container()->ShowNewProfileActiveAfterCallL();
+ Container()->UpdateListBoxL( KGSSettIdSIPProfile );
+ }
+ }
else
- {
+ {
ShowVSSettingsSelectSipProfileDialogL();
- }
+ }
}
CleanupStack::PopAndDestroy( items );
MUS_LOG(
@@ -435,41 +436,40 @@
CleanupStack::PushL( array );
if ( array->Count() < 1 )
- {
- ShowNoProfilesNotificationL();
- }
+ {
+ ShowNoProfilesNotificationL();
+ }
else
- {
- TInt selectedIndex = iModel->ProfileIndexByIdL(
- MultimediaSharingSettings::SipProfileSettingL() );
- TInt currentIndex ( selectedIndex );
+ {
+ TInt selectedIndex = iModel->ProfileIndexByIdL(
+ MultimediaSharingSettings::SipProfileSettingL() );
+ TInt currentIndex ( selectedIndex );
- if ( selectedIndex == KErrNotFound )
- {
- // first profile in the list
- selectedIndex = CMusSettingsModel::KVsSipProfileDefault;
- }
+ if ( selectedIndex == KErrNotFound )
+ {
+ // first profile in the list
+ selectedIndex = CMusSettingsModel::KVsSipProfileDefault;
+ }
- // Create and display the pop-up list
- CAknRadioButtonSettingPage* defaultPopUp =
- new ( ELeave ) CAknRadioButtonSettingPage(
- R_VS_SIP_PROFILE_LIST_VIEW_SELECT_SETTING_PAGE,
- selectedIndex,
- array );
- if ( defaultPopUp->ExecuteLD(
- CAknSettingPage::EUpdateWhenChanged ) )
- {
- if ( selectedIndex != currentIndex )
- {
- // User has changed the selected profile, set new
- // setting to persistent storage
- TUint newValue = iModel->ProfileIdByIndex( selectedIndex );
- MultimediaSharingSettings::SetSipProfileSettingL( newValue );
- Container()->ShowNewProfileActiveAfterCallL();
- Container()->UpdateListBoxL( KGSSettIdSIPProfile );
- }
- }
- }
+ // Create and display the pop-up list
+ CAknRadioButtonSettingPage* defaultPopUp =
+ new ( ELeave ) CAknRadioButtonSettingPage(
+ R_VS_SIP_PROFILE_LIST_VIEW_SELECT_SETTING_PAGE,
+ selectedIndex,
+ array );
+ if ( defaultPopUp->ExecuteLD( CAknSettingPage::EUpdateWhenChanged ) )
+ {
+ if ( selectedIndex != currentIndex )
+ {
+ // User has changed the selected profile, set new
+ // setting to persistent storage
+ TUint newValue = iModel->ProfileIdByIndex( selectedIndex );
+ MultimediaSharingSettings::SetSipProfileSettingL( newValue );
+ Container()->ShowNewProfileActiveAfterCallL();
+ Container()->UpdateListBoxL( KGSSettIdSIPProfile );
+ }
+ }
+ }
CleanupStack::PopAndDestroy( array ); // array
}
@@ -587,45 +587,45 @@
MUS_LOG( "[MUSSET] -> CMusSettingsPlugin::SwitchOnOffValueL()" )
switch( aValue )
- {
- case KGSSettIdVSActivation:
- {
- MusSettingsKeys::TOperatorVariant operatorVarValue =
- MultimediaSharingSettings::OperatorVariantSettingL();
-
- if ( operatorVarValue == MusSettingsKeys::EOperatorSpecific )
+ {
+ case KGSSettIdVSActivation:
+ {
+ MusSettingsKeys::TOperatorVariant operatorVarValue =
+ MultimediaSharingSettings::OperatorVariantSettingL();
+
+ if ( operatorVarValue == MusSettingsKeys::EOperatorSpecific )
{
-
+
TInt aCallCount = 0;
RProperty::Get( NMusSessionInformationApi::KCategoryUid,
NMusSessionInformationApi::KMusCallCount,
aCallCount );
- MUS_LOG1( "CallCount ( %d )", aCallCount)
+ MUS_LOG1( "[MUSSET] CallCount ( %d )", aCallCount)
if ( aCallCount == 0 )
{
+ MUS_LOG( "[MUSSET] no calls. Set VS on/off" )
TBool enabled = EFalse;
TRAPD( error, enabled = iHandler->ProfileEnabledL( ));
- if ( error != KErrNone )
+ MUS_LOG2( "[MUSSET] VS now %d (err=%d)", enabled, error )
+ if ( !error )
{
- // Problems with re-reading profiles; use existing array
- MUS_LOG1("Error returned( %d )", error )
- }
- else
- {
- if( enabled )
+ if( enabled ) //currently enabled => disable
+ {
+ TRAPD( error, iHandler->DisableProfileL() );
+ MUS_LOG1( "[MUSSET] VS is off (err=%d)", error )
+ //activation disabled = true
+ //to remove warning :)
+ enabled = error != KErrNone ? ETrue : ETrue;
+ iModel->SetActivationItem( enabled );
+ }
+ else//currently disabled => enable
{
TRAPD( error, iHandler->EnableProfileL() );
- if ( error != KErrNone )
- {
- // Problems with re-reading profiles; use existing array
- iModel->SetActivationItem( ETrue );
- }
- iModel->SetActivationItem( EFalse );
- }
- else
- {
- TRAP_IGNORE( iHandler->DisableProfileL() );
- iModel->SetActivationItem( ETrue );
+ MUS_LOG1( "[MUSSET] VS is on (err=%d)", error )
+ //if failed activation disabled = true
+ enabled = error != KErrNone;
+ //activation disabled = false/true(if failed)
+ iModel->SetActivationItem( enabled );
}
}
}
@@ -649,44 +649,43 @@
}
}
break;
- }
- case KGSSettIdAutoRecord:
- {
- if ( MusSettingsKeys::EAutoRecordOff ==
- MultimediaSharingSettings::AutoRecordSettingL() )
- {
+ }
+ case KGSSettIdAutoRecord:
+ {
+ if ( MusSettingsKeys::EAutoRecordOff ==
+ MultimediaSharingSettings::AutoRecordSettingL() )
+ {
MultimediaSharingSettings::SetAutoRecordSettingL(
MusSettingsKeys::EAutoRecordOn );
- }
- else
- {
+ }
+ else
+ {
MultimediaSharingSettings::SetAutoRecordSettingL(
MusSettingsKeys::EAutoRecordOff );
- }
- break;
- }
- case KGSSettIdNote:
- {
- if ( MusSettingsKeys::EAuditoryNotificationOn ==
- MultimediaSharingSettings::AuditoryNotificationSettingL() )
- {
- MultimediaSharingSettings::SetAuditoryNotificationSettingL(
- MusSettingsKeys::EAuditoryNotificationOff );
- }
- else
- {
+ }
+ break;
+ }
+ case KGSSettIdNote:
+ {
+ if ( MusSettingsKeys::EAuditoryNotificationOn ==
+ MultimediaSharingSettings::AuditoryNotificationSettingL() )
+ {
MultimediaSharingSettings::SetAuditoryNotificationSettingL(
- MusSettingsKeys::EAuditoryNotificationOn );
- }
- break;
- }
-
- default:
- {
- MUS_LOG( "[MUSSET] -> CMusSettingsPlugin::SwitchOnOffValueL() - error unknown setting" )
- User::Leave( KErrArgument );
- }
- }
+ MusSettingsKeys::EAuditoryNotificationOff );
+ }
+ else
+ {
+ MultimediaSharingSettings::SetAuditoryNotificationSettingL(
+ MusSettingsKeys::EAuditoryNotificationOn );
+ }
+ break;
+ }
+ default:
+ {
+ MUS_LOG( "[MUSSET] -> CMusSettingsPlugin::SwitchOnOffValueL() - error unknown setting" )
+ User::Leave( KErrArgument );
+ }
+ }
Container()->UpdateListBoxL( aValue );
--- a/mmshplugins/mmshsettingsuiplugin/src/mussipprofilemodel.cpp Mon Mar 15 12:40:08 2010 +0200
+++ b/mmshplugins/mmshsettingsuiplugin/src/mussipprofilemodel.cpp Wed Mar 31 21:25:43 2010 +0300
@@ -12,31 +12,22 @@
* Contributors:
*
* Description: Model for managing SIP profiles.
-* Version : %version: 16 % << Don't touch! Updated by Synergy at check-out.
+* Version : %version: 19 % << Don't touch! Updated by Synergy at check-out.
*
*/
+#include <sipmanagedprofileregistry.h>
+#include <sipmanagedprofile.h>
#include "mussipprofilemodel.h"
#include "muslogger.h"
#include "mussettings.inl"
-#include <aknnotewrappers.h>
-#include <StringLoader.h>
-#include <aknview.h>
-#include <sipmanagedprofileregistry.h>
-#include <sipmanagedprofile.h>
-#include <sipprofileregistry.h>
-#include "mussettingsmodel.h"
+#include "mussettingsmodel.h"
const TInt KUnknownProfileId = 0;
-/**
-* VSC Enable/Disable is of type TBool
-*/
-const TUint32 KMuSVSCDisable = 200;
-
// ======== MEMBER FUNCTIONS ========
@@ -56,9 +47,15 @@
void CMusSIPProfileModel::ConstructL()
{
MUS_LOG( "[MUSSET] <- CMusSIPProfileModel::ConstructL()" )
+
+ MUS_LOG( "[MUSSET] Creating CSIPManagedProfileRegistry " )
iEngine = CSIPManagedProfileRegistry::NewL( *this );
+ MUS_LOG( "[MUSSET] Done " )
+ MUS_LOG( "[MUSSET] Getting profiles " )
iEngine->ProfilesL( iProfiles );
+ MUS_LOG( "[MUSSET] Done " )
SortProfilesL();
+ MUS_LOG( "[MUSSET] -> CMusSIPProfileModel::ConstructL()" )
}
// ----------------------------------------------------------------------------
@@ -143,8 +140,8 @@
TInt error = iProfiles[i]->GetParameter( KSIPDefaultProfile, defProfile );
if ( error == KErrNone && defProfile )
{
- iProfiles[i]->GetParameter( KSIPProfileId, id );
- break;
+ iProfiles[i]->GetParameter( KSIPProfileId, id );
+ break;
}
}
@@ -163,13 +160,14 @@
CSIPManagedProfile* managedProfile = static_cast<CSIPManagedProfile*>(
iEngine->ProfileL( DefaultProfileId()) );
CleanupStack::PushL( managedProfile );
- //Disable registration from profile.dat file
- MUS_LOG( "Add registration parameter profile.dat file " )
- TInt err = managedProfile->SetParameter( KMuSVSCDisable, (TBool)ETrue );
- User::LeaveIfError(err);
+ MUS_LOG( "[MUSSET] Add registration parameter to profile.dat file " )
+ //set autoregistration off (i.e. when needed) => disable profile
+ User::LeaveIfError( managedProfile->SetParameter( KSIPAutoRegistration, EFalse ) );
+ MUS_LOG( "[MUSSET] Saving profile " )
iEngine->SaveL( *managedProfile );
+ MUS_LOG( "[MUSSET] Saved" )
CleanupStack::PopAndDestroy( managedProfile );
- MUS_LOG( "[MUSSET] <- CMusAvaRegisterAvailability::DisableProfileL " )
+ MUS_LOG( "[MUSSET] <- CMusSIPProfileModel::DisableProfileL " )
}
// -----------------------------------------------------------------------------
@@ -182,13 +180,14 @@
CSIPManagedProfile* managedProfile = static_cast<CSIPManagedProfile*>(
iEngine->ProfileL( DefaultProfileId() ) );
CleanupStack::PushL( managedProfile );
- //Disable registration from profile.dat file
- MUS_LOG( "Add registration parameter profile.dat file " )
- TInt err = managedProfile->SetParameter( KMuSVSCDisable, (TBool)EFalse );
- User::LeaveIfError(err);
+ MUS_LOG( "[MUSSET] Add registration parameters to profile.dat file " )
+ //set autoregistration on (i.e. always on) => enable profile
+ User::LeaveIfError( managedProfile->SetParameter( KSIPAutoRegistration, ETrue ) );
+ MUS_LOG( "[MUSSET] Saving profile " )
iEngine->SaveL( *managedProfile );
+ MUS_LOG( "[MUSSET] Saved" )
CleanupStack::PopAndDestroy( managedProfile );
- MUS_LOG( "[MUSSET] <- CMusAvaRegisterAvailability::EnableRegisterL " )
+ MUS_LOG( "[MUSSET] <- CMusSIPProfileModel::EnableRegisterL " )
}
// -----------------------------------------------------------------------------
@@ -201,14 +200,14 @@
CSIPManagedProfile* managedProfile = static_cast<CSIPManagedProfile*>(
iEngine->ProfileL( DefaultProfileId() ) );
CleanupStack::PushL( managedProfile );
- //Activation status from profile.dat file
- TBool enabled = EFalse;
- MUS_LOG( "Get registration parameter from profile.dat file " )
- TInt err = managedProfile->GetParameter( KMuSVSCDisable, enabled );
- MUS_LOG1( "KMuSVSCDisable value %d )",
- enabled )
+ TBool enabled;
+ MUS_LOG( "[MUSSET] Getting KSIPAutoRegistration" )
+ User::LeaveIfError(
+ managedProfile->GetParameter( KSIPAutoRegistration, enabled ) );
+ MUS_LOG( "[MUSSET] Done" )
+ MUS_LOG1( "[MUSSET] KSIPAutoRegistration=%d", enabled )
CleanupStack::PopAndDestroy( managedProfile );
- MUS_LOG( "[MUSSET] <- CMusAvaRegisterAvailability::ProfileEnabledL " )
+ MUS_LOG( "[MUSSET] <- CMusSIPProfileModel::ProfileEnabledL " )
return enabled;
}
--- a/package_definition.xml Mon Mar 15 12:40:08 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="mmsharinguis" name="Multimedia Sharing UIs" levels="base plugin if">
- <collection id="mmsharing" name="Multimedia Sharing" level="base">
- <component id="mmshavailability" filter="s60" name="Multimedia Sharing Availability">
- <unit bldFile="mmsharing/mmshavailability/group"/>
- <!-- is this test unit needed? -->
- <!-- <unit bldFile="mmsharing/mmshavailability/tsrc/ut_availability/group"/> -->
- </component>
- <component id="mmshindicator" filter="s60" name="Multimedia Sharing Indicator">
- <unit bldFile="mmsharing/mmshindicator/group"/>
- <!-- are these test units needed? -->
- <!-- <unit bldFile="mmsharing/mmshindicator/tsrc/indicatortestapp/group"/> -->
- <!-- <unit bldFile="mmsharing/mmshindicator/tsrc/ut_indicator/group"/> -->
- </component>
- <!-- consider putting client and server in the same component -->
- <component id="mmshmanagercli" filter="s60" name="Multimedia Sharing Manager Client">
- <unit bldFile="mmsharing/mmshmanagercli/group"/>
- <!-- is this test unit needed? -->
- <!-- <unit bldFile="mmsharing/mmshmanagercli/tsrc/ut_managercli/group"/> -->
- </component>
- <component id="mmshmanagersrv" filter="s60" name="Multimedia Sharing Manager Server">
- <unit bldFile="mmsharing/mmshmanagersrv/group"/>
- <!-- is this test unit needed? -->
- <!-- <unit bldFile="mmsharing/mmshmanagersrv/tsrc/ut_managersrv/group"/> -->
- </component>
- <component id="mmshengine" filter="s60" name="Multimedia Sharing Engine">
- <unit bldFile="mmsharing/mmshengine/group"/>
- <!-- is this test unit needed? -->
- <!-- <unit bldFile="mmsharing/mmshengine/tsrc/ut_engine/group"/> -->
- </component>
- <component id="mmshui" filter="s60" name="Multimedia Sharing UI">
- <!-- can only have one unti: need to #include one from the other if it's needed -->
- <unit bldFile="mmsharing/mmshui/group"/>
- <unit bldFile="mmsharing/mmshui/help/group"/>
- <!-- is this test unit needed? -->
- <!-- <unit bldFile="mmsharing/mmshui/tsrc/ut_ui/group"/> -->
- </component>
- <component id="mmsharing_build" filter="s60" name="MM Sharing Build">
- <unit bldFile="mmsharing/group"/>
- </component>
- </collection>
- <collection id="mmshplugins" name="Multimedia Sharing Plugins" level="plugin">
- <component id="mmshaoplugin" filter="s60" name="Multimedia Sharing Always Online Plugin" class="plugin">
- <unit bldFile="mmshplugins/mmshaoplugin/group"/>
- <!-- <unit bldFile="mmshplugins/mmshaoplugin/tsrc/ut_aoplugin/group"/> -->
- </component>
- <component id="mmshaiwplugin" filter="s60" name="Multimedia Sharing AIW Plugin" class="plugin">
- <unit bldFile="mmshplugins/mmshaiwplugin/group"/>
- <!-- <unit bldFile="mmshplugins/mmshaiwplugin/tsrc/ut_aiwplugin/group"/> -->
- </component>
- <component id="mmshsipcrplugin" filter="s60" name="Multimedia Sharing SIP Client Resolver Plugin" class="plugin">
- <unit bldFile="mmshplugins/mmshsipcrplugin/group"/>
- <!-- <unit bldFile="mmshplugins/mmshsipcrplugin/tsrc/ut_sipcrplugin/group"/> -->
- </component>
- <component id="mmshsettingsuiplugin" filter="s60" name="Multimedia Sharing Settings UI Plugin" class="plugin">
- <unit bldFile="mmshplugins/mmshsettingsuiplugin/group"/>
- </component>
- <component id="mmshwpadapterplugin" filter="s60" name="Multimedia Sharing WAP Provisioning Adapter" class="plugin">
- <unit bldFile="mmshplugins/mmshwpadapterplugin/group"/>
- <!-- <unit bldFile="mmshplugins/mmshwpadapterplugin/tsrc/ut_wpadapterplugin/group"/> -->
- </component>
- <component id="mmcctranscoder" filter="s60" name="MMCC Transcoder" class="plugin">
- <!-- MMCC? What's that stand for? -->
- <unit bldFile="mmshplugins/mmcctranscoder/group"/>
- <!-- <unit bldFile="mmshplugins/mmcctranscoder/tsrc/stubs/group"/> -->
- <!-- <unit bldFile="mmshplugins/mmcctranscoder/tsrc/ut_transcoder/group"/> -->
- </component>
- <component id="mmshplugins_build" filter="s60" name="MM Sharing Plugins Build">
- <unit bldFile="mmshplugins/group"/>
- </component>
- </collection>
- <collection id="mmsharinguis_info" name="Multimedia Sharing UIs Info" level="if">
- <component id="mmsharinguis_build" filter="s60" name="Multimedia Sharing UIs Build">
- <!-- consider distributing to other components -->
- <unit bldFile="group"/>
- </component>
- <component id="mmsharinguis_plat" filter="s60" name="Multimedia Sharing UIs Platform Interfaces" class="api">
- <unit bldFile="mmsharinguis_plat/group"/>
- <!-- <unit bldFile="mmsharinguis_plat/multimedia_sharing_manager_api/tsrc/group"/> -->
- </component>
- </collection>
- </package>
-</SystemDefinition>
--- a/tsrc/centralrepositorystub/inc/cenrepnotifyhandler.h Mon Mar 15 12:40:08 2010 +0200
+++ b/tsrc/centralrepositorystub/inc/cenrepnotifyhandler.h Wed Mar 31 21:25:43 2010 +0300
@@ -1,8 +1,8 @@
/*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
+* under the terms of "Eclipse Public License v1.0"
* which accompanies this distribution, and is available
* at the URL "http://www.eclipse.org/legal/epl-v10.html".
*