1.1 --- a/epoc32/include/bassnd.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/bassnd.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,9 +1,9 @@
     1.4  // Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
     1.5  // All rights reserved.
     1.6  // This component and the accompanying materials are made available
     1.7 -// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
     1.8 +// under the terms of "Eclipse Public License v1.0"
     1.9  // which accompanies this distribution, and is available
    1.10 -// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
    1.11 +// at the URL "http://www.eclipse.org/legal/epl-v10.html".
    1.12  //
    1.13  // Initial Contributors:
    1.14  // Nokia Corporation - initial contribution.
    1.15 @@ -18,7 +18,7 @@
    1.16  
    1.17  #include <e32base.h>
    1.18  #include <s32file.h>
    1.19 -#include <mda/common/controller.h>
    1.20 +#include <mmf/common/mmfbase.h>
    1.21  
    1.22  
    1.23  /**
    1.24 @@ -58,18 +58,6 @@
    1.25  const TBaSystemSoundUid KUidSystemSoundError={0x1000609E};
    1.26  const TBaSystemSoundUid KUidSystemSoundEvent={0x1000609F};
    1.27  
    1.28 -/**
    1.29 -This is the UID of the repository where the system sound data is stored.
    1.30 -The UID is published to UI platforms to allow them to use the key value in 
    1.31 -the CRepository::NotifyRequest() API to monitor for changes in the system
    1.32 -sound data.
    1.33 -
    1.34 -@see CRepository
    1.35 -@see BaSystemSound::SystemSoundFile
    1.36 -@publishedPartner
    1.37 -@released
    1.38 -*/
    1.39 -const TUid KSystemSoundRepositoryUID = {0x100048AA};
    1.40  
    1.41  
    1.42  class TBaSystemSoundType
    1.43 @@ -259,6 +247,10 @@
    1.44  	};
    1.45  
    1.46  
    1.47 +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
    1.48 +#include <bassnduid.h>
    1.49 +#endif
    1.50 +
    1.51  class TBaSoundPriorityEncoder : public TBaSoundPriorityBase
    1.52  /**
    1.53  Encode TBaSystemSoundInfo::iPriority before persisting a sound preference
    1.54 @@ -271,16 +263,6 @@
    1.55  	};
    1.56  
    1.57  
    1.58 -class TBaSoundPriorityDecoder : public TBaSoundPriorityBase
    1.59 -/**
    1.60 -Decode a restored TBaSystemSoundInfo::iPriority
    1.61 -@internalComponent
    1.62 -*/
    1.63 -	{
    1.64 -public:
    1.65 -	inline TBaSoundPriorityDecoder(TInt aVal);
    1.66 -	};
    1.67 -
    1.68  
    1.69  inline TBool TBaSystemSoundType::IsNull() const
    1.70  	/** Tests whether the sound's category and instance are null.
    1.71 @@ -326,7 +308,5 @@
    1.72  inline TInt TBaSoundPriorityBase::Priority() const
    1.73  	{return (TInt8)iPriority;}
    1.74  
    1.75 -inline TBaSoundPriorityDecoder::TBaSoundPriorityDecoder(TInt aVal)
    1.76 -	{iPriority=aVal;}
    1.77  
    1.78  #endif