1.1 --- a/epoc32/include/videoplayer.h Wed Mar 31 12:27:01 2010 +0100
1.2 +++ b/epoc32/include/videoplayer.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 @@ -27,7 +27,7 @@
1.16 #include <mda/common/base.h>
1.17 #include <mmf/common/mmfutilities.h>
1.18 #include <mmf/common/mmfcontrollerframeworkbase.h>
1.19 -#include <mmf/common/mmcaf.h>
1.20 +#include "mmf/common/mmcaf.h"
1.21 #include <mmfclntutility.h>
1.22
1.23 /**
1.24 @@ -108,7 +108,8 @@
1.25
1.26 /**
1.27 Notification that video playback has completed. This is not called if
1.28 - playback is explicitly stopped by calling Stop.
1.29 + playback is explicitly stopped (such as through the use of the Stop or
1.30 + Close commands).
1.31
1.32 @param aError
1.33 The status of playback.
1.34 @@ -159,6 +160,8 @@
1.35 };
1.36
1.37 class CMMFVideoPlayerCallback;
1.38 +class CVideoPlayerUtility2;
1.39 +class TVideoPlayRateCapabilities;
1.40
1.41 /**
1.42 @publishedAll
1.43 @@ -182,14 +185,13 @@
1.44 class CVideoPlayerUtility : public CBase,
1.45 public MMMFClientUtility
1.46 {
1.47 - class CBody;
1.48 public:
1.49
1.50 ~CVideoPlayerUtility();
1.51
1.52 IMPORT_C static CVideoPlayerUtility* NewL(MVideoPlayerUtilityObserver& aObserver,
1.53 TInt aPriority,
1.54 - TMdaPriorityPreference aPref,
1.55 + TInt aPref,
1.56 RWsSession& aWs,
1.57 CWsScreenDevice& aScreenDevice,
1.58 RWindowBase& aWindow,
1.59 @@ -217,7 +219,7 @@
1.60
1.61 IMPORT_C void PauseL();
1.62
1.63 - IMPORT_C void SetPriorityL(TInt aPriority, TMdaPriorityPreference aPref);
1.64 + IMPORT_C void SetPriorityL(TInt aPriority, TInt aPref);
1.65
1.66 IMPORT_C void PriorityL(TInt& aPriority, TMdaPriorityPreference& aPref) const;
1.67
1.68 @@ -305,50 +307,33 @@
1.69
1.70 IMPORT_C TInt SetInitScreenNumber(TInt aScreenNumber);
1.71
1.72 - // SetPlayVelocityL() is publishedPartner and prototype as it is not yet used by licensees,
1.73 - // and there is a possibility that it may change on licensee request for a short period.
1.74 - // It will eventually be moved to publishedAll and released.
1.75 IMPORT_C void SetPlayVelocityL(TInt aVelocity);
1.76
1.77 - // PlayVelocityL() is publishedPartner and prototype as it is not yet used by licensees,
1.78 - // and there is a possibility that it may change on licensee request for a short period.
1.79 - // It will eventually be moved to publishedAll and released.
1.80 IMPORT_C TInt PlayVelocityL() const;
1.81
1.82 - // StepFrameL() is publishedPartner and prototype as it is not yet used by licensees,
1.83 - // and there is a possibility that it may change on licensee request for a short period.
1.84 - // It will eventually be moved to publishedAll and released.
1.85 IMPORT_C void StepFrameL(TInt aStep);
1.86
1.87 - // GetPlayRateCapabilitiesL() is publishedPartner and prototype as it is not yet used by licensees,
1.88 - // and there is a possibility that it may change on licensee request for a short period.
1.89 - // It will eventually be moved to publishedAll and released.
1.90 IMPORT_C void GetPlayRateCapabilitiesL(TVideoPlayRateCapabilities& aCapabilities) const;
1.91
1.92 - // SetVideoEnabledL() is publishedPartner and prototype as it is not yet used by licensees,
1.93 - // and there is a possibility that it may change on licensee request for a short period.
1.94 - // It will eventually be moved to publishedAll and released.
1.95 IMPORT_C void SetVideoEnabledL(TBool aVideoEnabled);
1.96
1.97 - // VideoEnabledL() is publishedPartner and prototype as it is not yet used by licensees,
1.98 - // and there is a possibility that it may change on licensee request for a short period.
1.99 - // It will eventually be moved to publishedAll and released.
1.100 IMPORT_C TBool VideoEnabledL() const;
1.101
1.102 - // SetAudioEnabledL() is publishedPartner and prototype as it is not yet used by licensees,
1.103 - // and there is a possibility that it may change on licensee request for a short period.
1.104 - // It will eventually be moved to publishedAll and released.
1.105 IMPORT_C void SetAudioEnabledL(TBool aAudioEnabled);
1.106
1.107 - // SetAutoScaleL() is publishedPartner and prototype as it is not yet used by licensees,
1.108 - // and there is a possibility that it may change on licensee request for a short period.
1.109 - // It will eventually be moved to publishedAll and released.
1.110 IMPORT_C void SetAutoScaleL(TAutoScaleType aScaleType);
1.111
1.112 - // SetAutoScaleL() is publishedPartner and prototype as it is not yet used by licensees,
1.113 - // and there is a possibility that it may change on licensee request for a short period.
1.114 - // It will eventually be moved to publishedAll and released.
1.115 - IMPORT_C void SetAutoScaleL(TAutoScaleType aScaleType, TInt aHorizPos, TInt aVertPos);
1.116 + IMPORT_C void SetAutoScaleL(TAutoScaleType aScaleType, TInt aHorizPos, TInt aVertPos);
1.117 +
1.118 + IMPORT_C void SetExternalDisplaySwitchingL(TInt aDisplay, TBool aControl);
1.119 +
1.120 +private:
1.121 + class CBody;
1.122 +
1.123 + CBody* iBody;
1.124 +
1.125 + friend class CBody;
1.126 + friend class CVideoPlayerUtility2;
1.127 private:
1.128 enum TMMFVideoPlayerState
1.129 {
1.130 @@ -357,15 +342,15 @@
1.131 EPaused,
1.132 EPlaying
1.133 };
1.134 -
1.135 -private:
1.136 - CBody* iBody;
1.137 -
1.138 - friend class CBody;
1.139 +private:
1.140 friend class CTestStepUnitMMFVidClient;
1.141 +#ifdef SYMBIAN_BUILD_GCE
1.142 + friend class CMediaClientVideoDisplayBody;
1.143 +#endif // SYMBIAN_BUILD_GCE
1.144 public:
1.145 class CTestView;
1.146 friend class CTestView;
1.147 };
1.148
1.149 +
1.150 #endif