1.1 --- a/epoc32/include/videorecorder.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/videorecorder.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,9 +1,9 @@
     1.4  // Copyright (c) 2002-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 @@ -117,7 +117,9 @@
    1.16  
    1.17  
    1.18  	~CVideoRecorderUtility();
    1.19 -	IMPORT_C static CVideoRecorderUtility* NewL(MVideoRecorderUtilityObserver& aObserver,TInt aPriority=EMdaPriorityNormal,TMdaPriorityPreference aPref=EMdaPriorityPreferenceTimeAndQuality);
    1.20 +	IMPORT_C static CVideoRecorderUtility* NewL(MVideoRecorderUtilityObserver& aObserver,
    1.21 +												TInt aPriority=EMdaPriorityNormal,
    1.22 +												TInt aPref=EMdaPriorityPreferenceTimeAndQuality);
    1.23  	IMPORT_C void OpenFileL(const TDesC& aFileName,
    1.24  							TInt aCameraHandle,
    1.25  							TUid aControllerUid,
    1.26 @@ -148,7 +150,7 @@
    1.27      IMPORT_C void Record();
    1.28      IMPORT_C TInt Stop();
    1.29      IMPORT_C void PauseL();
    1.30 -    IMPORT_C void SetPriorityL(TInt aPriority, TMdaPriorityPreference aPref);
    1.31 +    IMPORT_C void SetPriorityL(TInt aPriority, TInt aPref);
    1.32      IMPORT_C void GetPriorityL(TInt& aPriority, TMdaPriorityPreference& aPref) const;
    1.33      IMPORT_C void SetVideoFrameRateL(TReal32 aFrameRate);
    1.34      IMPORT_C TReal32 VideoFrameRateL() const;
    1.35 @@ -191,36 +193,13 @@
    1.36      IMPORT_C void SetAudioSampleRateL(const TUint aSampleRate);    
    1.37      IMPORT_C TUint AudioSampleRateL() const;
    1.38      IMPORT_C void GetSupportedAudioSampleRatesL(RArray<TUint> &aSampleRates) const;
    1.39 +    IMPORT_C void SetVideoEnabledL(TBool aEnabled);
    1.40 +    IMPORT_C TBool VideoEnabledL() const;
    1.41 +    IMPORT_C void SetVideoQualityL(TInt aQuality);
    1.42 +    IMPORT_C TInt VideoQualityL() const;
    1.43 +    IMPORT_C void SetVideoFrameRateFixedL(TBool aFixedFrameRate);
    1.44 +    IMPORT_C TBool VideoFrameRateFixedL() const;
    1.45  
    1.46 -    // SetVideoEnabledL() is publishedPartner and prototype as it is not yet used by licensees,
    1.47 -    // and there is a possibility that it may change on licensee request for a short period.
    1.48 -    // It will eventually be moved to publishedAll and released.
    1.49 -    IMPORT_C void SetVideoEnabledL(TBool aEnabled);
    1.50 -
    1.51 -    // VideoEnabledL() is publishedPartner and prototype as it is not yet used by licensees,
    1.52 -    // and there is a possibility that it may change on licensee request for a short period.
    1.53 -    // It will eventually be moved to publishedAll and released.
    1.54 -    IMPORT_C TBool VideoEnabledL() const;
    1.55 -
    1.56 -    // SetVideoQualityL() is publishedPartner and prototype as it is not yet used by licensees,
    1.57 -    // and there is a possibility that it may change on licensee request for a short period.
    1.58 -    // It will eventually be moved to publishedAll and released.
    1.59 -    IMPORT_C void SetVideoQualityL(TInt aQuality);
    1.60 -
    1.61 -    // VideoQualityL() is publishedPartner and prototype as it is not yet used by licensees,
    1.62 -    // and there is a possibility that it may change on licensee request for a short period.
    1.63 -    // It will eventually be moved to publishedAll and released.
    1.64 -    IMPORT_C TInt VideoQualityL() const;
    1.65 -
    1.66 -    // SetVideoFrameRateFixedL() is publishedPartner and prototype as it is not yet used by licensees,
    1.67 -    // and there is a possibility that it may change on licensee request for a short period.
    1.68 -    // It will eventually be moved to publishedAll and released.
    1.69 -    IMPORT_C void SetVideoFrameRateFixedL(TBool aFixedFrameRate);
    1.70 -
    1.71 -    // VideoFrameRateFixedL() is publishedPartner and prototype as it is not yet used by licensees,
    1.72 -    // and there is a possibility that it may change on licensee request for a short period.
    1.73 -    // It will eventually be moved to publishedAll and released.
    1.74 -    IMPORT_C TBool VideoFrameRateFixedL() const;
    1.75  private:
    1.76  	enum TMMFVideoRecorderState
    1.77  		{