1.1 --- a/epoc32/include/mdaaudiosampleplayer.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/mdaaudiosampleplayer.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,9 +1,9 @@
     1.4  // Copyright (c) 1999-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 @@ -115,23 +115,23 @@
    1.16  	IMPORT_C static CMdaAudioPlayerUtility* NewFilePlayerL(const TDesC& aFileName,
    1.17  								MMdaAudioPlayerCallback& aCallback,
    1.18  								TInt aPriority = EMdaPriorityNormal,
    1.19 -								TMdaPriorityPreference aPref = EMdaPriorityPreferenceTimeAndQuality,
    1.20 +								TInt aPref = EMdaPriorityPreferenceTimeAndQuality,
    1.21  								CMdaServer* aServer = NULL);
    1.22  	IMPORT_C static CMdaAudioPlayerUtility* NewDesPlayerL(const TDesC8& aData,
    1.23  								MMdaAudioPlayerCallback& aCallback,
    1.24  								TInt aPriority = EMdaPriorityNormal,
    1.25 -								TMdaPriorityPreference aPref = EMdaPriorityPreferenceTimeAndQuality,
    1.26 +								TInt aPref = EMdaPriorityPreferenceTimeAndQuality,
    1.27  								CMdaServer* aServer = NULL);
    1.28  	IMPORT_C static CMdaAudioPlayerUtility* NewDesPlayerReadOnlyL(const TDesC8& aData,
    1.29  								MMdaAudioPlayerCallback& aCallback,
    1.30  								TInt aPriority = EMdaPriorityNormal,
    1.31 -								TMdaPriorityPreference aPref = EMdaPriorityPreferenceTimeAndQuality,
    1.32 +								TInt aPref = EMdaPriorityPreferenceTimeAndQuality,
    1.33  								CMdaServer* aServer = NULL);
    1.34  
    1.35  	// new export from version 7.0
    1.36  	IMPORT_C static CMdaAudioPlayerUtility* NewL(MMdaAudioPlayerCallback& aCallback,
    1.37  								TInt aPriority = EMdaPriorityNormal,
    1.38 -								TMdaPriorityPreference aPref = EMdaPriorityPreferenceTimeAndQuality);
    1.39 +								TInt aPref = EMdaPriorityPreferenceTimeAndQuality);
    1.40  
    1.41  	IMPORT_C void UseSharedHeap();
    1.42  
    1.43 @@ -169,7 +169,7 @@
    1.44  
    1.45  	IMPORT_C void SetPosition(const TTimeIntervalMicroSeconds& aPosition);
    1.46  
    1.47 -	IMPORT_C TInt SetPriority(TInt aPriority, TMdaPriorityPreference aPref);
    1.48 +	IMPORT_C TInt SetPriority(TInt aPriority, TInt aPref);
    1.49  
    1.50  	IMPORT_C TInt GetVolume(TInt& aVolume);
    1.51